Merge branch 'main' into pyros-sep-priorities-update

Author: shermanjasonaf

.github/workflows/typos.toml

@@ -71,4 +71,6 @@ EOF = "EOF"
 lst = "lst"
 # Abbreviation of gamma (used in stochpdegas1_automatic.py)
 gam = "gam"
+# Regex search term from contrib/solver/solvers/ipopt
+ond = "ond"
 # AS NEEDED: Add More Words Below

doc/OnlineDocs/explanation/analysis/parmest/installation.rst

@@ -21,7 +21,7 @@ Python package dependencies
 IPOPT
 -----
 
-IPOPT can be downloaded from https://projects.coin-or.org/Ipopt. 
+The IPOPT project homepage is https://github.com/coin-or/Ipopt
 
 Testing
 -------

doc/OnlineDocs/explanation/analysis/sensitivity_toolbox.rst

@@ -3,7 +3,7 @@ Sensitivity Toolbox
 
 The sensitivity toolbox provides a Pyomo interface to sIPOPT and k_aug to very quickly compute approximate solutions to nonlinear programs with a small perturbation in model parameters.
 
-See the `sIPOPT documentation <https://projects.coin-or.org/Ipopt/wiki/sIpopt>`_ or the `following paper <https://link.springer.com/article/10.1007/s12532-012-0043-2>`_ for additional details:
+See the `sIPOPT documentation <https://coin-or.github.io/Ipopt/SPECIALS.html#SIPOPT>`_ or the `following paper <https://link.springer.com/article/10.1007/s12532-012-0043-2>`_ for additional details:
 
   H. Pirnay, R. Lopez-Negrete, and L.T. Biegler, Optimal Sensitivity based on IPOPT, Math. Prog. Comp., 4(4):307--331, 2012.
 
@@ -185,7 +185,7 @@ Installing sIPOPT and k_aug
 The sensitivity toolbox requires either sIPOPT or k_aug to be installed and available in your system PATH. See the sIPOPT and k_aug documentation for detailed instructions:
 
 * https://coin-or.github.io/Ipopt/INSTALL.html
-* https://projects.coin-or.org/Ipopt/wiki/sIpopt
+* https://coin-or.github.io/Ipopt/SPECIALS.html#SIPOPT
 * https://coin-or.github.io/coinbrew/
 * https://github.com/dthierry/k_aug
 

examples/doc/samples/case_studies/rosen/Rosenbrock.output

@@ -7,7 +7,7 @@ Ipopt 3.9.2:
 ******************************************************************************
 This program contains Ipopt, a library for large-scale nonlinear optimization.
  Ipopt is released as open source code under the Eclipse Public License (EPL).
-         For more information visit http://projects.coin-or.org/Ipopt
+         For more information visit https://github.com/coin-or/Ipopt
 ******************************************************************************
 
 This is Ipopt version 3.9.2, running with linear solver ma27.

examples/pyomo/suffixes/ipopt_warmstart.py

@@ -11,7 +11,7 @@
 
 # A Suffix example for ipopt.
 # Translated to Pyomo from AMPL model source at:
-#   https://projects.coin-or.org/Ipopt/wiki/IpoptAddFeatures
+#   http://web.archive.org/web/20120610123756/https://projects.coin-or.org/Ipopt/wiki/IpoptAddFeatures
 #
 # This Pyomo example is formulated as a python script.
 # To run this script execute the following command:

pyomo/common/numeric_types.py

@@ -382,7 +382,8 @@ def value(obj, exception=True):
             tmp = obj(exception=True)
             if tmp is None:
                 raise ValueError(
-                    "No value for uninitialized NumericValue object %s" % (obj.name,)
+                    "No value for uninitialized %s object %s"
+                    % (type(obj).__name__, obj.name)
                 )
             return tmp
         except TemplateExpressionError:

pyomo/contrib/appsi/solvers/highs.py

@@ -272,7 +272,6 @@ def _solve(self, timer: HierarchicalTimer):
             if config.warmstart:
                 self._warm_start()
             timer.start('optimize')
-            ostreams[-1].write("RUN!\n")
             if self.version()[:2] >= (1, 8):
                 self._solver_model.HandleKeyboardInterrupt = True
             self._solver_model.run()

pyomo/contrib/cp/transform/logical_to_disjunctive_walker.py

@@ -29,6 +29,10 @@
 from pyomo.gdp.disjunct import AutoLinkedBooleanVar, Disjunct, Disjunction
 
 
+def _dispatch_boolean_const(visitor, node):
+    return False, 1 if node.value else 0
+
+
 def _dispatch_boolean_var(visitor, node):
     if node not in visitor.boolean_to_binary_map:
         binary = node.get_associated_binary()
@@ -197,6 +201,7 @@ def _dispatch_atmost(visitor, node, *args):
 _operator_dispatcher[EXPR.AtMostExpression] = _dispatch_atmost
 
 _before_child_dispatcher = {}
+_before_child_dispatcher[EXPR.BooleanConstant] = _dispatch_boolean_const
 _before_child_dispatcher[BV.ScalarBooleanVar] = _dispatch_boolean_var
 _before_child_dispatcher[BV.BooleanVarData] = _dispatch_boolean_var
 _before_child_dispatcher[AutoLinkedBooleanVar] = _dispatch_boolean_var
@@ -264,5 +269,9 @@ def finalizeResult(self, result):
         # This LogicalExpression must evaluate to True (but note that we cannot
         # fix this variable to 1 since this logical expression could be living
         # on a Disjunct and later need to be relaxed.)
-        self.constraints.add(result >= 1)
+        expr = result >= 1
+        if expr.__class__ is bool:
+            self.constraints.add(Constraint.Feasible if expr else Constraint.Infeasible)
+        else:
+            self.constraints.add(expr)
         return result