Skip to content
This repository was archived by the owner on Aug 11, 2023. It is now read-only.

Commit f882dd9

Browse files
jbreajbrea
authored
Merge pull request #1 from findmyway/master
Add Space & AbstractEnv into base
2 parents 6b0ec82 + f3ef2fb commit f882dd9

15 files changed

+255
-3
lines changed

Diff for: ‎.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
*.jl.cov
2+
*.jl.*.cov
3+
*.jl.mem
4+
deps/deps.jl
5+
6+
Manifest.toml

Diff for: ‎.travis.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
## Documentation: http://docs.travis-ci.com/user/languages/julia/
2+
language: julia
3+
os:
4+
- linux
5+
- osx
6+
julia:
7+
- 1.0
8+
- nightly
9+
notifications:
10+
email: false
11+
git:
12+
depth: 99999999
13+
14+
## uncomment the following lines to allow failures on nightly julia
15+
## (tests will run but not make your overall status red)
16+
#matrix:
17+
# allow_failures:
18+
# - julia: nightly
19+
20+
## uncomment and modify the following lines to manually install system packages
21+
#addons:
22+
# apt: # apt-get for linux
23+
# packages:
24+
# - gfortran
25+
#before_script: # homebrew for mac
26+
# - if [ $TRAVIS_OS_NAME = osx ]; then brew install gcc; fi
27+
28+
## uncomment the following lines to override the default test script
29+
script:
30+
- julia -e 'using Pkg; Pkg.activate(pwd()); Pkg.test()'

Diff for: ‎Project.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
authors = ["Johanni Brea <[email protected]>"]
21
name = "ReinforcementLearningBase"
32
uuid = "9b2b9cba-ac73-11e8-02b1-9f0869453fc0"
3+
authors = ["Johanni Brea <[email protected]>", "Jun Tian <[email protected]>"]
44
version = "0.1.0"
55

6-
[deps]
6+
[extras]
7+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
8+
9+
[targets]
10+
test = ["Test"]

