Simplify Experiment code after dropping RLExperiment (#1044)

Author: jeremiahpslewis

src/ReinforcementLearningCore/Project.toml

@@ -14,7 +14,6 @@ Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
 Functors = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
 GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-Parsers = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
 ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
@@ -37,7 +36,6 @@ Flux = "0.14"
 Functors = "0.1, 0.2, 0.3, 0.4"
 GPUArrays = "8, 9, 10"
 Metal = "1.0"
-Parsers = "2"
 ProgressMeter = "1"
 Reexport = "1"
 ReinforcementLearningBase = "0.12"

src/ReinforcementLearningCore/src/core/run.jl

@@ -1,63 +1,13 @@
-export @E_cmd, Experiment
+export Experiment
 
-
-import Parsers
-
-macro E_cmd(s)
-    Experiment(s)
-end
-
-function try_parse(s, TS=(Bool, Int, Float32, Float64))
-    if s == "nothing"
-        nothing
-    else
-        for T in TS
-            res = Parsers.tryparse(T, s)
-            if !isnothing(res)
-                return res
-            end
-        end
-        s
-    end
-end
-
-function try_parse_kw(s)
-    kw = []
-    # !!! obviously, it's not correct when a value is string and contains ","
-    for part in split(s, ",")
-        kv = split(part, "=")
-        @assert length(kv) == 2
-        k, v = kv
-        push!(kw, Symbol(strip(k)) => try_parse(strip(v)))
-    end
-    NamedTuple(kw)
-end
-
-struct Experiment{S}
-    policy::Any
-    env::Any
-    stop_condition::Any
-    hook::Any
-end
-
-Experiment(args...) = Experiment{Symbol()}(args...)
-
-function Experiment(s::String)
-    m = match(r"(?<source>\w+)_(?<method>\w+)_(?<env>\w+)(\((?<game>.*)\))?", s)
-    isnothing(m) && throw(
-        ArgumentError(
-            "invalid format, got $s, expected format is JuliaRL_DQN_Atari(game=\"pong\")`",
-        ),
-    )
-    source = m[:source]
-    method = m[:method]
-    env = m[:env]
-    kw_args = isnothing(m[:game]) ? (;) : try_parse_kw(m[:game])
-    ex = Experiment(Val(Symbol(source)), Val(Symbol(method)), Val(Symbol(env)); kw_args...)
-    Experiment{Symbol(s)}(ex.policy, ex.env, ex.stop_condition, ex.hook)
+struct Experiment
+    policy::AbstractPolicy
+    env::AbstractEnv
+    stop_condition::AbstractStopCondition
+    hook::AbstractHook
 end
 
-Base.show(io::IO, m::MIME"text/plain", t::Experiment{S}) where {S} = show(io, m, convert(AnnotatedStructTree, t; description=string(S)))
+Base.show(io::IO, m::MIME"text/plain", t::Experiment) = show(io, m, convert(AnnotatedStructTree, t))
 
 function Base.run(ex::Experiment)
     run(ex.policy, ex.env, ex.stop_condition, ex.hook)

src/ReinforcementLearningCore/test/core/base.jl

@@ -55,4 +55,32 @@ using TimerOutputs
         run(agent, env, stop_condition, hook)
         @test RLCore.timer isa TimerOutputs.TimerOutput
     end
+
+    @testset "Experiment" begin
+        # Create an instance of Experiment
+        policy = Agent(
+            RandomPolicy(),
+            Trajectory(
+                CircularArraySARTSTraces(; capacity = 1_000),
+                BatchSampler(1),
+                InsertSampleRatioController(n_inserted = -1),
+            ),
+        )
+        env = RandomWalk1D()
+        stop_condition = StopAfterEpisode(10)
+        hook = StepsPerEpisode()
+
+        exp = Experiment(policy, env, stop_condition, hook)
+
+        # Test that the fields are correctly assigned
+        @test exp.policy === policy
+        @test exp.env === env
+        @test exp.stop_condition === stop_condition
+        @test exp.hook === hook
+
+        # Test that the Experiment is callable
+        run(exp)
+        @test length(hook[]) == 10
+    end
+
 end