Update to JuMP v0.21, SumOfSquares v0.3 and SetProg v0.1

blegat · Feb 27, 2020 · c6bb7d0 · c6bb7d0
1 parent 905ebc6
commit c6bb7d0
Show file tree

Hide file tree

Showing 41 changed files with 176 additions and 176 deletions.
diff --git a/Project.toml b/Project.toml
@@ -29,26 +29,26 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 SumOfSquares = "4b9e565b-77fc-50a5-a571-1244f986bda1"
 
 [compat]
-Combinatorics = "0.7"
+Combinatorics = "1"
 DynamicPolynomials = "0.3"
-FillArrays = "0.7"
-GraphPlot = "0.3"
+FillArrays = "0.7, 0.8"
+GraphPlot = "0.3, 0.4"
 HybridSystems = "0.3"
-JuMP = "0.20"
+JuMP = "0.21"
 LightGraphs = "1"
 MathOptInterface = "0.9.5"
-MathematicalSystems = "0.6"
-MultivariateMoments = "0.2.3"
+MathematicalSystems = "0.11"
+MultivariateMoments = "0.3"
 MultivariatePolynomials = "0.3.2"
-Optim = "0.19"
-ParameterJuMP = "0.1.2"
-Polyhedra = "0.5"
-RecipesBase = "0.7"
+Optim = "0.19, 0.20"
+ParameterJuMP = "0.2"
+Polyhedra = "0.6"
+RecipesBase = "0.7, 0.8"
 Reexport = "0.2"
 SemialgebraicSets = "0.2"
-SetProg = "0.0.4"
-StaticArrays = "0.11"
-SumOfSquares = "~0.3.5"
+SetProg = "0.1"
+StaticArrays = "0.11, 0.12"
+SumOfSquares = "0.4"
 julia = "1"
 
 [extras]

diff --git a/examples/AJPR14e54.ipynb b/examples/AJPR14e54.ipynb
@@ -51,9 +51,9 @@
    },
    "outputs": [],
    "source": [
-    "using MathOptInterfaceMosek\n",
+    "using MosekTools\n",
     "using JuMP\n",
-    "factory = with_optimizer(MosekOptimizer, QUIET=true);"
+    "factory = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true);"
    ]
   },
   {

diff --git a/examples/AP12e21.ipynb b/examples/AP12e21.ipynb
@@ -51,9 +51,9 @@
    },
    "outputs": [],
    "source": [
-    "using MathOptInterfaceMosek\n",
+    "using MosekTools\n",
     "using JuMP\n",
-    "factory = with_optimizer(MosekOptimizer, QUIET=true);"
+    "factory = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true);"
    ]
   },
   {

diff --git a/examples/Consensus.ipynb b/examples/Consensus.ipynb
@@ -119,9 +119,9 @@
     }
    ],
    "source": [
-    "using MathOptInterfaceMosek\n",
+    "using MosekTools\n",
     "using JuMP\n",
-    "factory = with_optimizer(MosekOptimizer, QUIET=true);"
+    "factory = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true);"
    ]
   },
   {

diff --git a/examples/Controlled_Invariant_Sets/3D_System_unbounded_univariate_control.ipynb b/examples/Controlled_Invariant_Sets/3D_System_unbounded_univariate_control.ipynb
@@ -29,7 +29,7 @@
    "source": [
     "using MosekTools\n",
     "using JuMP\n",
-    "solver = with_optimizer(Mosek.Optimizer, QUIET=true)"
+    "solver = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true)"
    ]
   },
   {

diff --git a/examples/Controlled_Invariant_Sets/3D_System_unbounded_univariate_control_2.ipynb b/examples/Controlled_Invariant_Sets/3D_System_unbounded_univariate_control_2.ipynb
@@ -27,7 +27,7 @@
    "source": [
     "using MosekTools\n",
     "using JuMP\n",
-    "solver = with_optimizer(Mosek.Optimizer, QUIET=true)"
+    "solver = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true)"
    ]
   },
   {

diff --git a/examples/Controlled_Invariant_Sets/Planar_System_bounded_univariate_control.ipynb b/examples/Controlled_Invariant_Sets/Planar_System_bounded_univariate_control.ipynb
@@ -29,7 +29,7 @@
    "source": [
     "using MosekTools\n",
     "using JuMP\n",
-    "solver = with_optimizer(Mosek.Optimizer, QUIET=true)"
+    "solver = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true)"
    ]
   },
   {

diff --git a/examples/Controlled_Invariant_Sets/Planar_System_bounded_univariate_control_2.ipynb b/examples/Controlled_Invariant_Sets/Planar_System_bounded_univariate_control_2.ipynb
@@ -27,7 +27,7 @@
    "source": [
     "using MosekTools\n",
     "using JuMP\n",
-    "solver = with_optimizer(Mosek.Optimizer, QUIET=true)"
+    "solver = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true)"
    ]
   },
   {

diff --git a/examples/Controlled_Invariant_Sets/Planar_System_bounded_univariate_control_centered.ipynb b/examples/Controlled_Invariant_Sets/Planar_System_bounded_univariate_control_centered.ipynb
@@ -27,7 +27,7 @@
    "source": [
     "using MosekTools\n",
     "using JuMP\n",
-    "solver = with_optimizer(Mosek.Optimizer, QUIET=true)"
+    "solver = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true)"
    ]
   },
   {

diff --git a/examples/Euler_Ternary_Partition_Function.ipynb b/examples/Euler_Ternary_Partition_Function.ipynb
@@ -155,7 +155,7 @@
    "source": [
     "using GLPK\n",
     "using SwitchOnSafety\n",
-    "@time smp, done, polys = invariant_polytopes(s, with_optimizer(GLPK.Optimizer),\n",
+    "@time smp, done, polys = invariant_polytopes(s, GLPK.Optimizer,\n",
     "                                             SwitchOnSafety.periodicswitching(s, [3, 2]), verbose = 2);"
    ]
   },
