update

Author: BatyLeo

src/DecisionFocusedLearningBenchmarks.jl

@@ -68,7 +68,8 @@ using .DynamicVehicleScheduling
 
 # Interface
 export AbstractBenchmark, AbstractStochasticBenchmark, AbstractDynamicBenchmark, DataSample
-export generate_sample, generate_dataset, generate_scenario
+export generate_sample,
+    generate_dataset, generate_scenario_generator, generate_anticipative_solver
 export generate_statistical_model
 export generate_maximizer, maximizer_kwargs
 export objective_value

src/DynamicVehicleScheduling/DynamicVehicleScheduling.jl

@@ -31,9 +31,9 @@ include("static_vsp/plot.jl")
 
 # dynamic environment
 include("environment/instance.jl")
-include("environment/scenario.jl")
 include("environment/state.jl")
 include("environment/environment.jl")
+include("environment/scenario.jl")
 include("environment/plot.jl")
 
 include("DynamicVSP/algorithms/prize_collecting_vsp.jl")
@@ -43,44 +43,30 @@ include("DynamicVSP/learning/features.jl")
 include("DynamicVSP/learning/2d_features.jl")
 include("DynamicVSP/learning/dataset.jl")
 
-include("DynamicVSP/policy/abstract_vsp_policy.jl")
-include("DynamicVSP/policy/greedy_policy.jl")
-include("DynamicVSP/policy/lazy_policy.jl")
-include("DynamicVSP/policy/anticipative_policy.jl")
-include("DynamicVSP/policy/kleopatra_policy.jl")
+include("policy/abstract_vsp_policy.jl")
+include("policy/greedy_policy.jl")
+include("policy/lazy_policy.jl")
+include("policy/anticipative_policy.jl")
+include("policy/kleopatra_policy.jl")
 
 struct DVSPBenchmark <: AbstractDynamicBenchmark end
 
 function Utils.generate_sample(b::DVSPBenchmark, rng::AbstractRNG)
-    return Instance(read_vsp_instance(readdir(datadep"dvrptw"; join=true)[1]))
+    return DataSample(;
+        instance=Instance(read_vsp_instance(readdir(datadep"dvrptw"; join=true)[1]))
+    )
+end
+
+function Utils.generate_scenario_generator(::DVSPBenchmark)
+    return generate_scenario
+end
+
+function Utils.generate_anticipative_solver(::DVSPBenchmark; kwargs...)
+    return AnticipativeVSPPolicy(; kwargs...)
 end
 
 export DVSPBenchmark, generate_sample, generate_scenario
 export run_policy!,
     GreedyVSPPolicy, LazyVSPPolicy, KleopatraVSPPolicy, AnticipativeVSPPolicy
 
-# export highs_model, filtered_readdir
-
-# export solve_hindsight_problem
-
-# export AbstractDynamicPolicy, BasicDynamicPolicy
-
-# export GreedyPolicy, LazyPolicy, RandomPolicy, Kleopatra
-
-# export run_policy
-
-# export compute_features,
-#     compute_2D_features, compute_critic_features, compute_critic_2D_features, load_dataset
-
-# export VSPInstance,
-#     read_vsp_instance, start_time, env_routes_from_state_routes, state_route_from_env_routes
-# export DVSPEnv, prize_collecting_vsp
-# export anticipative_solver
-# export VSPSolution
-# export load_VSP_dataset
-# export GreedyVSPPolicy,
-#     LazyVSPPolicy, AnticipativeVSPPolicy, run_policy!, KleopatraVSPPolicy
-# export plot_routes, plot_instance, plot_environment, plot_epoch
-# export get_state
-# export nb_epochs, get_epoch_indices
 end

src/DynamicVehicleScheduling/environment/scenario.jl

@@ -45,3 +45,11 @@ function generate_scenario(
     end
     return Scenario(new_indices, new_service_time, new_start_time)
 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/DynamicVehicleScheduling/DynamicVSP/policy/abstract_vsp_policy.jl renamed to src/DynamicVehicleScheduling/policy/abstract_vsp_policy.jl

@@ -20,7 +20,12 @@ include("model_builders.jl")
 export DataSample
 
 export AbstractBenchmark, AbstractStochasticBenchmark, AbstractDynamicBenchmark
-export generate_dataset, generate_statistical_model, generate_maximizer, generate_sample
+export generate_dataset,
+    generate_statistical_model,
+    generate_maximizer,
+    generate_sample,
+    generate_scenario_generator,
+    generate_anticipative_solver
 export plot_data, compute_gap
 export maximizer_kwargs
 export grid_graph, get_path, path_to_matrix

src/DynamicVehicleScheduling/DynamicVSP/policy/anticipative_policy.jl renamed to src/DynamicVehicleScheduling/policy/anticipative_policy.jl

@@ -7,10 +7,13 @@ Data sample data structure.
 $TYPEDFIELDS
 """
 @kwdef struct DataSample{
-    I,F<:AbstractArray,S<:Union{AbstractArray,Nothing},C<:Union{AbstractArray,Nothing}
+    I,
+    F<:Union{AbstractArray,Nothing},
+    S<:Union{AbstractArray,Nothing},
+    C<:Union{AbstractArray,Nothing},
 }
     "features"
-    x::F
+    x::F = nothing
     "target cost parameters (optional)"
     θ_true::C = nothing
     "target solution (optional)"