Skip to content

Commit d1c4cd4

Browse files
committed
up
1 parent 23c41b3 commit d1c4cd4

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/StochasticVehicleScheduling/StochasticVehicleScheduling.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function Utils.generate_dataset(
8989
if compute_solutions
9090
solutions = [algorithm(instance; kwargs...) for instance in instances]
9191
return [
92-
DataSample(; x=feature, instance, y=solution) for
92+
DataSample(; x=feature, instance, y_true=solution) for
9393
(instance, feature, solution) in zip(instances, features, solutions)
9494
]
9595
end

src/StochasticVehicleScheduling/solution/exact_algorithms/column_generation.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ function column_generation(
9494
end
9595

9696
"""
97-
compute_solution_from_selected_columns(instance::Instance, paths[; bin=true])
97+
$TYPEDSIGNATURES
9898
9999
Note: If you have Gurobi, use `grb_model` as `model_builder` instead od `glpk_model`.
100100
"""
@@ -141,7 +141,9 @@ function compute_solution_from_selected_columns(
141141
optimize!(model)
142142

143143
sol = value.(y)
144-
return objective_value(model), sol, paths[isapprox.([sol[p] for p in paths], 1.0)]
144+
return Float64(objective_value(model)),
145+
sol,
146+
paths[isapprox.([sol[p] for p in paths], 1.0)]
145147
end
146148

147149
"""

0 commit comments

Comments
 (0)