Merge pull request #39 from jsiirola/solver-docs

Update formatting and links for solver table

Author: mrmundt

doc/OnlineDocs/getting_started/solvers.rst

@@ -1,3 +1,5 @@
+.. -*- mode: rst -*-
+
 Using Solvers with Pyomo
 ========================
 
@@ -12,68 +14,71 @@ the license requirements for their desired solver.
 
    <br />
 
+..
+    NOTE the use of Unicode nonbreaking spaces (xA0) and hyphens (x2011)
+    in the PIP and CONDA command lines so that the commands render
+    sensibly
+
 .. list-table:: Available Solvers through ``pip`` and ``conda``
    :header-rows: 1
 
    * - Solver
-     - ``pip``
-     - ``conda``
-     - License
-     - Documentation
+     - Pip
+     - Conda
+     - License |br| Docs
    * - cplex
-     - ``pip install cplex``
-     - ``conda install -c ibmdecisionoptimization cplex``
+     - ``pip install cplex``
+     - ``conda install ‑c ibmdecisionoptimization \    cplex``
      - `License <https://www.ibm.com/products/ilog-cplex-optimization-studio/pricing>`__
-     - `Documentation <https://www.ibm.com/docs/en/icos/22.1.1?topic=cplex-installing>`__
+       `Docs <https://www.ibm.com/docs/en/icos/latest?topic=cplex-installing>`__
+   * - CPoptimizer
+     - ``pip install cplex \    docplex``
+     - ``conda install ‑c ibmdecisionoptimization \    cplex docplex``
+     - `License <https://github.com/IBMDecisionOptimization/docplex-doc/blob/master/LICENSE.txt>`__
+       `Docs <https://ibmdecisionoptimization.github.io/docplex-doc/getting_started_python.html>`__
    * - cyipopt
-     - ``pip install cyipopt``
-     - ``conda install -c conda-forge cyipopt``
+     - ``pip install cyipopt``
+     - ``conda install ‑c conda‑forge cyipopt``
      - `License <https://cyipopt.readthedocs.io/en/stable/#copyright>`__
-     - `Documentation <https://cyipopt.readthedocs.io/en/stable/install.html>`__
-   * - DOcplex
-     - ``pip install docplex``
-     - ``conda install -c ibmdecisionoptimization docplex``
-     - `License <https://github.com/IBMDecisionOptimization/docplex-doc/blob/master/LICENSE.txt>`__
-     - `Documentation <https://ibmdecisionoptimization.github.io/docplex-doc/getting_started_python.html>`__
+       `Docs <https://cyipopt.readthedocs.io/en/stable/install.html>`__
    * - glpk
      - N/A
-     - ``conda install -c conda-forge glpk``
+     - ``conda install ‑c conda‑forge glpk``
      - `License <https://www.gnu.org/licenses/licenses.html>`__
-     - `Documentation <https://www.gnu.org/software/glpk/>`__
+       `Docs <https://www.gnu.org/software/glpk/>`__
    * - Gurobi
-     - ``pip install gurobipy``
-     - ``conda install -c gurobi gurobi``
+     - ``pip install gurobipy``
+     - ``conda install ‑c gurobi gurobi``
      - `License <https://www.gurobi.com/solutions/licensing/>`__
-     - `Documentation <https://support.gurobi.com/hc/en-us/articles/360044290292-How-do-I-install-Gurobi-for-Python>`__
+       `Docs <https://support.gurobi.com/hc/en-us/articles/360044290292-How-do-I-install-Gurobi-for-Python>`__
    * - HiGHS
-     - ``pip install highspy``
-     - ``conda install -c conda-forge highspy``
-     - `License <https://ergo-code.github.io/HiGHS/stable/>`__
-     - `Documentation <https://ergo-code.github.io/HiGHS/dev/interfaces/python/>`__
+     - ``pip install highspy``
+     - ``conda install ‑c conda‑forge highspy``
+     - `License <https://github.com/ERGO-Code/HiGHS/blob/master/LICENSE.txt>`__
+       `Docs <https://ergo-code.github.io/HiGHS/dev/interfaces/python/>`__
    * - MAiNGO
-     - ``pip install maingopy``
+     - ``pip install maingopy``
      - N/A
-     - `License <https://git.rwth-aachen.de/avt-svt/public/maingo/-/blob/master/LICENSE?ref_type=heads>`__
-     - `Documentation <https://avt-svt.pages.rwth-aachen.de/public/maingo/install.html#get_maingo>`__
+     - `License <https://git.rwth-aachen.de/avt-svt/public/maingo/-/blob/master/LICENSE>`__
+       `Docs <https://avt-svt.pages.rwth-aachen.de/public/maingo/install.html>`__
    * - PyMUMPS
-     - ``pip install pymumps``
-     - ``conda install -c conda-forge pymumps``
+     - ``pip install pymumps``
+     - ``conda install ‑c conda‑forge pymumps``
      - `License <https://github.com/PyMumps/pymumps/blob/master/COPYING>`__
-     - `Documentation <https://github.com/pymumps/pymumps>`__
+       `Docs <https://github.com/pymumps/pymumps>`__
    * - SCIP
      - N/A
-     - ``conda install -c conda-forge scip``
+     - ``conda install ‑c conda‑forge scip``
      - `License <https://www.scipopt.org/scip/doc/html/LICENSE.php>`__
-     - `Documentation <https://www.scipopt.org/index.php#download>`__
+       `Docs <https://www.scipopt.org/index.php#download>`__
    * - XPRESS
-     - ``pip install xpress``
-     - ``conda install -c fico-xpress xpress``
+     - ``pip install xpress``
+     - ``conda install ‑c fico‑xpress xpress``
      - `License <https://www.fico.com/en/fico-xpress-trial-and-licensing-options>`__
-     - `Documentation <https://www.fico.com/fico-xpress-optimization/docs/dms2019-02/solver/optimizer/python/HTML/chIntro_sec_secInstall.html>`__
-
+       `Docs <https://www.fico.com/fico-xpress-optimization/docs/latest/solver/optimizer/python/HTML/chIntro.html?scroll=secInstall>`__
 
 .. note::
 
    We compiled this table of solvers to help you get started, but we encourage
    you to consult the official documentation of your desired solver for the most
-   up-to-date and detailed information.
+   up-to-date and detailed information.