@@ -270,7 +270,7 @@
    "source": [
     "using GLPK\n",
     "using SwitchOnSafety\n",
-    "@time smp, done, polys = invariant_polytopes(s, with_optimizer(GLPK.Optimizer),\n",
+    "@time smp, done, polys = invariant_polytopes(s, GLPK.Optimizer,\n",
     "                                             SwitchOnSafety.periodicswitching(s, [3]), max_length = 4, verbose=2);"
    ]
   },

diff --git a/examples/Finiteness_conjecture_counterexample.ipynb b/examples/Finiteness_conjecture_counterexample.ipynb
@@ -186,7 +186,7 @@
     "using GLPK\n",
     "using SwitchOnSafety\n",
     "s = A(0.8)\n",
-    "smp, done, polys = invariant_polytopes(s, with_optimizer(GLPK.Optimizer),\n",
+    "smp, done, polys = invariant_polytopes(s, GLPK.Optimizer,\n",
     "    SwitchOnSafety.periodicswitching(s, [2, 1]), tol=0.0, verbose=2);"
    ]
   },
@@ -272,7 +272,7 @@
     "using GLPK\n",
     "using SwitchOnSafety\n",
     "s = A(0.8)\n",
-    "smp, done, polys = invariant_polytopes(s, with_optimizer(GLPK.Optimizer),\n",
+    "smp, done, polys = invariant_polytopes(s, GLPK.Optimizer,\n",
     "    SwitchOnSafety.periodicswitching(s, [2, 1]), tol=1e-15, verbose=2);"
    ]
   },
@@ -322,7 +322,7 @@
     "using GLPK\n",
     "using SwitchOnSafety\n",
     "s = A(0.8)\n",
-    "smp, done, polys = invariant_polytopes(s, with_optimizer(GLPK.Optimizer),\n",
+    "smp, done, polys = invariant_polytopes(s, GLPK.Optimizer,\n",
     "    SwitchOnSafety.periodicswitching(s, [2, 1]), tol=1e-16, verbose=2);"
    ]
   },
@@ -346,7 +346,7 @@
     "using GLPK\n",
     "using SwitchOnSafety\n",
     "s = A(0.8)\n",
-    "smp, done, polys = invariant_polytopes(s, with_optimizer(GLPK.Optimizer), SwitchOnSafety.periodicswitching(s, [2, 1]));"
+    "smp, done, polys = invariant_polytopes(s, GLPK.Optimizer, SwitchOnSafety.periodicswitching(s, [2, 1]));"
    ]
   },
   {
@@ -378,7 +378,7 @@
     "using GLPK\n",
     "using SwitchOnSafety\n",
     "s = A(0.9)\n",
-    "smp, done, polys = invariant_polytopes(s, with_optimizer(GLPK.Optimizer),\n",
+    "smp, done, polys = invariant_polytopes(s, GLPK.Optimizer,\n",
     "    SwitchOnSafety.periodicswitching(s, [2, 1]));"
    ]
   },
@@ -621,7 +621,7 @@
    "source": [
     "using MosekTools\n",
     "using JuMP\n",
-    "factory = with_optimizer(Mosek.Optimizer, QUIET=true);"
+    "factory = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true);"
    ]
   },
   {
@@ -2177,7 +2177,7 @@
    ],
    "source": [
     "using JuMP, GLPK\n",
-    "@time smp, done, polys = invariant_polytopes(s∞, with_optimizer(GLPK.Optimizer), smp,\n",
+    "@time smp, done, polys = invariant_polytopes(s∞, GLPK.Optimizer, smp,\n",
     "    tol=1e-12, verbose=1, new_candidate_tol = 3e-3, max_length=400);"
    ]
   },
