Doe with blocks

doc/OnlineDocs/conf.py

@@ -68,6 +68,7 @@
     'sphinx.ext.inheritance_diagram',
     'sphinx.ext.autosummary',
     'sphinx.ext.doctest',
+    'sphinx.ext.todo',
     'sphinx_copybutton',
     #'sphinx.ext.githubpages',
 ]
@@ -121,7 +122,7 @@
 pygments_style = 'sphinx'
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = False
+todo_include_todos = True
 
 # If true, doctest flags (comments looking like # doctest: FLAG, ...) at
 # the ends of lines and <BLANKLINE> markers are removed for all code

doc/OnlineDocs/modeling_extensions/gdp/modeling.rst

@@ -160,11 +160,10 @@ Usage:
     >>> m.Y = BooleanVar(m.my_set)
     >>> m.p = LogicalConstraint(expr=atleast(3, m.Y))
     >>> m.p.pprint()
-    p : Size=1, Index=None, Active=False
+    p : Size=1, Index=None, Active=True
         Key  : Body                                 : Active
-        None : atleast(3: [Y[1], Y[2], Y[3], Y[4]]) :  False
+        None : atleast(3: [Y[1], Y[2], Y[3], Y[4]]) :   True
     >>> TransformationFactory('core.logical_to_linear').apply_to(m)
-        ...
     >>> # constraint auto-generated by transformation
     >>> m.logic_to_linear.transformed_constraints.pprint()
     transformed_constraints : Size=1, Index=logic_to_linear.transformed_constraints_index, Active=True

doc/OnlineDocs/pyomo_modeling_components/Suffixes.rst

@@ -388,6 +388,7 @@ Suffix component with an IMPORT_EXPORT direction.
 
    ipopt = pyo.SolverFactory('ipopt')
 
+
 The difference in performance can be seen by examining Ipopt's iteration
 log with and without warm starting:
 
@@ -405,13 +406,9 @@ log with and without warm starting:
    iter    objective    inf_pr   inf_du lg(mu)  ||d||  lg(rg) alpha_du alpha_pr  ls
       0  1.6109693e+01 1.12e+01 5.28e-01  -1.0 0.00e+00    -  0.00e+00 0.00e+00   0
       1  1.6982239e+01 7.30e-01 1.02e+01  -1.0 6.11e-01    -  7.19e-02 1.00e+00f  1
-      2  1.7318411e+01 3.60e-02 5.05e-01  -1.0 1.61e-01    -  1.00e+00 1.00e+00h  1
-      3  1.6849424e+01 2.78e-01 6.68e-02  -1.7 2.85e-01    -  7.94e-01 1.00e+00h  1
-      4  1.7051199e+01 4.71e-03 2.78e-03  -1.7 6.06e-02    -  1.00e+00 1.00e+00h  1
-      5  1.7011979e+01 7.19e-03 8.50e-03  -3.8 3.66e-02    -  9.45e-01 9.98e-01h  1
-      6  1.7014271e+01 1.74e-05 9.78e-06  -3.8 3.33e-03    -  1.00e+00 1.00e+00h  1
-      7  1.7014021e+01 1.23e-07 1.82e-07  -5.7 2.69e-04    -  1.00e+00 1.00e+00h  1
-      8  1.7014017e+01 1.77e-11 2.52e-11  -8.6 3.32e-06    -  1.00e+00 1.00e+00h  1
+      2  1.7318411e+01 ...
+      ...
+      8  1.7014017e+01 ...
 
    Number of Iterations....: 8
    ...
@@ -441,7 +438,7 @@ log with and without warm starting:
    iter    objective    inf_pr   inf_du lg(mu)  ||d||  lg(rg) alpha_du alpha_pr  ls
       0  1.7014032e+01 2.00e-06 4.07e-06  -6.0 0.00e+00    -  0.00e+00 0.00e+00   0
       1  1.7014019e+01 3.65e-12 1.00e-11  -6.0 2.50e-01    -  1.00e+00 1.00e+00h  1
-      2  1.7014017e+01 4.48e-12 6.42e-12  -9.0 1.92e-06    -  1.00e+00 1.00e+00h  1
+      2  1.7014017e+01 ...
 
    Number of Iterations....: 2
    ...

examples/pyomobook/abstract-ch/pyomo.abstract7.txt

@@ -13,7 +13,7 @@ model:
   save file: None
   save format: None
   symbolic solver labels: false
-  file determinism: 1
+  file determinism: None
 transform: []
 preprocess: []
 runtime:

examples/pyomobook/abstract-ch/pyomo.model3.sh

@@ -3,5 +3,5 @@
 # @cmd:
 pyomo convert --output=concrete1.nl concrete1.py
 # @:cmd
-diff concrete1.nl concrete1-ref.nl
+python -m pyomo.repn.tests.ampl.nl_diff concrete1.nl concrete1-ref.nl
 rm -f results.yml results.json concrete1.nl

pyomo/contrib/appsi/solvers/highs.py

@@ -165,11 +165,13 @@ def config(self, val: HighsConfig):
     @property
     def highs_options(self):
         """
+        A dictionary mapping solver options to values for those options. These
+        are solver specific.
+
         Returns
         -------
-        highs_options: dict
-            A dictionary mapping solver options to values for those options. These
-            are solver specific.
+        dict
+           A dictionary mapping solver options to values for those options
         """
         return self._solver_options