Skip to content

Commit 5dd16d2

Browse files
committed
routing: Fix routing_svg.py
1 parent e7a1d8a commit 5dd16d2

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

ortools/routing/docs/routing_svg.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env python3
12
# Copyright 2010-2024 Google LLC
23
# Licensed under the Apache License, Version 2.0 (the "License");
34
# you may not use this file except in compliance with the License.
@@ -15,8 +16,11 @@
1516

1617
# [START import]
1718
import argparse
18-
from ortools.constraint_solver import pywrapcp
1919
from ortools.routing import enums_pb2
20+
from ortools.routing import pywraprouting
21+
22+
FirstSolutionStrategy = enums_pb2.FirstSolutionStrategy
23+
RoutingSearchStatus = enums_pb2.RoutingSearchStatus
2024
# [END import]
2125

2226

@@ -1036,18 +1040,18 @@ def main(): # pylint: disable=too-many-locals,too-many-branches
10361040
# Create the routing index manager.
10371041
# [START index_manager]
10381042
if args["starts_ends"]:
1039-
manager = pywrapcp.RoutingIndexManager(
1043+
manager = pywraprouting.RoutingIndexManager(
10401044
len(data.locations), data.num_vehicles, data.starts, data.ends
10411045
)
10421046
else:
1043-
manager = pywrapcp.RoutingIndexManager(
1047+
manager = pywraprouting.RoutingIndexManager(
10441048
len(data.locations), data.num_vehicles, data.depot
10451049
)
10461050
# [END index_manager]
10471051

10481052
# Create Routing Model.
10491053
# [START routing_model]
1050-
routing = pywrapcp.RoutingModel(manager)
1054+
routing = pywraprouting.RoutingModel(manager)
10511055

10521056
# [END routing_model]
10531057

@@ -1120,11 +1124,11 @@ def demand_callback(from_index):
11201124
)
11211125
if args["fifo"]:
11221126
routing.SetPickupAndDeliveryPolicyOfAllVehicles(
1123-
pywrapcp.RoutingModel.PICKUP_AND_DELIVERY_FIFO
1127+
pywraprouting.RoutingModel.PICKUP_AND_DELIVERY_FIFO
11241128
)
11251129
if args["lifo"]:
11261130
routing.SetPickupAndDeliveryPolicyOfAllVehicles(
1127-
pywrapcp.RoutingModel.PICKUP_AND_DELIVERY_LIFO
1131+
pywraprouting.RoutingModel.PICKUP_AND_DELIVERY_LIFO
11281132
)
11291133

11301134
if args["starts_ends"]:
@@ -1191,15 +1195,15 @@ def demand_callback(from_index):
11911195
)
11921196

11931197
# Setting first solution heuristic (cheapest addition).
1194-
search_parameters = pywrapcp.DefaultRoutingSearchParameters()
1198+
search_parameters = pywraprouting.DefaultRoutingSearchParameters()
11951199
# pylint: disable=no-member
11961200
if not args["pickup_delivery"]:
11971201
search_parameters.first_solution_strategy = (
1198-
enums_pb2.FirstSolutionStrategy.PATH_CHEAPEST_ARC
1202+
FirstSolutionStrategy.PATH_CHEAPEST_ARC
11991203
)
12001204
else:
12011205
search_parameters.first_solution_strategy = (
1202-
enums_pb2.FirstSolutionStrategy.PARALLEL_CHEAPEST_INSERTION
1206+
FirstSolutionStrategy.PARALLEL_CHEAPEST_INSERTION
12031207
)
12041208

12051209
search_parameters.local_search_metaheuristic = (

ortools/routing/docs/vrp_capacity_solution.svg

Lines changed: 9 additions & 9 deletions
Loading

0 commit comments

Comments
 (0)