@@ -2203,7 +2203,7 @@
    ],
    "source": [
     "using JuMP, GLPK\n",
-    "@time smp, done, polys = invariant_polytopes(s∞, with_optimizer(GLPK.Optimizer), smp,\n",
+    "@time smp, done, polys = invariant_polytopes(s∞, GLPK.Optimizer, smp,\n",
     "    tol=1e-12, verbose=1, new_candidate_tol = 3e-3, max_length=400);"
    ]
   },
@@ -2229,7 +2229,7 @@
    ],
    "source": [
     "using JuMP, MosekTools\n",
-    "@time smp, done, polys = invariant_polytopes(s∞, with_optimizer(Mosek.Optimizer, QUIET=true), smp,\n",
+    "@time smp, done, polys = invariant_polytopes(s∞, optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true), smp,\n",
     "    tol=1e-12, verbose=1, new_candidate_tol = 3e-3, max_length=400);"
    ]
   },
@@ -2256,7 +2256,7 @@
    ],
    "source": [
     "smp = periodicswitching(s∞, [2, 1, 1, 2, 1, 1, 2, 1, 2, 1, 1, 2, 1, 1, 2, 1, 2, 1, 1, 2, 1])\n",
-    "@time smp, done, polys = invariant_polytopes(s∞, with_optimizer(Mosek.Optimizer, QUIET=true), smp,\n",
+    "@time smp, done, polys = invariant_polytopes(s∞, optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true), smp,\n",
     "    tol=1e-12, verbose=1, max_length=300);"
    ]
   },
@@ -2330,7 +2330,7 @@
    "source": [
     "using JuMP, GLPK\n",
     "psw = strbin(s∞, \"00100101\")\n",
-    "smp, done, polys = invariant_polytopes(s∞, with_optimizer(GLPK.Optimizer), psw, verbose=1, tol=1e-12,\n",
+    "smp, done, polys = invariant_polytopes(s∞, GLPK.Optimizer, psw, verbose=1, tol=1e-12,\n",
     "    max_length=1000, new_candidate_tol=1e-8, gready=true);"
    ]
   },
@@ -2365,7 +2365,7 @@
    "source": [
     "using JuMP, GLPK\n",
     "smp = strbin(s∞, \"01010010\")\n",
-    "smp, done, polys = invariant_polytopes(s∞, with_optimizer(GLPK.Optimizer), smp, verbose=1, tol=1e-12,\n",
+    "smp, done, polys = invariant_polytopes(s∞, GLPK.Optimizer, smp, verbose=1, tol=1e-12,\n",
     "    new_candidate_tol=1e-8, max_cycles=5, max_length=1000);"
    ]
   },
@@ -2430,7 +2430,7 @@
    "source": [
     "using JuMP, MosekTools\n",
     "psw = strbin(s∞, \"0\")\n",
-    "@time smp, done, polys = invariant_polytopes(s∞, with_optimizer(Mosek.Optimizer, QUIET=true), psw, verbose=1,\n",
+    "@time smp, done, polys = invariant_polytopes(s∞, optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true), psw, verbose=1,\n",
     "    tol=1e-8, new_candidate_tol=-2e-2, max_cycles=5, max_length=400, max_smp_length=22);"
    ]
   },
@@ -2463,7 +2463,7 @@
    "source": [
     "using JuMP, GLPK\n",
     "smp = strbin(s∞, \"0\")\n",
-    "@time smp, done, polys = invariant_polytopes(s∞, with_optimizer(GLPK.Optimizer), smp,\n",
+    "@time smp, done, polys = invariant_polytopes(s∞, GLPK.Optimizer, smp,\n",
     "                                             verbose=1, tol=1e-12, new_candidate_tol=-2e-2, max_length=400);"
    ]
   },
@@ -2495,7 +2495,7 @@
    "source": [
     "using JuMP, GLPK\n",
     "smp = strbin(s∞, \"1\")\n",
-    "@time smp, done, polys = invariant_polytopes(s∞, with_optimizer(GLPK.Optimizer), smp,\n",
+    "@time smp, done, polys = invariant_polytopes(s∞, GLPK.Optimizer, smp,\n",
     "                                             verbose=1, tol=0.0, new_candidate_tol=-2e-2);"
    ]
   },

