Refactor to allow containers to be directly used as spaces

src/CommonRLSpaces.jl

@@ -24,4 +24,9 @@ export
 
 include("array.jl")
 
+export
+    product
+
+include("product.jl")
+
 end

src/array.jl

@@ -43,6 +43,7 @@ elsize(b::Box) = size(b.lower)
 bounds(b::Box) = (b.lower, b.upper)
 Base.clamp(x::AbstractArray, b::Box) = clamp.(x, b.lower, b.upper)
 
+Base.convert(t::Type{<:Box}, i::ClosedInterval) = t(SA[minimum(i)], SA[maximum(i)])
 
 struct RepeatedSpace{B, S<:Tuple} <: AbstractArraySpace
     base_space::B

src/product.jl

@@ -0,0 +1,23 @@
+product(i1::ClosedInterval, i2::ClosedInterval) = Box(SA[minimum(i1), minimum(i2)], SA[maximum(i1), maximum(i2)])
+
+product(b::Box, i::ClosedInterval) = product(b, convert(Box, i))
+product(i::ClosedInterval, b::Box) = product(convert(Box, i), b)
+product(b1::Box{<:AbstractVector}, b2::Box{<:AbstractVector}) = Box(vcat(b1.lower, b2.lower), vcat(b1.upper, b2.upper))
+function product(b1::Box, b2::Box)
+    if size(b1.lower, 2) == size(b2.lower, 2) # same number of columns
+        return Box(vcat(b1.lower, b2.lower), vcat(b1.upper, b2.upper))
+    else
+        return GenericrSpaceProduct((b1, b2))
+    end
+end
+
+# handle case of 3 or more
+product(s1, s2, s3, args...) = product(product(s1, s2), s3, args...)
+
+struct GenericrSpaceProduct{T<:Tuple}
+    members::T
+end
+
+# handle any case not covered above
+product(s1, s2) = GenericrSpaceProduct((s1, s2))
+product(s1::GenericrSpaceProduct, s2) = GenericrSpaceProduct((s1.members..., s2))

test/array.jl

@@ -53,6 +53,15 @@
         @test @inferred elsize(b) == (2,2)
     end
 
+    @testset "Box comparison" begin
+        @test Box([1,2], [3,4]) == Box([1,2], [3,4])
+        @test Box([1,2], [3,4]) != Box([1,3], [3,4])
+    end
+
+    @testset "Interval to box conversion" begin
+        @test convert(Box, 1..2) == Box([1], [2])
+    end
+
     @testset "ArraySpace with Range" begin
         s = ArraySpace(1:5, 3, 4)
         @test @inferred SpaceStyle(s) == FiniteSpaceStyle()

test/product.jl

@@ -0,0 +1,15 @@
+@testset "Product of boxes" begin
+    @test product(Box([1], [2]), Box([3], [4])) == Box([1,3], [2,4])
+    @test product(Box(ones(2,1), 2*ones(2,1)), Box([3], [4])) == Box(@SMatrix([1;1;3]), @SMatrix([2;2;4]))
+end
+
+@testset "Product of intervals" begin
+    @test @inferred product(1..2, 3..4) == Box([1,3], [2,4])
+    @test @inferred product(1..2, 3..4, 5..6) == Box([1,3,5], [2,4,6])
+    @test @inferred product(1..2, 3..4, 5..6, 7..8) == Box([1,3,5,7], [2,4,6,8])
+end
+
+@testset "Product of Box and interval" begin
+    @test @inferred product(Box([1,3], [2,4]), 5..6) == Box([1,3,5], [2,4,6])
+    @test @inferred product(5..6, Box([1,3], [2,4])) == Box([5,1,3], [6,2,4])
+end

test/runtests.jl

@@ -6,4 +6,5 @@ using StaticArrays
 @testset "CommonRLSpaces.jl" begin
     include("basic.jl")
     include("array.jl")
+    include("product.jl")
 end