Skip to content

Commit 95c13bf

Browse files
authored
Consider distance from distance dimension rather than entire cost in cvrp_reload (#4522)
1 parent 5e68e51 commit 95c13bf

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

examples/notebook/routing/cvrp_reload.ipynb

+2-1
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@
384384
" total_time = 0\n",
385385
" capacity_dimension = routing.GetDimensionOrDie(\"Capacity\")\n",
386386
" time_dimension = routing.GetDimensionOrDie(\"Time\")\n",
387+
" distance_dimension = routing.GetDimensionOrDie(\"Distance\")\n",
387388
" dropped = []\n",
388389
" for order in range(6, routing.nodes()):\n",
389390
" index = manager.NodeToIndex(order)\n",
@@ -411,7 +412,7 @@
411412
" )\n",
412413
" previous_index = index\n",
413414
" index = assignment.Value(routing.NextVar(index))\n",
414-
" distance += routing.GetArcCostForVehicle(previous_index, index, vehicle_id)\n",
415+
" distance += distance_dimension.GetTransitValue(previous_index, index, vehicle_id)\n",
415416
" load_var = capacity_dimension.CumulVar(index)\n",
416417
" time_var = time_dimension.CumulVar(index)\n",
417418
" plan_output += (\n",

ortools/routing/samples/cvrp_reload.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ def print_solution(
317317
total_time = 0
318318
capacity_dimension = routing.GetDimensionOrDie("Capacity")
319319
time_dimension = routing.GetDimensionOrDie("Time")
320+
distance_dimension = routing.GetDimensionOrDie("Distance")
320321
dropped = []
321322
for order in range(6, routing.nodes()):
322323
index = manager.NodeToIndex(order)
@@ -344,7 +345,7 @@ def print_solution(
344345
)
345346
previous_index = index
346347
index = assignment.Value(routing.NextVar(index))
347-
distance += routing.GetArcCostForVehicle(previous_index, index, vehicle_id)
348+
distance += distance_dimension.GetTransitValue(previous_index, index, vehicle_id)
348349
load_var = capacity_dimension.CumulVar(index)
349350
time_var = time_dimension.CumulVar(index)
350351
plan_output += (

0 commit comments

Comments
 (0)