From 30783e9aca2f89490271d0cc1a4f3904e8b3cdcb Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 4 Mar 2024 11:36:43 +0100 Subject: [PATCH] routing: Fix VRP Initial solution samples (Fix #4111) --- ortools/constraint_solver/samples/VrpInitialRoutes.cs | 3 ++- ortools/constraint_solver/samples/VrpInitialRoutes.java | 3 ++- ortools/constraint_solver/samples/vrp_initial_routes.cc | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ortools/constraint_solver/samples/VrpInitialRoutes.cs b/ortools/constraint_solver/samples/VrpInitialRoutes.cs index 8f60e59201..326dd9e852 100644 --- a/ortools/constraint_solver/samples/VrpInitialRoutes.cs +++ b/ortools/constraint_solver/samples/VrpInitialRoutes.cs @@ -149,7 +149,8 @@ public class InitialRoutes // Solve the problem. // [START solve] - Assignment solution = routing.SolveWithParameters(searchParameters); + Assignment solution = routing.SolveFromAssignmentWithParameters( + initialSolution, searchParameters); // [END solve] // Print solution on console. diff --git a/ortools/constraint_solver/samples/VrpInitialRoutes.java b/ortools/constraint_solver/samples/VrpInitialRoutes.java index b0647e8e1c..0641e76706 100644 --- a/ortools/constraint_solver/samples/VrpInitialRoutes.java +++ b/ortools/constraint_solver/samples/VrpInitialRoutes.java @@ -145,7 +145,8 @@ public class VrpInitialRoutes { // Solve the problem. // [START solve] - Assignment solution = routing.solveWithParameters(searchParameters); + Assignment solution = routing.solveFromAssignmentWithParameters( + initialSolution, searchParameters); // [END solve] // Print solution on console. diff --git a/ortools/constraint_solver/samples/vrp_initial_routes.cc b/ortools/constraint_solver/samples/vrp_initial_routes.cc index ff21340b99..14024510be 100644 --- a/ortools/constraint_solver/samples/vrp_initial_routes.cc +++ b/ortools/constraint_solver/samples/vrp_initial_routes.cc @@ -88,6 +88,7 @@ struct DataModel { // [START solution_printer] void PrintSolution(const DataModel& data, const RoutingIndexManager& manager, const RoutingModel& routing, const Assignment& solution) { + LOG(INFO) << "Objective: " << solution.ObjectiveValue(); int64_t max_route_distance{0}; for (int vehicle_id = 0; vehicle_id < data.num_vehicles; ++vehicle_id) { int64_t index = routing.Start(vehicle_id);