diff --git a/examples/JCG14e61.ipynb b/examples/JCG14e61.ipynb
@@ -55,9 +55,9 @@
    },
    "outputs": [],
    "source": [
-    "using MathOptInterfaceMosek\n",
+    "using MosekTools\n",
     "using JuMP\n",
-    "factory = with_optimizer(MosekOptimizer, QUIET=true);"
+    "factory = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true);"
    ]
   },
   {

diff --git a/examples/JCG14e63.ipynb b/examples/JCG14e63.ipynb
@@ -53,9 +53,9 @@
    },
    "outputs": [],
    "source": [
-    "using MathOptInterfaceMosek\n",
+    "using MosekTools\n",
     "using JuMP\n",
-    "factory = with_optimizer(MosekOptimizer, QUIET=true);"
+    "factory = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true);"
    ]
   },
   {

diff --git a/examples/LPJ17.ipynb b/examples/LPJ17.ipynb
@@ -493,7 +493,7 @@
    ],
    "source": [
     "using JuMP, MosekTools\n",
-    "@time smp, done, polys = invariant_polytopes(hs, with_optimizer(Mosek.Optimizer, QUIET=true), smp,\n",
+    "@time smp, done, polys = invariant_polytopes(hs, optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true), smp,\n",
     "                                             tol=1e-2, verbose=2, max_length=40);"
    ]
   },
@@ -544,7 +544,7 @@
    ],
    "source": [
     "using JuMP, MosekTools\n",
-    "@time smp, done, polys = invariant_polytopes(hs, with_optimizer(Mosek.Optimizer, QUIET=true), psw1, tol=1e-6);"
+    "@time smp, done, polys = invariant_polytopes(hs, optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true), psw1, tol=1e-6);"
    ]
   },
   {
@@ -569,7 +569,7 @@
    ],
    "source": [
     "using JuMP, MosekTools\n",
-    "@time smp, done, polys = invariant_polytopes(hs, with_optimizer(Mosek.Optimizer, QUIET=true), psw2,\n",
+    "@time smp, done, polys = invariant_polytopes(hs, optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true), psw2,\n",
     "                                             tol=0.0, verbose=1, max_length=40);"
    ]
   },
@@ -590,7 +590,7 @@
    "source": [
     "using MosekTools\n",
     "using JuMP\n",
-    "factory = with_optimizer(Mosek.Optimizer, QUIET=true);"
+    "factory = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true);"
    ]
   },
   {

diff --git a/examples/LPJ18TAC.ipynb b/examples/LPJ18TAC.ipynb
@@ -68,7 +68,7 @@
    "source": [
     "using SwitchOnSafety\n",
     "using MosekTools\n",
-    "factory = with_optimizer(Mosek.Optimizer, QUIET=true)"
+    "factory = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true)"
    ]
   },
   {

diff --git a/examples/Long_product.ipynb b/examples/Long_product.ipynb
@@ -297,7 +297,7 @@
    ],
    "source": [
     "using JuMP, MosekTools, SwitchOnSafety\n",
-    "@time smp, done, polys = invariant_polytopes(s, with_optimizer(Mosek.Optimizer, QUIET=true),\n",
+    "@time smp, done, polys = invariant_polytopes(s, optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true),\n",
     "    periodicswitching(s, [2]), max_length=50, tol=0.0);"
    ]
   },
@@ -397,7 +397,7 @@
    ],
    "source": [
     "using JuMP, MosekTools, SwitchOnSafety\n",
-    "@time smp, done, polys = invariant_polytopes(s, with_optimizer(Mosek.Optimizer, QUIET=true),\n",
+    "@time smp, done, polys = invariant_polytopes(s, optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true),\n",
     "    periodicswitching(s, [2]), max_length=50);"
    ]
   },
@@ -495,7 +495,7 @@
    ],
    "source": [
     "using JuMP, MosekTools, SwitchOnSafety\n",
-    "@time smp, done, polys = invariant_polytopes(s, with_optimizer(Mosek.Optimizer, QUIET=true),\n",
+    "@time smp, done, polys = invariant_polytopes(s, optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true),\n",
     "    psw1, max_length=50, tol=1e-6);"
    ]
   },
@@ -516,7 +516,7 @@
    "source": [
     "using MosekTools\n",
     "using JuMP\n",
-    "factory = with_optimizer(Mosek.Optimizer, QUIET=true);"
+    "factory = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true);"
    ]
   },
   {

diff --git a/examples/PJ08e54.ipynb b/examples/PJ08e54.ipynb
@@ -88,9 +88,9 @@
    },
    "outputs": [],
    "source": [
-    "using MathOptInterfaceMosek\n",
+    "using MosekTools\n",
     "using JuMP\n",
-    "factory = with_optimizer(MosekOptimizer, QUIET=true);"
+    "factory = optimizer_with_attributes(Mosek.Optimizer, MOI.Silent() => true);"
    ]
   },
   {