From ee5dea336feaae055db21c179231a7943f521908 Mon Sep 17 00:00:00 2001 From: James Foster <38274066+jd-foster@users.noreply.github.com> Date: Fri, 20 Oct 2023 15:55:43 +1100 Subject: [PATCH 1/2] Add MINOTAUR to solver list MINOTAUR can run from an .nl stud (see "Running solvers" section of https://minotaur-solver.github.io/downloads.html) BSD-like licence: https://en.wikipedia.org/wiki/BSD_licenses --- docs/src/installation.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/installation.md b/docs/src/installation.md index 01840912a3f..d06bb7d7846 100644 --- a/docs/src/installation.md +++ b/docs/src/installation.md @@ -127,6 +127,7 @@ The link in the `Solver` column is the corresponding Julia package. | [Loraine.jl](https://github.com/kocvara/Loraine.jl) | | | MIT | LP, SDP | | [MadNLP.jl](https://github.com/sshin23/MadNLP.jl) | | | MIT | LP, QP, NLP | | [MiniZinc](https://www.minizinc.org/) | [MiniZinc.jl](https://github.com/jump-dev/MiniZinc.jl) | Manual | MPL-2 | CP-SAT | +| [MINOTAUR](https://github.com/coin-or/minotaur) | [AmplNLWriter.jl](https://github.com/jump-dev/AmplNLWriter.jl) | Manual | BSD-like | (MI)NLP | | [MOSEK](https://www.mosek.com/) | [MosekTools.jl](https://github.com/jump-dev/MosekTools.jl) | Manual | Comm. | (MI)LP, (MI)SOCP, SDP | | [NLopt](https://github.com/stevengj/nlopt) | [NLopt.jl](https://github.com/JuliaOpt/NLopt.jl) | | GPL | LP, QP, NLP | | [Octeract](https://octeract.gg) | [AmplNLWriter.jl](https://github.com/jump-dev/AmplNLWriter.jl) | | Comm. | (MI)NLP | From 14720d87cc3ce1af803178b728c2f60fcb6426dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Fri, 20 Oct 2023 13:43:06 +0200 Subject: [PATCH 2/2] MINOTAUR -> Minotaur --- docs/src/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/installation.md b/docs/src/installation.md index d06bb7d7846..575d1b7ec78 100644 --- a/docs/src/installation.md +++ b/docs/src/installation.md @@ -127,7 +127,7 @@ The link in the `Solver` column is the corresponding Julia package. | [Loraine.jl](https://github.com/kocvara/Loraine.jl) | | | MIT | LP, SDP | | [MadNLP.jl](https://github.com/sshin23/MadNLP.jl) | | | MIT | LP, QP, NLP | | [MiniZinc](https://www.minizinc.org/) | [MiniZinc.jl](https://github.com/jump-dev/MiniZinc.jl) | Manual | MPL-2 | CP-SAT | -| [MINOTAUR](https://github.com/coin-or/minotaur) | [AmplNLWriter.jl](https://github.com/jump-dev/AmplNLWriter.jl) | Manual | BSD-like | (MI)NLP | +| [Minotaur](https://github.com/coin-or/minotaur) | [AmplNLWriter.jl](https://github.com/jump-dev/AmplNLWriter.jl) | Manual | BSD-like | (MI)NLP | | [MOSEK](https://www.mosek.com/) | [MosekTools.jl](https://github.com/jump-dev/MosekTools.jl) | Manual | Comm. | (MI)LP, (MI)SOCP, SDP | | [NLopt](https://github.com/stevengj/nlopt) | [NLopt.jl](https://github.com/JuliaOpt/NLopt.jl) | | GPL | LP, QP, NLP | | [Octeract](https://octeract.gg) | [AmplNLWriter.jl](https://github.com/jump-dev/AmplNLWriter.jl) | | Comm. | (MI)NLP |