Skip to content

Commit ede27a9

Browse files
committed
Alphabetize
1 parent acbf764 commit ede27a9

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

pyomo/neos/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
# Static documentation for NEOS solvers
1616
doc = {
17-
'baron': 'Heuristic MINLP solver',
18-
'bonmin': 'Heuristic MINLP solver',
17+
'baron': 'Deterministic global MINLP solver',
18+
'bonmin': 'Deterministic local MINLP solver',
1919
'cbc': 'MILP solver',
2020
'conopt': 'Feasible path NLP solver',
2121
'couenne': 'Deterministic global MINLP solver',
@@ -26,6 +26,7 @@
2626
'knitro': 'Convex MINLP solver',
2727
'l-bfgs-b': 'Bound-constrained NLP solver',
2828
'lancelot': 'Augmented Lagrangian NLP solver',
29+
'lgo': 'Lipschitz-Continuous Global Optimizer',
2930
'loqo': 'Interior point NLP solver',
3031
'minlp': 'Heuristic MINLP solver',
3132
'minos': 'SLC NLP solver',
@@ -34,7 +35,6 @@
3435
'octeract': 'Deterministic global MINLP solver',
3536
'ooqp': 'Convex QP solver',
3637
'path': 'Nonlinear MCP solver',
37-
'snopt': 'SQP NLP solver',
3838
'raposa': 'A Global Solver for Polynomial Programming Problems',
39-
'lgo': 'Lipschitz-Continuous Global Optimizer',
39+
'snopt': 'SQP NLP solver',
4040
}

pyomo/neos/tests/test_neos.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,7 @@ def test_ooqp(self):
177177
self._run('ooqp')
178178

179179
def test_path(self):
180-
# The simple tests aren't complementarity
181-
# problems
180+
# The simple tests aren't complementarity problems
182181
self.skipTest("The simple NEOS test is not a complementarity problem")
183182

184183
def test_snopt(self):

0 commit comments

Comments
 (0)