Skip to content

Commit 4a52048

Browse files
committed
Restore link to SCIP, but only to top-level domain; exclude from the checker
1 parent 7f61da1 commit 4a52048

6 files changed

Lines changed: 18 additions & 17 deletions

File tree

.github/workflows/test_branches.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ jobs:
7777
# Exclude:
7878
# - Jenkins because it's behind a firewall
7979
# - RTD because a magically-generated string triggers failures
80-
exclude_urls: https://pyomo-jenkins.sandia.gov/,https://pyomo.readthedocs.io/en/%s/errors.html
80+
# - scipopt.org as they perform "validation" on the webclient (which fails)
81+
exclude_urls: https://pyomo-jenkins.sandia.gov/,https://pyomo.readthedocs.io/en/%s/errors.html,https://www.scipopt.org
8182
# Exclude:
8283
# - All gnu.org links because they consistently fail the checker
8384
# - All lpsolve.sourceforge.net links because SF appears to reject from GHA

.github/workflows/test_pr_and_main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ jobs:
8989
# Exclude:
9090
# - Jenkins because it's behind a firewall
9191
# - RTD because a magically-generated string triggers failures
92-
exclude_urls: https://pyomo-jenkins.sandia.gov/,https://pyomo.readthedocs.io/en/%s/errors.html
92+
# - scipopt.org as they perform "validation" on the webclient (which fails)
93+
exclude_urls: https://pyomo-jenkins.sandia.gov/,https://pyomo.readthedocs.io/en/%s/errors.html,https://www.scipopt.org
9394
# Exclude:
9495
# - All gnu.org links because they consistently fail the checker
9596
# - All lpsolve.sourceforge.net links because SF appears to reject from GHA

.github/workflows/url_check.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ jobs:
4040
# Exclude:
4141
# - Jenkins because it's behind a firewall
4242
# - RTD because a magically-generated string triggers failures
43-
exclude_urls: https://pyomo-jenkins.sandia.gov/,https://pyomo.readthedocs.io/en/%s/errors.html
43+
# - scipopt.org as they perform "validation" on the webclient (which fails)
44+
exclude_urls: https://pyomo-jenkins.sandia.gov/,https://pyomo.readthedocs.io/en/%s/errors.html,https://www.scipopt.org
4445
# Exclude:
4546
# - All gnu.org links because they consistently fail the checker
4647
# - All lpsolve.sourceforge.net links because SF appears to reject from GHA

doc/OnlineDocs/explanation/solvers/mindtpy.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,7 @@ Augmented Penalty refers to the introduction of (non-negative) slack variables o
255255
Global Outer-Approximation
256256
^^^^^^^^^^^^^^^^^^^^^^^^^^
257257

258-
Apart from the decomposition methods for convex MINLP problems [`Kronqvist et al., 2019`_], MindtPy provides an implementation of Global Outer Approximation (GOA) as described in [`Kesavan & Allgor, 2004`_], to provide optimality guaranteed for nonconvex MINLP problems. Here, the validity of the Mixed-integer Linear Programming relaxation of the original problem is guaranteed via the usage of Generalized McCormick envelopes, computed using the :ref:`interface to the MC++ package <MC++>`. The NLP subproblems, in this case, need to be solved to global optimality, which can be achieved through global NLP solvers such as `BARON`_ or SCIP.
259-
260-
.. _BARON: https://minlp.com/baron-solver
258+
Apart from the decomposition methods for convex MINLP problems [`Kronqvist et al., 2019`_], MindtPy provides an implementation of Global Outer Approximation (GOA) as described in [`Kesavan & Allgor, 2004`_], to provide optimality guaranteed for nonconvex MINLP problems. Here, the validity of the Mixed-integer Linear Programming relaxation of the original problem is guaranteed via the usage of Generalized McCormick envelopes, computed using the :ref:`interface to the MC++ package <MC++>`. The NLP subproblems, in this case, need to be solved to global optimality, which can be achieved through global NLP solvers such as `BARON <https://minlp.com/baron-solver>`__ or `SCIP <https://www.scipopt.org>`__.
261259

262260

263261
Convergence

doc/OnlineDocs/explanation/solvers/pyros/getting_started.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ Installation
1414
In advance of using PyROS to solve robust optimization problems,
1515
you will need (at least) one local nonlinear programming (NLP) solver
1616
(e.g.,
17-
`CONOPT <https://conopt.gams.com/>`_,
18-
`IPOPT <https://github.com/coin-or/Ipopt>`_,
19-
`Knitro <https://www.artelys.com/solvers/knitro/>`_)
17+
`CONOPT <https://conopt.gams.com/>`__,
18+
`IPOPT <https://github.com/coin-or/Ipopt>`__,
19+
`Knitro <https://www.artelys.com/solvers/knitro/>`__)
2020
and (at least) one global NLP solver
2121
(e.g.,
22-
`BARON <https://minlp.com/baron-solver>`_,
23-
`COUENNE <https://www.coin-or.org/Couenne/>`_,
24-
SCIP)
22+
`BARON <https://minlp.com/baron-solver>`__,
23+
`COUENNE <https://www.coin-or.org/Couenne/>`__,
24+
`SCIP <https://www.scipopt.org>`__)
2525
installed and licensed on your system.
2626

2727
PyROS can be installed as follows:
@@ -57,10 +57,10 @@ PyROS can be installed as follows:
5757

5858
Some tests involving deterministic NLP solvers may be skipped
5959
if
60-
`IPOPT <https://github.com/coin-or/Ipopt>`_,
61-
`BARON <https://minlp.com/baron-solver>`_,
60+
`IPOPT <https://github.com/coin-or/Ipopt>`__,
61+
`BARON <https://minlp.com/baron-solver>`__,
6262
or
63-
SCIP
63+
`SCIP <https://www.scipopt.org>`__
6464
is not
6565
pre-installed and licensed on your system.
6666

doc/OnlineDocs/getting_started/solvers.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ the license requirements for their desired solver.
7979
* - SCIP (Command-line)
8080
- N/A
8181
- ``conda install ‑c conda‑forge scip``
82-
- (see SCIP project)
82+
- (see `SCIP <https://www.scipopt.org>`__ project)
8383
* - SCIP (Python)
8484
- ``pip install pyscipopt``
8585
- ``conda install ‑c conda‑forge pyscipopt``
86-
- (see SCIP project)
86+
- (see `SCIP <https://www.scipopt.org>`__ project)
8787
* - XPRESS
8888
- ``pip install xpress``
8989
- ``conda install ‑c fico‑xpress xpress``

0 commit comments

Comments
 (0)