Merge branch 'Pyomo:main' into adding_eigen_values

Author: smondal13

pyomo/core/expr/relational_expr.py

@@ -439,13 +439,13 @@ def no(*args):
     elif getattr(a, 'is_component_type', no)() and a.is_indexed():
         msg = (
             f"Argument for {op_type} is an indexed numeric "
-            "value specified without an index:\n\t{a.name}\nIs this "
+            f"value specified without an index:\n\t{a.name}\nIs this "
             "value defined over an index that you did not specify?"
         )
     elif getattr(b, 'is_component_type', no)() and b.is_indexed():
         msg = (
             f"Argument for {op_type} is an indexed numeric "
-            "value specified without an index:\n\t{b.name}\nIs this "
+            f"value specified without an index:\n\t{b.name}\nIs this "
             "value defined over an index that you did not specify?"
         )
     else:

pyomo/neos/__init__.py

@@ -14,26 +14,27 @@
 
 # Static documentation for NEOS solvers
 doc = {
-    'bonmin': 'Heuristic MINLP solver',
+    'baron': 'Deterministic global MINLP solver',
+    'bonmin': 'Deterministic local MINLP solver',
     'cbc': 'MILP solver',
     'conopt': 'Feasible path NLP solver',
     'couenne': 'Deterministic global MINLP solver',
     'cplex': 'MILP solver',
-    'filmint': 'Heuristic MINLP solver',
+    'filmint': 'Deterministic local MINLP solver',
     'filter': 'SQP NLP solver',
     'ipopt': 'Interior point NLP solver',
-    'knitro': 'Convex MINLP solver',
+    'knitro': 'Convex NLP/MINLP solver',
     'l-bfgs-b': 'Bound-constrained NLP solver',
     'lancelot': 'Augmented Lagrangian NLP solver',
+    'lgo': 'Lipschitz-Continuous Global Optimizer',
     'loqo': 'Interior point NLP solver',
-    'minlp': 'Heuristic MINLP solver',
-    'minos': 'SLC NLP solver',
+    'minlp': 'Deterministic local MINLP solver',
+    'minos': 'NLP solver',
     'minto': 'MILP solver',
     'mosek': 'Interior point NLP solver',
-    #'octeract': 'Deterministic global MINLP solver',
+    'octeract': 'Deterministic global MINLP solver',
     'ooqp': 'Convex QP solver',
     'path': 'Nonlinear MCP solver',
-    'snopt': 'SQP NLP solver',
     'raposa': 'A Global Solver for Polynomial Programming Problems',
-    'lgo': 'Lipschitz-Continuous Global Optimizer',
+    'snopt': 'SQP NLP solver',
 }

pyomo/neos/tests/test_neos.py

@@ -108,6 +108,9 @@ def test_check_all_ampl_solvers(self):
 
 
 class RunAllNEOSSolvers(object):
+    def test_baron(self):
+        self._run('baron')
+
     def test_bonmin(self):
         self._run('bonmin')
 
@@ -160,9 +163,10 @@ def test_mosek(self):
     # [16 Jul 24]: Octeract is erroring.  We will disable the interface
     # (and testing) until we have time to resolve #3321
     # [20 Sep 24]: and appears to have been removed from NEOS
-    #
-    # def test_octeract(self):
-    #     self._run('octeract')
+    # [24 Apr 25]: it appears to be there but causes timeouts
+    def test_octeract(self):
+        pass
+        # self._run('octeract')
 
     def test_ooqp(self):
         if self.sense == pyo.maximize:
@@ -174,8 +178,7 @@ def test_ooqp(self):
             self._run('ooqp')
 
     def test_path(self):
-        # The simple tests aren't complementarity
-        # problems
+        # The simple tests aren't complementarity problems
         self.skipTest("The simple NEOS test is not a complementarity problem")
 
     def test_snopt(self):