bugfix

Author: BatyLeo

src/StochasticVehicleScheduling/StochasticVehicleScheduling.jl

@@ -63,6 +63,12 @@ $TYPEDFIELDS
     nb_scenarios::Int = 10
 end
 
+function Utils.objective_value(
+    ::StochasticVehicleSchedulingBenchmark, sample::DataSample, y::BitVector
+)
+    return evaluate_solution(y, sample.instance)
+end
+
 """
 $TYPEDSIGNATURES
 
@@ -92,7 +98,7 @@ function Utils.generate_dataset(
     ]
     features = get_features.(instances)
     if compute_solutions
-        solutions = [algorithm(instance; kwargs...) for instance in instances]
+        solutions = [algorithm(instance; kwargs...).value for instance in instances]
         return [
             DataSample(; x=feature, instance, y_true=solution) for
             (instance, feature, solution) in zip(instances, features, solutions)
@@ -208,6 +214,7 @@ end
 
 export StochasticVehicleSchedulingBenchmark
 export generate_dataset, generate_maximizer, generate_statistical_model
+export objective_value
 export plot_instance, plot_solution
 export compact_linearized_mip,
     compact_mip, column_generation_algorithm, evaluate_solution, is_feasible

src/Utils/interface.jl

@@ -62,7 +62,7 @@ $TYPEDSIGNATURES
 For simple benchmarks where there is no instance object, maximizer does not need any keyword arguments.
 """
 function maximizer_kwargs(
-    ::AbstractBenchmark, sample::DataSample{F,S,C,Nothing}
+    ::AbstractBenchmark, sample::DataSample{Nothing,F,S,C}
 ) where {F,S,C}
     return NamedTuple()
 end
@@ -88,23 +88,23 @@ end
 """
 $TYPEDSIGNATURES
 
-Compute the objective value of the target in the sample (needs to exist).
+Compute the objective value of given solution `y`.
 """
 function objective_value(
-    bench::AbstractBenchmark, sample::DataSample{F,S,C,I}
-) where {F,S<:AbstractArray,C<:AbstractArray,I}
-    return objective_value(bench, sample.θ_true, sample.y_true)
+    bench::AbstractBenchmark, sample::DataSample{I,F,S,C}, y::AbstractArray
+) where {I,F,S,C<:AbstractArray}
+    return objective_value(bench, sample.θ_true, y)
 end
 
 """
 $TYPEDSIGNATURES
 
-Compute the objective value of given solution `y`.
+Compute the objective value of the target in the sample (needs to exist).
 """
 function objective_value(
-    bench::AbstractBenchmark, sample::DataSample{F,S,C,I}, y::AbstractArray
-) where {F,S,C<:AbstractArray,I}
-    return objective_value(bench, sample.θ_true, y)
+    bench::AbstractBenchmark, sample::DataSample{I,F,S,C}
+) where {I,F,S<:AbstractArray,C}
+    return objective_value(bench, sample, sample.y_true)
 end
 
 """