Merge pull request #126 from JuliaReach/schillic/IA

IntervalArithmetic v0.21, unexport libraries, v2.0

Project.toml

@@ -1,18 +1,16 @@
 name = "RangeEnclosures"
 uuid = "1b4d18b6-9e5d-11e9-236c-f792b01831f8"
-version = "0.1.4"
+version = "0.2.0"
 
 [deps]
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 IntervalArithmetic = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253"
 ReachabilityBase = "379f33d0-9447-4353-bd03-d664070e549f"
-Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 
 [compat]
 ForwardDiff = "0.10"
-IntervalArithmetic = "0.15 - 0.20"
+IntervalArithmetic = "0.15 - 0.21"
 ReachabilityBase = "0.1.1 - 0.2"
-Reexport = "0.2, 1"
 Requires = "0.5, 1"
 julia = "1.6"

docs/Project.toml

@@ -1,4 +1,5 @@
 [deps]
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+IntervalArithmetic = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253"
 IntervalOptimisation = "c7c68f13-a4a2-5b9a-b424-07d005f8d9d2"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

docs/src/tutorial.md

@@ -143,8 +143,11 @@ Rh = enclose(h, Dh, BranchAndBoundEnclosure())
 ```
 
 We can visualize the result with the following script.
+For this we use the API of `IntervalArithmetic`, which must be loaded first.
 
 ```@example tutorial
+using IntervalArithmetic
+
 x = y = -5:0.1:5
 f(x, y) = h([x, y])
 plot(legend=:none, size=(800, 800), xlabel="x", ylabel="y", zlabel="h(x,y)",

src/RangeEnclosures.jl

@@ -1,11 +1,9 @@
 module RangeEnclosures
 
-using Requires, Reexport
-@reexport using ForwardDiff
-
-@reexport using IntervalArithmetic
+using Requires
+using ForwardDiff
+using IntervalArithmetic
 const Interval_or_IntervalBox = Union{Interval,IntervalBox}
-
 using ReachabilityBase.Require
 
 include("algorithms.jl")
@@ -44,4 +42,8 @@ export enclose,
        TaylorModelsEnclosure,
        BranchAndBoundEnclosure
 
+# standard ways from IntervalArithmetic to create intervals
+export interval, ..,
+       IntervalBox
+
 end  # module

test/multivariate.jl

@@ -36,9 +36,18 @@ end
     # Note: DynamicPolynomials automatically expands p, and evaluation using
     # interval arithmetic gives a worse left bound than the factored expression.
 
-    x = enclose(p, dom, SumOfSquaresEnclosure(; backend=SDPA.Optimizer))
-    @test isapprox(inf(x), 0.0; atol=1e-3)
-    @test isapprox(sup(x), 670.612; atol=1e-3)
+    if Sys.iswindows()
+        # SDPA is broken on Windows
+        @test_broken begin
+            x = enclose(p, dom, SumOfSquaresEnclosure(; backend=SDPA.Optimizer))
+            isapprox(inf(x), 0.0; atol=1e-3)
+            isapprox(sup(x), 670.612; atol=1e-3)
+        end
+    else
+        x = enclose(p, dom, SumOfSquaresEnclosure(; backend=SDPA.Optimizer))
+        @test isapprox(inf(x), 0.0; atol=1e-3)
+        @test isapprox(sup(x), 670.612; atol=1e-3)
+    end
 end
 
 @testset "Taylor-model solver without normalization" begin

test/runtests.jl

@@ -1,5 +1,11 @@
-using IntervalOptimisation, TaylorModels, Test, RangeEnclosures, SumOfSquares, SDPA,
-      AffineArithmetic
+using Test, RangeEnclosures
+using AffineArithmetic, IntervalOptimisation, TaylorModels, SumOfSquares
+
+@static if Sys.iswindows()
+    @test_broken using SDPA
+else
+    using SDPA
+end
 
 using DynamicPolynomials: @polyvar
 
@@ -13,8 +19,10 @@ available_solvers = (NaturalEnclosure(),
 include("univariate.jl")
 include("multivariate.jl")
 
-using Documenter
-include("../docs/init.jl")
-@time @testset "doctests" begin
-    doctest(RangeEnclosures)
+@static if !Sys.iswindows()  # broken due to SDPA
+    using Documenter
+    include("../docs/init.jl")
+    @time @testset "doctests" begin
+        doctest(RangeEnclosures)
+    end
 end

test/univariate.jl

@@ -50,10 +50,20 @@ end
     rleft, rright = relative_precision(x, xref)
     @test rleft ≤ 1e-5 && rright ≤ 1e-5
 
-    x = enclose(p, dom, SumOfSquaresEnclosure(; backend=SDPA.Optimizer))
-    xref = Interval(4.8333, 10.541)
-    rleft, rright = relative_precision(x, xref)
-    @test rleft ≤ 1e-5 && rright ≤ 1e-5
+    if Sys.iswindows()
+        # SDPA is broken on Windows
+        @test_broken begin
+            x = enclose(p, dom, SumOfSquaresEnclosure(; backend=SDPA.Optimizer))
+            xref = Interval(4.8333, 10.541)
+            rleft, rright = relative_precision(x, xref)
+            rleft ≤ 1e-5 && rright ≤ 1e-5
+        end
+    else
+        x = enclose(p, dom, SumOfSquaresEnclosure(; backend=SDPA.Optimizer))
+        xref = Interval(4.8333, 10.541)
+        rleft, rright = relative_precision(x, xref)
+        @test rleft ≤ 1e-5 && rright ≤ 1e-5
+    end
 end
 
 @testset "Taylor-model solver without normalization" begin