Skip to content

Commit acbf764

Browse files
committed
Update docs and comment
1 parent 4c2ed3e commit acbf764

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

pyomo/neos/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
# Static documentation for NEOS solvers
1616
doc = {
17+
'baron': 'Heuristic MINLP solver',
1718
'bonmin': 'Heuristic MINLP solver',
1819
'cbc': 'MILP solver',
1920
'conopt': 'Feasible path NLP solver',
@@ -30,7 +31,7 @@
3031
'minos': 'SLC NLP solver',
3132
'minto': 'MILP solver',
3233
'mosek': 'Interior point NLP solver',
33-
#'octeract': 'Deterministic global MINLP solver',
34+
'octeract': 'Deterministic global MINLP solver',
3435
'ooqp': 'Convex QP solver',
3536
'path': 'Nonlinear MCP solver',
3637
'snopt': 'SQP NLP solver',

pyomo/neos/tests/test_neos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def test_mosek(self):
163163
# [16 Jul 24]: Octeract is erroring. We will disable the interface
164164
# (and testing) until we have time to resolve #3321
165165
# [20 Sep 24]: and appears to have been removed from NEOS
166-
#
166+
# [24 Apr 25]: appears to be working again
167167
def test_octeract(self):
168168
self._run('octeract')
169169

0 commit comments

Comments
 (0)