bugfix

Author: BatyLeo

src/DecisionFocusedLearningBenchmarks.jl

@@ -68,10 +68,12 @@ using .DynamicVehicleScheduling
 
 # Interface
 export AbstractBenchmark, AbstractStochasticBenchmark, AbstractDynamicBenchmark, DataSample
-export generate_sample,
-    generate_dataset, generate_scenario_generator, generate_anticipative_solver
+
+export generate_sample, generate_dataset, generate_environments
+export generate_scenario_generator, generate_anticipative_solver
 export generate_statistical_model
 export generate_maximizer, maximizer_kwargs
+
 export objective_value
 export plot_data, plot_instance, plot_solution
 export compute_gap

src/DynamicVehicleScheduling/DynamicVehicleScheduling.jl

@@ -32,8 +32,8 @@ include("static_vsp/plot.jl")
 # dynamic environment
 include("environment/instance.jl")
 include("environment/state.jl")
-include("environment/environment.jl")
 include("environment/scenario.jl")
+include("environment/environment.jl")
 include("environment/plot.jl")
 
 include("DynamicVSP/algorithms/prize_collecting_vsp.jl")
@@ -65,7 +65,11 @@ function Utils.generate_anticipative_solver(::DVSPBenchmark; kwargs...)
     return AnticipativeVSPPolicy(; kwargs...)
 end
 
-export DVSPBenchmark, generate_sample, generate_scenario
+function Utils.generate_environment(::DVSPBenchmark, instance::Instance; kwargs...)
+    return DVSPEnv(instance; kwargs...)
+end
+
+export DVSPBenchmark, generate_environment # , generate_sample, generate_anticipative_solver
 export run_policy!,
     GreedyVSPPolicy, LazyVSPPolicy, KleopatraVSPPolicy, AnticipativeVSPPolicy
 

src/DynamicVehicleScheduling/environment/environment.jl

@@ -84,3 +84,7 @@ function CommonRLInterface.act!(env::DVSPEnv, routes, scenario=env.scenario)
     add_new_customers!(env.state, env.instance; scenario[current_epoch(env)]...)
     return reward
 end
+
+function generate_scenario(env::DVSPEnv; kwargs...)
+    return generate_scenario(env.instance; kwargs...)
+end

src/DynamicVehicleScheduling/environment/scenario.jl

@@ -49,7 +49,3 @@ end
 function generate_scenario(sample::DataSample; kwargs...)
     return generate_scenario(sample.instance; kwargs...)
 end
-
-function generate_scenario(env::DVSPEnv; kwargs...)
-    return generate_scenario(env.instance; kwargs...)
-end

src/Utils/Utils.jl

@@ -25,7 +25,9 @@ export generate_dataset,
     generate_maximizer,
     generate_sample,
     generate_scenario_generator,
-    generate_anticipative_solver
+    generate_anticipative_solver,
+    generate_environment,
+    generate_environments
 export plot_data, compute_gap
 export maximizer_kwargs
 export grid_graph, get_path, path_to_matrix

src/Utils/interface.jl

@@ -210,3 +210,23 @@ It follows the same interface as [`AbstractStochasticBenchmark`](@ref), with the
 TODO
 """
 abstract type AbstractDynamicBenchmark <: AbstractStochasticBenchmark end
+
+"""
+    generate_environment(::AbstractDynamicBenchmark, instance; kwargs...)
+
+Initialize an environment for the given dynamic benchmark instance.
+"""
+function generate_environment end
+
+"""
+$TYPEDSIGNATURES
+
+Generate a vector of environments for the given dynamic benchmark and dataset.
+"""
+function generate_environments(
+    bench::AbstractDynamicBenchmark, dataset::Vector{<:DataSample}, kwargs...
+)
+    return map(dataset) do sample
+        generate_environment(bench, sample.instance; kwargs...)
+    end
+end