Diff for: ‎README.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# ReinforcementLearningBase.jl
2+
3+
[![Build Status](https://travis-ci.com/JuliaReinforcementLearning/ReinforcementLearningBase.jl.svg?branch=master)](https://travis-ci.com/JuliaReinforcementLearning/ReinforcementLearningBase.jl)
4+
5+
ReinforcementLearningBase.jl holds the common types and utility functions to be shared by other components in ReinforcementLearning ecosystem.

Diff for: ‎REQUIRE

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
julia 1.0

Diff for: ‎src/ReinforcementLearningBase.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module ReinforcementLearningBase
22

3-
greet() = print("Hello World!")
3+
include("spaces/space.jl")
4+
include("abstractenv.jl")
45

56
end # module

Diff for: ‎src/abstractenv.jl

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
export AbstractEnv
2+
abstract type AbstractEnv end
3+
4+
"Get current state of an environment"
5+
function getstate end
6+
7+
"Reset an environment to the initial state"
8+
function reset! end
9+
10+
"Take an action in an environment and return the current state"
11+
function interact! end
12+
13+
"Get the action space of an environment"
14+
function actionspace end
15+
16+
"Plot the current state of an environment"
17+
function plotenv end

Diff for: ‎src/spaces/abstractspace.jl

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
abstract type AbstractSpace end
2+
3+
"""
4+
sample(s::AbstractSpace)
5+
6+
Get a random sample from `s`.
7+
"""
8+
function sample end
9+
10+
"""
11+
occursin(x, s::AbstractSpace)
12+
13+
Return wheather `x` is a valid sample in space `s`.
14+
"""
15+
function occursin end

Diff for: ‎src/spaces/boxspace.jl

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
"A box in R^n."
2+
struct BoxSpace{T <: Number,N} <: AbstractSpace
3+
low::Array{T,N}
4+
high::Array{T,N}
5+
end
6+
7+
size(s::BoxSpace) = size(s.low)
8+
9+
"""
10+
BoxSpace(low::Number, high::Number, size::Tuple{Vararg{Int}}=(1,))
11+
12+
```julia
13+
BoxSpace(-1, 1)
14+
BoxSpace(-1, 1, (2,3))
15+
```
16+
"""
17+
BoxSpace(low::Number, high::Number, size::Tuple{Vararg{Int}}=(1,)) = BoxSpace(fill(low, size), fill(high, size))
18+
19+
"""
20+
BoxSpace(low::Array{<:Number}, high::Array{<:Number})
21+
22+
```julia
23+
BoxSpace([0, 0, 0], [1, 2, 3])
24+
```
25+
"""
26+
BoxSpace(low::Array{<:Number}, high::Array{<:Number}) = size(low) == size(high) && BoxSpace(low, high)
27+
28+
==(x::BoxSpace, y::BoxSpace) = x.low == y.low && x.high == y.high
29+
30+
sample(s::BoxSpace) = map((l, h) -> l + rand() * (h - l), s.low, s.high)
31+
32+
occursin(xs::Array{<:Number}, s::BoxSpace) = size(s) == size(xs) &&
33+
all(map((a, b, c) -> a ≤ b ≤ c, s.low, xs, s.high))
34+
occursin(x::Number, s::BoxSpace) = all(map((l, h) -> l ≤ x ≤ h, s.low, s.high))

Diff for: ‎src/spaces/discretespace.jl

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
struct DiscreteSpace <: AbstractSpace
2+
n::Int
3+
offset::Int
4+
end
5+
6+
size(d::DiscreteSpace) = 1
7+
sample(d::DiscreteSpace) = rand(d.offset : d.n + d.offset - 1)
8+
occursin(x::Int, d::DiscreteSpace) = d.offset ≤ x < d.offset + d.n
9+
==(x::DiscreteSpace, y::DiscreteSpace) = x.n == y.n && x.offset == y.offset

Diff for: ‎src/spaces/multibinaryspace.jl

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
struct MultiBinarySpace <: AbstractSpace
2+
size::Tuple{Vararg{Int}}
3+
end
4+
5+
MultiBinarySpace(sz::Vararg{Int}) = MultiBinarySpace(sz)
6+
7+
size(s::MultiBinarySpace) = s.size
8+
9+
sample(s::MultiBinarySpace) = rand(Bool, s.size...)
10+
occursin(x::Array{Bool}, s::MultiBinarySpace) = size(s) == size(x)
11+
==(x::MultiBinarySpace, y::MultiBinarySpace) = x.size == y.size

Diff for: ‎src/spaces/multidiscretespace.jl

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
struct MultiDiscreteSpace{N} <:AbstractSpace
2+
counts::Array{Int, N}
3+
offset::Int
4+
end
5+
6+
size(s::MultiDiscreteSpace) = size(s.counts)
7+
8+
"To compat with Python, here we start with 0"
9+
sample(s::MultiDiscreteSpace) = map(x -> rand(s.offset : x + s.offset -1), s.counts)
10+
occursin(x::Int, s::MultiDiscreteSpace) = all(e -> s.offset ≤ x < e + s.offset, s.counts)
11+
occursin(xs::Array{Int}, s::MultiDiscreteSpace) = size(s) == size(xs) &&
12+
all(map((e, x) -> s.offset ≤ x < e + s.offset , s.counts, xs))
13+
==(x::MultiDiscreteSpace, y::MultiDiscreteSpace) = x.counts == y.counts && x.offset == y.offset

Diff for: ‎src/spaces/space.jl

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import Base:occursin, size, ==
2+
export AbstractSpace,
3+
BoxSpace,
4+
DiscreteSpace,
5+
MultiBinarySpace,
6+
MultiDiscreteSpace,
7+
sample
8+
9+
include("abstractspace.jl")
10+
include("boxspace.jl")
11+
include("discretespace.jl")
12+
include("multibinaryspace.jl")
13+
include("multidiscretespace.jl")
14+
15+
# Tuple Support
16+
sample(s::Tuple{Vararg{<:AbstractSpace}}) = map(sample, s)
17+
occursin(a::Tuple, b::Tuple{Vararg{<:AbstractSpace}}) = length(a) == length(b) &&
18+
all(map((x, y) -> occursin(x, y), a, b))
19+
20+
# Dict Support
21+
sample(s::Dict{String}) = Dict(map((k, v) -> (k, sample(v)), s))
22+
occursin(a::Dict{String}, b::Dict{String}) = length(a) == length(b) &&
23+
all(p -> haskey(a, p.first) ?
24+
occursin(a[p.first], p.second) :
25+
false,
26+
b)

Diff for: ‎test/runtests.jl

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
using ReinforcementLearningBase
2+
using Test
3+
4+
include("space.jl")

Diff for: ‎test/space.jl

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
@testset "Space" begin
2+
3+
@testset "BoxSpace" begin
4+
@test occursin(0.5, BoxSpace(0, 1)) == true
5+
@test occursin(0.0, BoxSpace(0, 1)) == true
6+
@test occursin(1.0, BoxSpace(0, 1)) == true
7+
@test occursin(-1.0, BoxSpace(0, 1)) == false
8+
@test occursin(-Inf, BoxSpace(0, 1)) == false
9+
@test occursin([0.5], BoxSpace(0, 1)) == true
10+
11+
@test occursin([0, 0], BoxSpace([-1, -2], [1, 2])) == true
12+
@test occursin([0, 3], BoxSpace([-1, -2], [1, 2])) == false
13+
@test occursin([0, 0], BoxSpace([-1, -2], [1, 2])) == true
14+
end
15+
16+
@testset "DiscreteSpace" begin
17+
@test occursin(0, DiscreteSpace(10, 0)) == true
18+
@test occursin(5, DiscreteSpace(10, 0)) == true
19+
@test occursin(10, DiscreteSpace(10, 0)) == false
20+
end
21+
22+
@testset "MultiBinarySpace" begin
23+
@test occursin([true false; true false], MultiBinarySpace(2,2)) == true
24+
@test occursin([true false], MultiBinarySpace(2,2)) == false
25+
end
26+
27+
@testset "MultiDiscreteSpace" begin
28+
@test occursin(0, MultiDiscreteSpace([2,3,2], 0)) == true
29+
@test occursin(1, MultiDiscreteSpace([2,3,2], 0)) == true
30+
@test occursin(2, MultiDiscreteSpace([2,3,2], 0)) == false
31+
@test occursin([1,1,1], MultiDiscreteSpace([2,3,2], 0)) == true
32+
@test occursin([0,0,0], MultiDiscreteSpace([2,3,2], 0)) == true
33+
@test occursin([3,3,3], MultiDiscreteSpace([2,3,2], 0)) == false
34+
end
35+
36+
@testset "Space Tuple" begin
37+
@test occursin(([0.5], 5, [true true; true true], [1, 1]),
38+
(BoxSpace(0,1), DiscreteSpace(5, 0), MultiBinarySpace(2,2), MultiDiscreteSpace([2,2], 0))) == false
39+
@test occursin(([0.5], 0, [true true; true true], [1, 1]),
40+
(BoxSpace(0,1), DiscreteSpace(5, 0), MultiBinarySpace(2,2), MultiDiscreteSpace([2,2], 0))) == true
41+
@test occursin((),
42+
(BoxSpace(0,1), DiscreteSpace(5, 0), MultiBinarySpace(2,2), MultiDiscreteSpace([2,2], 0))) == false
43+
end
44+
45+
@testset "Space Dict" begin
46+
@test occursin(
47+
Dict(
48+
"sensors" => Dict(
49+
"position" => [-10, 0, 10],
50+
"velocity" => [0.1, 0.2, 0.3],
51+
"front_cam" => (rand(10, 10, 3), rand(10, 10, 3)),
52+
"rear_cam" => rand(10,10,3)),
53+
"ext_controller" => [2, 1, 1],
54+
"inner_state" => Dict(
55+
"charge" => 35,
56+
"system_checks" => rand(Bool, 10),
57+
"job_status" => Dict(
58+
"task" => 3,
59+
"progress" => 23))),
60+
Dict(
61+
"sensors" => Dict(
62+
"position"=> BoxSpace(-100, 100, (3,)),
63+
"velocity"=> BoxSpace(-1, 1, (3,)),
64+
"front_cam"=> (BoxSpace(0, 1, (10, 10, 3)),
65+
BoxSpace(0, 1, (10, 10, 3))),
66+
"rear_cam" => BoxSpace(0, 1, (10, 10, 3))),
67+
"ext_controller" => MultiDiscreteSpace([5, 2, 2], 0),
68+
"inner_state" => Dict(
69+
"charge" => DiscreteSpace(100, 0),
70+
"system_checks" => MultiBinarySpace(10),
71+
"job_status" => Dict(
72+
"task" => DiscreteSpace(5, 0),
73+
"progress" => BoxSpace(0, 100))))) == true
74+
end
75+
76+
end

0 commit comments

Comments
 (0)