update

Author: BatyLeo

src/DynamicAssortment/DynamicAssortment.jl

@@ -51,11 +51,19 @@ include("maximizer.jl")
 $TYPEDEF
 
 Abstract type for dynamic vehicle scheduling benchmarks.
+
+# Fields
+$TYPEDFIELDS
 """
 @kwdef struct DVSPBenchmark <: AbstractDynamicBenchmark
+    "todo"
     max_requests_per_epoch::Int = 10
+    "todo"
     Δ_dispatch::Float64 = 1.0
+    "todo"
     epoch_duration::Float64 = 1.0
+    "todo"
+    two_dimensional_features::Bool = false
 end
 
 function Utils.generate_dataset(b::DVSPBenchmark, dataset_size::Int=1)
@@ -74,14 +82,6 @@ function Utils.generate_dataset(b::DVSPBenchmark, dataset_size::Int=1)
     ]
 end
 
-function Utils.generate_scenario_generator(::DVSPBenchmark)
-    return generate_scenario
-end
-
-function Utils.generate_anticipative_solver(::DVSPBenchmark; kwargs...)
-    return anticipative_solver
-end
-
 function Utils.generate_environment(::DVSPBenchmark, instance::Instance; kwargs...)
     return DVSPEnv(instance; kwargs...)
 end
@@ -90,6 +90,14 @@ function Utils.generate_maximizer(::DVSPBenchmark)
     return LinearMaximizer(oracle; g, h)
 end
 
+function Utils.generate_scenario_generator(::DVSPBenchmark)
+    return generate_scenario
+end
+
+function Utils.generate_anticipative_solver(b::DVSPBenchmark; kwargs...)
+    return AnticipativeSolver(b.two_dimensional_features)
+end
+
 export DVSPBenchmark #, generate_environment # , generate_sample, generate_anticipative_solver
 export run_policy!,
     GreedyVSPPolicy, LazyVSPPolicy, KleopatraVSPPolicy, AnticipativeVSPPolicy

src/DynamicVehicleScheduling/DynamicVehicleScheduling.jl

@@ -41,7 +41,11 @@ Solve the anticipative VSP problem for environment `env`.
 For this, it uses the current environment history, so make sure that the environment is terminated before calling this method.
 """
 function anticipative_solver(
-    env::DVSPEnv, scenario=env.scenario; model_builder=highs_model, reset_env=false
+    env::DVSPEnv,
+    scenario=env.scenario;
+    model_builder=highs_model,
+    reset_env=false,
+    two_dimensional_features=false,
 )
     reset_env && reset!(env)
     request_epoch = [0]
@@ -180,10 +184,26 @@ function anticipative_solver(
         )
 
         # x = compute_2D_features(state, env.instance)
-        x = compute_features(state, env.instance)
+        x = if two_dimensional_features
+            compute_2D_features(state, env.instance)
+        else
+            compute_features(state, env.instance)
+        end
 
         return DataSample(; instance=state, y_true, x)
     end
 
     return obj, dataset
 end
+
+@kwdef struct AnticipativeSolver
+    is_2D::Bool = false
+end
+
+function (solver::AnticipativeSolver)(env::DVSPEnv, scenario=env.scenario; reset_env=false)
+    if solver.is_2D
+        return anticipative_solver(env, scenario; model_builder=highs_model_2d, reset_env)
+    else
+        return anticipative_solver(env, scenario; model_builder=highs_model, reset_env)
+    end
+end

src/DynamicVehicleScheduling/algorithms/anticipative_solver.jl

@@ -1,3 +1,7 @@
+function plot_instance(env::DVSPEnv; kwargs...)
+    return plot_instance(env.instance.static_instance; kwargs...)
+end
+
 # """
 # $TYPEDSIGNATURES
 

src/DynamicVehicleScheduling/environment/plot.jl

@@ -189,9 +189,11 @@ It follows the same interface as [`AbstractBenchmark`](@ref), with the addition
 """
 abstract type AbstractStochasticBenchmark <: AbstractBenchmark end
 
+function generate_scenario end
+
 # only works for exogenous noise
 """
-    generate_scenario(::AbstractStochasticBenchmark; kwargs...)
+    generate_scenario_generator(::AbstractStochasticBenchmark; kwargs...)
 """
 function generate_scenario_generator end