Merge pull request #959 from JuliaReach/schillic/453

#453 - Fix low/high

docs/src/lib/representations.md

@@ -239,8 +239,8 @@ dim(::Interval)
 an_element(::Interval{N}) where {N<:Real}
 vertices_list(::Interval{N}) where {N<:Real}
 center(::Interval{N}) where {N<:Real}
-low(::Interval{N}) where {N<:Real}
-high(::Interval{N}) where {N<:Real}
+min(::Interval{N}) where {N<:Real}
+max(::Interval{N}) where {N<:Real}
 radius_hyperrectangle(::Interval{N}) where {N<:Real}
 radius_hyperrectangle(::Interval{N}, ::Int) where {N<:Real}
 +(::Interval{N}, ::Interval{N}) where {N<:Real}

src/AbstractHyperrectangle.jl

@@ -2,7 +2,8 @@ import Base.∈
 
 export AbstractHyperrectangle,
        radius_hyperrectangle,
-       constraints_list
+       constraints_list,
+       low, high
 
 """
     AbstractHyperrectangle{N<:Real} <: AbstractCentrallySymmetricPolytope{N}

src/Hyperrectangle.jl

@@ -1,8 +1,6 @@
 import Base.rand
 
-export Hyperrectangle,
-       low,
-       high
+export Hyperrectangle
 
 """
     Hyperrectangle{N<:Real} <: AbstractHyperrectangle{N}

src/Interval.jl

@@ -1,10 +1,10 @@
 import IntervalArithmetic
 import IntervalArithmetic: AbstractInterval
-import Base: +, -, *, ∈, ⊆, rand
+import Base: +, -, *, ∈, ⊆, rand, min, max
 
 export Interval,
        dim, σ, center,
-       low, high, vertices_list
+       vertices_list
 
 """
     Interval{N<:Real, IN <: AbstractInterval{N}} <: AbstractHyperrectangle{N}
@@ -254,7 +254,7 @@ function ∈(v::N, x::Interval{N}) where {N<:Real}
 end
 
 """
-    low(x::Interval{N})::N where {N<:Real}
+    min(x::Interval{N})::N where {N<:Real}
 
 Return the lower component of an interval.
 
@@ -266,12 +266,12 @@ Return the lower component of an interval.
 
 The lower (`lo`) component of the interval.
 """
-function low(x::Interval{N})::N where {N<:Real}
+function min(x::Interval{N})::N where {N<:Real}
     return x.dat.lo
 end
 
 """
-    high(x::Interval{N})::N where {N<:Real}
+    max(x::Interval{N})::N where {N<:Real}
 
 Return the higher or upper component of an interval.
 
@@ -283,7 +283,7 @@ Return the higher or upper component of an interval.
 
 The higher (`hi`) component of the interval.
 """
-function high(x::Interval{N})::N where {N<:Real}
+function max(x::Interval{N})::N where {N<:Real}
     return x.dat.hi
 end
 
@@ -298,10 +298,10 @@ Return some element of an interval.
 
 ### Output
 
-The left border (`low(x)`) of the interval.
+The left border (`min(x)`) of the interval.
 """
 function an_element(x::Interval{N})::Vector{N} where {N<:Real}
-    return [low(x)]
+    return [min(x)]
 end
 
 """
@@ -354,7 +354,7 @@ Return the list of vertices of this interval.
 The list of vertices of the interval represented as two one-dimensional vectors.
 """
 function vertices_list(x::Interval{N})::Vector{Vector{N}} where {N<:Real}
-    return [[low(x)], [high(x)]]
+    return [[min(x)], [max(x)]]
 end
 
 
@@ -377,7 +377,7 @@ The box radius in the given dimension.
 """
 function radius_hyperrectangle(x::Interval{N}, i::Int)::N where {N<:Real}
     @assert i == 1 "an interval is one-dimensional"
-    return (high(x) - low(x)) / N(2)
+    return (max(x) - min(x)) / N(2)
 end
 
 """

src/concrete_intersection.jl

@@ -120,10 +120,10 @@ Otherwise the result is the interval that describes the intersection.
 function intersection(x::Interval{N},
                       y::Interval{N}
                      )::Union{Interval{N}, EmptySet{N}} where {N<:Real}
-    if low(y) > high(x) || low(x) > high(y)
+    if min(y) > max(x) || min(x) > max(y)
         return EmptySet{N}()
     else
-        return Interval(max(low(x), low(y)), min(high(x), high(y)))
+        return Interval(max(min(x), min(y)), min(max(x), max(y)))
     end
 end
 

src/convert.jl

@@ -339,7 +339,7 @@ Hyperrectangle{Float64}([0.5], [0.5])
 ```
 """
 function convert(::Type{Hyperrectangle}, x::Interval)
-    return Hyperrectangle(low=[low(x)], high=[high(x)])
+    return Hyperrectangle(low=[min(x)], high=[max(x)])
 end
 
 """

src/plot_recipes.jl

@@ -484,7 +484,7 @@ julia> plot(I);
     markershape --> (add_marker ? :circle : :none)
     markercolor --> color
 
-    [Tuple([low(I), 0.0]); Tuple([high(I), 0.0])]
+    [Tuple([min(I), 0.0]); Tuple([max(I), 0.0])]
 end
 
 """
@@ -519,6 +519,6 @@ julia> plot([I1, I2]);
     markercolor --> color
 
     for Ii in Xk
-        @series [Tuple([low(Ii), 0.0]); Tuple([high(Ii), 0.0])]
+        @series [Tuple([min(Ii), 0.0]); Tuple([max(Ii), 0.0])]
     end
 end

test/unit_Interval.jl

@@ -15,7 +15,7 @@ for N in [Float64, Float32, Rational{Int}]
 
     @test dim(x) == 1
     @test center(x) == N[0.5]
-    @test low(x) == N(0) && high(x) == N(1)
+    @test min(x) == N(0) && max(x) == N(1)
     v = vertices_list(x)
     @test N[0] in v && N[1] in v
     # test interface method an_element and membership
@@ -35,7 +35,7 @@ for N in [Float64, Float32, Rational{Int}]
     @test dim(m) == 1
     @test σ(N[1], m) == N[1.5]
     @test σ(N[-1], m) == N[-2]
-    @test low(m) == N(-2) && high(m) == N(1.5)
+    @test min(m) == N(-2) && max(m) == N(1.5)
     v = vertices_list(m)
     @test N[1.5] in v && N[-2] in v
 
@@ -44,7 +44,7 @@ for N in [Float64, Float32, Rational{Int}]
     @test dim(d) == 1
     @test σ(N[1], d) == N[3]
     @test σ(N[-1], d) == N[-0.5]
-    @test low(d) == N(-0.5) && high(d) == N(3)
+    @test min(d) == N(-0.5) && max(d) == N(3)
     v = vertices_list(d)
     @test N[-0.5] in v && N[3] in v
 
@@ -58,7 +58,7 @@ for N in [Float64, Float32, Rational{Int}]
 
     # test different arithmetic operations
     r = (x + y) - (d + p)
-    @test low(r) == N(-5.5) && high(r) == N(4)
+    @test min(r) == N(-5.5) && max(r) == N(4)
 
     # isempty
     @test !isempty(x)
@@ -87,7 +87,7 @@ for N in [Float64, Float32, Rational{Int}]
     B = Interval(N(3), N(6))
     C = intersection(A, B)
     @test C isa Interval
-    @test low(C) == N(5) && high(C) == N(6)
+    @test min(C) == N(5) && max(C) == N(6)
     # check empty intersection
     E = intersection(A, Interval(N(0), N(1)))
     @test isempty(E)