add more tests

Author: findmyway

src/basic.jl

@@ -1,4 +1,4 @@
-export Space, SpaceStyle, DiscreteSpaceStyle, ContinuousSpaceStyle
+export Space, SpaceStyle, DiscreteSpaceStyle, ContinuousSpaceStyle, TupleSpace, NamedSpace, DictSpace
 
 using Random
 
@@ -12,10 +12,6 @@ Space(x, dims::Int...) = Space(fill(x, dims))
 Space(x::Type{T}, dims::Int...) where {T<:Integer} = Space(fill(typemin(x):typemax(T), dims))
 Space(x::Type{T}, dims::Int...) where {T<:AbstractFloat} = Space(fill(typemin(x) .. typemax(T), dims))
 
-const TupleSpace = Tuple{Vararg{<:Space}}
-const NamedSpace = NamedTuple{<:Any,<:TupleSpace}
-const DictSpace = Dict{<:Any,<:Space}
-
 Base.size(s::Space) = size(SpaceStyle(s))
 
 #####
@@ -71,4 +67,17 @@ function Random.rand(rng::AbstractRNG, s::Interval{:closed,:closed,T}) where {T}
 
         r * (s.right - s.left) + s.left
     end
-end
+end
+
+#####
+
+const TupleSpace = Tuple{Vararg{<:Space}}
+const NamedSpace = NamedTuple{<:Any,<:TupleSpace}
+const DictSpace = Dict{<:Any,<:Space}
+
+Random.rand(rng::AbstractRNG, s::Union{TupleSpace,NamedSpace}) = map(x -> rand(rng, x), s)
+Random.rand(rng::AbstractRNG, s::DictSpace) = Dict(k => rand(rng, s[k]) for k in keys(s))
+
+Base.in(xs::Tuple, ts::TupleSpace) = length(xs) == length(ts) && all(((x, s),) -> x in s, zip(xs, ts))
+Base.in(xs::NamedTuple{names}, ns::NamedTuple{names,<:TupleSpace}) where {names} = all(((x, s),) -> x in s, zip(xs, ns))
+Base.in(xs::Dict, ds::DictSpace) = length(xs) == length(ds) && all(k -> haskey(ds, k) && xs[k] in ds[k], keys(xs))

test/runtests.jl

@@ -2,36 +2,54 @@ using CommonRLSpaces
 using Test
 
 @testset "CommonRLSpaces.jl" begin
-    s1 = Space((:cat, :dog))
-    @test :cat in s1
-    @test !(nothing in s1)
-
-    s2 = Space(0:1)
-    @test 0 in s2
-    @test !(0.5 in s2)
-
-    s3 = Space(Bool)
-    @test false in s3
-    @test true in s3
-
-    s4 = Space(Float64)
-    @test rand() in s4
-    @test 0 in s4
+    @testset "Spaces" begin
+        s1 = Space((:cat, :dog))
+        @test :cat in s1
+        @test !(nothing in s1)
+
+        s2 = Space(0:1)
+        @test 0 in s2
+        @test !(0.5 in s2)
+
+        s3 = Space(Bool)
+        @test false in s3
+        @test true in s3
+
+        s4 = Space(Float64)
+        @test rand() in s4
+        @test 0 in s4
+
+        s5 = Space(Float64, 3, 4)
+        @test rand(3, 4) in s5
+
+        s6 = Space(SVector((:cat, :dog), (:litchi, :longan, :mango)))
+        @test SVector(:dog, :litchi) in s6
+
+        s7 = Space([-1 .. 1, 2 .. 3])
+        @test [0, 2] in s7
+        @test !([-5, 5] in s7)
+
+        for _ in 1:100
+            for s in [s1, s2, s3, s4, s5, s6, s7]
+                @test rand(s) in s
+            end
+        end
+    end
 
-    s5 = Space(Float64, 3, 4)
-    @test rand(3, 4) in s5
+    @testset "Meta Spaces" begin
+        s1 = (Space(1:2), Space(Float64, 2, 3))
+        @test (1, rand(2, 3)) in s1
 
-    s6 = Space(SVector((:cat, :dog), (:litchi, :longan, :mango)))
-    @test SVector(:dog, :litchi) in s6
+        s2 = (a=Space(1:2), b=Space(Float64, 2, 3))
+        @test (a=1, b=rand(2, 3)) in s2
 
-    s7 = Space([-1 .. 1, 2 .. 3])
-    @test [0, 2] in s7
-    @test !([-5, 5] in s7)
+        s3 = Dict(:a => Space(1:2), :b => Space(Float64, 2, 3))
+        @test Dict(:a => 1, :b => rand(2, 3)) in s3
 
-    # for _ in 1:100
-    for s in [s1, s2, s3, s4, s5, s6, s7]
-        @info s
-        @test rand(s) in s
+        for _ in 1:100
+            for s in [s1, s2, s3]
+                rand(s) in s
+            end
+        end
     end
-    # end
 end