Skip to content

Commit

Permalink
Add links to MP from the solvers table
Browse files Browse the repository at this point in the history
  • Loading branch information
fdabrandao committed Oct 29, 2024
1 parent fb24249 commit 66be32a
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 26 deletions.
20 changes: 10 additions & 10 deletions docs/source/solvers/_tables/slv_lin.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
,LP,MILP,QP,MIQP,(MI)QCP,(MI)QCP non-convex,Conic [#]_,MINLP [#]_
:ref:`gurobi`,|y|,|y|,|y|,|y|,|y|,|y|,|y|,|y|
:ref:`xpress`,|y|,|y|,|y|,|y|,|y|,|y|,|y|,|y|
:ref:`cplex`,|y|,|y|,|y|,|y|,|y|,|n|,|y|,|n|
:ref:`copt`,|y|,|y|,|y|,|y|,|y|,|n|,|y|,|n|
:ref:`mosek`,|y|,|y|,|y|,|y|,|y|,|n|,|y|,|n|
:ref:`highs`,|y|,|y|,|y|,|n|,|n|,|n|,|n|,|n|
:ref:`scip`,|y|,|y|,|y|,|y|,|y|,|y|,|y|,|y|
:ref:`gcg`,|y|,|y|,|y|,|y|,|y|,|y|,|y|,|y|
:ref:`cbc`,|y|,|y|,|y|,|y|,|n|,|n|,|n|,|n|
,LP,MILP,QP,MIQP,convex |br| (MI)QCP,non-convex |br| (MI)QCP,Conic [#]_,MINLP, |mp|
:ref:`gurobi`,|y|,|y|,|y|,|y|,|y|,|y|,|y|,|y|,|y|
:ref:`xpress`,|y|,|y|,|y|,|y|,|y|,|y|,|y|,|y|,|y|
:ref:`cplex`,|y|,|y|,|y|,|y|,|y|,|n|,|y|,|n|,|y|
:ref:`copt`,|y|,|y|,|y|,|y|,|y|,|n|,|y|,|n|,|y|
:ref:`mosek`,|y|,|y|,|y|,|y|,|y|,|n|,|y|,|n|,|y|
:ref:`highs`,|y|,|y|,|y|,|n|,|n|,|n|,|n|,|n|,|y|
:ref:`scip`,|y|,|y|,|y|,|y|,|y|,|y|,|y|,|y|,|y|
:ref:`gcg`,|y|,|y|,|y|,|y|,|y|,|y|,|y|,|y|,|y|
:ref:`cbc`,|y|,|y|,|y|,|y|,|n|,|n|,|n|,|n|,|y|
30 changes: 15 additions & 15 deletions docs/source/solvers/_tables/slv_nonlin.csv
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
,LP,NLP,Integer variables,Global
:ref:`knitro`,|y|,|y|,|y|,|n|
:ref:`baron`,|y|,|y|,|y|,|y|
:ref:`lindo-global-solver`,|y|,|y|,|y|,|y|
:ref:`octeract`,|y|,|y|,|y|,|y|
:ref:`raposa`,|y|,|y|,|y|,|y|
:ref:`lgo`,|y|,|y|,|n|,|y|
:ref:`conopt`,|y|,|y|,|n|,|n|
:ref:`loqo`,|y|,|y|,|n|,|n|
:ref:`minos`,|y|,|y|,|n|,|n|
:ref:`snopt`,|y|,|y|,|n|,|n|
:ref:`ipopt`,|y|,|y|,|n|,|n|
:ref:`bonmin`,|y|,|y|,|y|,|n|
:ref:`couenne`,|y|,|y|,|y|,|y|
,LP,NLP,Integer variables,Global,|mp|
:ref:`knitro`,|y|,|y|,|y|,|n|,|n|
:ref:`baron`,|y|,|y|,|y|,|y|,|n|
:ref:`lindo-global-solver`,|y|,|y|,|y|,|y|,|n|
:ref:`octeract`,|y|,|y|,|y|,|y|,|n|
:ref:`raposa`,|y|,|y|,|y|,|y|,|n|
:ref:`lgo`,|y|,|y|,|n|,|y|,|n|
:ref:`conopt`,|y|,|y|,|n|,|n|,|n|
:ref:`loqo`,|y|,|y|,|n|,|n|,|n|
:ref:`minos`,|y|,|y|,|n|,|n|,|n|
:ref:`snopt`,|y|,|y|,|n|,|n|,|n|
:ref:`ipopt`,|y|,|y|,|n|,|n|,|n|
:ref:`bonmin`,|y|,|y|,|y|,|n|,|n|
:ref:`couenne`,|y|,|y|,|y|,|y|,|n|

8 changes: 7 additions & 1 deletion docs/source/solvers/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ an easy way to switch between them.
.. |n| unicode:: U+274C
:trim:

.. |mp| raw:: html

<a href="https://mp.ampl.com/model-guide.html" target="_blank">MP</a>

.. |br| raw:: html

<br />

Linear Solvers
--------------
Expand All @@ -36,7 +43,6 @@ Linear Solvers
.. rubric:: Footnotes

.. [#] Conic programming: Mosek supports SOCP and exponential cones, other solvers only SOCP
.. [#] MINLP: Gurobi 11 requires the non-default setting `global=1`
Nonlinear Solvers
------------------
Expand Down

0 comments on commit 66be32a

Please sign in to comment.