Merge pull request #2942 from JuliaReach/compathelper/new_version/2022-02-26-00-34-40-571-02292608867

CompatHelper: bump compat for JuMP to 0.23, (keep existing compat)

Author: schillic

Project.toml

@@ -22,7 +22,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 ExprTools = "0.1"
 GLPK = "0.11 - 0.15, 1"
 IntervalArithmetic = "0.15 - 0.20"
-JuMP = "0.21 - 0.22"
+JuMP = "0.21 - 0.23"
 RecipesBase = "0.6 - 0.8, 1"
 Reexport = "0.2, 1"
 Requires = "0.5, 1"

src/Approximations/overapproximate.jl

@@ -949,7 +949,7 @@ julia> x₁, x₂ = set_variables(Float64, ["x₁", "x₂"], order=8)
   1.0 x₂ + 𝒪(‖x‖⁹)
 
 julia> x₀ = IntervalBox(0..0, 2) # expansion point
-[0, 0] × [0, 0]
+[0, 0]²
 
 julia> Dx₁ = IA.Interval(0.0, 3.0) # domain for x₁
 [0, 3]

test/Approximations/overapproximate.jl

@@ -480,12 +480,13 @@ for N in [Float64]
     cap = overapproximate(Z ∩ L, OctDirections)
     @test (L ∩ Z) ⊆ cap
 
+    # NOTE: ICP currently leads to unsatisfiable package requirements
     # overapproximate a nonlinear constraint with an HPolyhedron
-    dom = IntervalBox(IA.Interval(-2, 2), IA.Interval(-2, 2))
-    C = @constraint x^2 + y^2 <= 1
-    p = pave(C, dom, 0.01)
-    dirs = OctDirections(2)
-    H = overapproximate(p, dirs)
-    B2 = Ball2(N[0, 0], N(1))
-    @test B2 ⊆ H
+#     dom = IntervalBox(IA.Interval(-2, 2), IA.Interval(-2, 2))
+#     C = @constraint x^2 + y^2 <= 1
+#     p = pave(C, dom, 0.01)
+#     dirs = OctDirections(2)
+#     H = overapproximate(p, dirs)
+#     B2 = Ball2(N[0, 0], N(1))
+#     @test B2 ⊆ H
 end

test/Project.toml

@@ -6,7 +6,7 @@ Expokit = "a1e7a1ef-7a5d-5822-a38c-be74e1bb89f4"
 ExponentialUtilities = "d4d017d3-3776-5f7e-afef-a10c40355c18"
 GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
 IntervalArithmetic = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253"
-IntervalConstraintProgramming = "138f1668-1576-5ad7-91b9-7425abbf3153"
+# IntervalConstraintProgramming = "138f1668-1576-5ad7-91b9-7425abbf3153"
 IntervalMatrices = "5c1f47dc-42dd-5697-8aaa-4d102d140ba9"
 Javis = "78b212ba-a7f9-42d4-b726-60726080707e"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -25,14 +25,14 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192"
 
 [compat]
-CDDLib = "0.6 - 0.8"
+CDDLib = "0.6 - 0.9"
 Distributions = "0.19 - 0.25"
 Documenter = "0.23 - 0.27"
 Expokit = "0.2"
 ExponentialUtilities = "1"
 GR = "0"
 IntervalArithmetic = "0.15 - 0.20"
-IntervalConstraintProgramming = "0.9 - 0.12"
+# IntervalConstraintProgramming = "0.9 - 0.12"
 IntervalMatrices = "0.8"
 Javis = "0.5 - 0.7"
 Makie = "0.9 - 0.16"

test/runtests.jl

@@ -1,6 +1,5 @@
-using LazySets, LazySets.Approximations, Test, LinearAlgebra, SparseArrays, StaticArrays
-
-using LazySets: _leq, _geq, isapproxzero, _isapprox, _ztol
+using LazySets, LazySets.Approximations, Test, LinearAlgebra, SparseArrays,
+      StaticArrays
 
 # fix random number generator seed
 using Random
@@ -10,18 +9,19 @@ Random.seed!(1234)
 # Optional dependencies
 # ========================
 import Distributions, ExponentialUtilities, Expokit, IntervalArithmetic,
-       IntervalMatrices, Optim, Pkg, TaylorModels, IntervalConstraintProgramming
+       IntervalMatrices, Optim, Pkg, TaylorModels
 const IA = IntervalArithmetic
 using IntervalArithmetic: IntervalBox
 using IntervalMatrices: ±, IntervalMatrix
 using TaylorModels: set_variables, TaylorModelN
-using IntervalConstraintProgramming
+# ICP currently leads to unsatisfiable package requirements
+# using IntervalConstraintProgramming
 using Symbolics
 
 # ==============================
 # Non-exported helper functions
 # ==============================
-using LazySets: ispermutation
+using LazySets: _leq, _geq, isapproxzero, _isapprox, _ztol, ispermutation
 using LazySets.Arrays: isinvertible, inner, allequal,
                        is_cyclic_permutation, SingleEntryVector