adapting tests to new route sorting in drt #21

eclipse-sumo · Jan 5, 2025 · 3108135 · 3108135
1 parent f113a97
commit 3108135
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/tests/tools/drt/drtOnline/2taxis_10persons/exhaustive_search/output.tools b/tests/tools/drt/drtOnline/2taxis_10persons/exhaustive_search/output.tools
@@ -1,4 +1,3 @@
- Retrying in 1 seconds
 
 Run dispatcher
 New reservations: ['0']
@@ -27,7 +26,7 @@ New reservations: ['7', '8', '9']
 Pending reservations: []
 Solve DARP with exhaustive_search
 Solve ILP
-Dispatch: taxiB_6y_7y_5y_9y_7z_6z_5z_9z
+Dispatch: taxiB_6y_5y_7y_9y_7z_6z_5z_9z
 
 Run dispatcher
 Pending reservations: ['8']

diff --git a/tests/tools/drt/drtOnline/customized_times/exhaustive_search/output.tools b/tests/tools/drt/drtOnline/customized_times/exhaustive_search/output.tools
@@ -1,4 +1,3 @@
- Retrying in 1 seconds
 
 Run dispatcher
 New reservations: ['0']
@@ -11,23 +10,23 @@ Pending reservations: ['0']
 Solve DARP with exhaustive_search
 Reservation 1 (person ('1',)) cannot be served
 Solve ILP
-Dispatch: taxiB_2y_3y_3z_2z
+Dispatch: taxiC_2y_3y_3z_2z
 
 Run dispatcher
 New reservations: ['4', '5', '6']
 Pending reservations: ['0']
 Solve DARP with exhaustive_search
 Solve ILP
 Dispatch: taxiA_6y_6z
-Dispatch: taxiC_4y_5y_4z_5z
+Dispatch: taxiB_4y_5y_4z_5z
 
 Run dispatcher
 New reservations: ['7', '8', '9']
 Pending reservations: ['0']
 Solve DARP with exhaustive_search
 Solve ILP
 Dispatch: taxiA_6y_7y_7z_6z
-Dispatch: taxiB_3y_8y_3z_8z_2z
+Dispatch: taxiC_3y_8y_3z_8z_2z
 
 Run dispatcher
 Pending reservations: ['0', '9']

diff --git a/tests/tools/drt/drtOnline/stop_duration/exhaustive_search/output.tools b/tests/tools/drt/drtOnline/stop_duration/exhaustive_search/output.tools
@@ -1,4 +1,3 @@
- Retrying in 1 seconds
 
 Run dispatcher
 New reservations: ['0']
@@ -13,7 +12,7 @@ Pending reservations: []
 Solve DARP with exhaustive_search
 Solve ILP
 Dispatch: taxiA_0y_2y_0z_2z
-Dispatch: taxiB_3y_1y_3z_1z
+Dispatch: taxiB_1y_3y_3z_1z
 
 Run dispatcher
 New reservations: ['4', '5', '6']
@@ -64,11 +63,13 @@ Pending reservations: ['4', '5', '7', '8']
 Solve DARP with exhaustive_search
 Reservation 4 (person ('4',)) cannot be served
 Reservation 5 (person ('5',)) cannot be served
+Solve ILP
 
 Run dispatcher
 Pending reservations: ['7', '8']
 Solve DARP with exhaustive_search
 Reservation 7 (person ('7',)) cannot be served
+Solve ILP
 
 Run dispatcher
 Pending reservations: ['8']