Skip to content

Commit 23246ed

Browse files
committed
fix get_model_id() method of VrpModelObj.py
1 parent 82655aa commit 23246ed

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.run/main.run.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="wi_lib_vrp" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
3-
<module name="wi_lib_vrp" />
3+
<module name="wilib_vrp" />
44
<option name="INTERPRETER_OPTIONS" value="" />
55
<option name="PARENT_ENVS" value="true" />
66
<envs>
77
<env name="PYTHONUNBUFFERED" value="1" />
88
</envs>
9-
<option name="SDK_HOME" value="" />
9+
<option name="SDK_HOME" value="C:\Users\zzzlib\AppData\Local\Programs\Python\Python37\python.exe" />
1010
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
11-
<option name="IS_MODULE_SDK" value="true" />
11+
<option name="IS_MODULE_SDK" value="false" />
1212
<option name="ADD_CONTENT_ROOTS" value="true" />
1313
<option name="ADD_SOURCE_ROOTS" value="true" />
1414
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/wi_lib_vrp.py" />
15-
<option name="PARAMETERS" value="wi_library_directory_geo_reg.csv ideal 2 duration 10 8 500 60 30 christofides automatic" />
15+
<option name="PARAMETERS" value="wi_library_directory_geo_reg.csv ideal 2 duration 10 8 500 60 30 christofides automatic --map" />
1616
<option name="SHOW_COMMAND_LINE" value="false" />
1717
<option name="EMULATE_TERMINAL" value="false" />
1818
<option name="MODULE_MODE" value="false" />

wi_lib_vrp_VrpModelObj.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ def __init__(self, vrp_distance_matrix, vrp_duration_matrix, region_df, config_d
9191
self._vrp_num_vehicles = config_dict['num_vehicles']
9292
self._region_df = region_df
9393
self._config_dict = config_dict
94+
self._format_vrp_model_id()
95+
9496

9597
def _format_vrp_model_id(self):
9698
""" Concatenate VRP parameter code strings to model id string. """
@@ -172,9 +174,8 @@ def __vrp_initialize(self):
172174
self._vrp_input_data_dict['depot']
173175
)
174176

175-
# initialize routing model & set model id
177+
# initialize routing model
176178
vrp_routing_model = pywrapcp.RoutingModel(vrp_index_manager)
177-
self._format_vrp_model_id()
178179

179180
# [START distance dimension]
180181
def distance_callback(from_index, to_index):

0 commit comments

Comments
 (0)