Merge pull request #2502 from MrGorbunov/main

Fixed examples in working_models.html to Run
Pyomo · Aug 23, 2022 · dd78d36 · dd78d36
2 parents f46e9ac + 23bcabc
commit dd78d36
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/doc/OnlineDocs/tests/scripting/iterative2.py b/doc/OnlineDocs/tests/scripting/iterative2.py
@@ -14,7 +14,7 @@
 model.n = pyo.Param(default=4)
 model.x = pyo.Var(pyo.RangeSet(model.n), within=pyo.Binary)
 def o_rule(model):
-    return summation(model.x)
+    return pyo.summation(model.x)
 model.o = pyo.Objective(rule=o_rule)
 model.c = pyo.ConstraintList()
 

diff --git a/doc/OnlineDocs/tests/scripting/noiteration1.py b/doc/OnlineDocs/tests/scripting/noiteration1.py
@@ -14,7 +14,7 @@
 model.n = pyo.Param(default=4)
 model.x = pyo.Var(pyo.RangeSet(model.n), within=pyo.Binary)
 def o_rule(model):
-    return summation(model.x)
+    return pyo.summation(model.x)
 model.o = pyo.Objective(rule=o_rule)
 model.c = pyo.ConstraintList()
 

diff --git a/doc/OnlineDocs/working_models.rst b/doc/OnlineDocs/working_models.rst
@@ -340,7 +340,6 @@ of the objective function object. Here is a simple example:
    >>> print ("------------- extend obj --------------") # doctest: +SKIP
    >>> model.obj.expr += 10 * model.y
 
-   >>> opt = SolverFactory('cplex') # doctest: +SKIP
    >>> opt.solve(model) # doctest: +SKIP
    >>> model.pprint() # doctest: +SKIP