adapting tests to penalty #21

eclipse-sumo · Jan 5, 2024 · 1d2741c · 1d2741c
1 parent aa95aca
commit 1d2741c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/tests/tools/drt/drtOrtools/waiting_time1/output.tools b/tests/tools/drt/drtOrtools/waiting_time1/output.tools
@@ -1,3 +1,4 @@
+ Retrying in 1 seconds
 Simulation parameters:
   end: 600.0
   interval: 30
@@ -46,7 +47,7 @@ reservation 1 has a maximum (hard) pickup time at 40
 ## Done
  Set solution heuristic...
 Start solving the problem.
-Objective: 20000
+Objective: 15132
 Route for vehicle 0:
      5 (L: 0, C: 0, T: (1,600))
  ->  0 (L: 0, C: 0, T: (1,600))
@@ -96,7 +97,7 @@ reservation 1 has a maximum (hard) pickup time at 40
 Start solving the problem.
 Initial solution:
 veh 0: []
-Objective: 20000
+Objective: 15132
 Route for vehicle 0:
      5 (L: 0, C: 0, T: (30,600))
  ->  0 (L: 0, C: 0, T: (30,600))

diff --git a/tests/tools/drt/drtOrtools/waiting_time2/output.tools b/tests/tools/drt/drtOrtools/waiting_time2/output.tools
@@ -47,7 +47,7 @@ reservation 1 has a maximum (hard) pickup time at 60
 ## Done
  Set solution heuristic...
 Start solving the problem.
-Objective: 11268
+Objective: 8834
 Route for vehicle 0:
      5 (L: 0, C: 0, T: (1,18))
  ->  1 (L: 1, C: 588, T: (43,60))
@@ -100,7 +100,7 @@ reservation 1 has a maximum (hard) pickup time at 60
 Start solving the problem.
 Initial solution:
 veh 0: [1, 3]
-Objective: 10966
+Objective: 8532
 Route for vehicle 0:
      5 (L: 0, C: 0, T: (30,30))
  ->  1 (L: 1, C: 286, T: (51,51))
@@ -149,7 +149,7 @@ reservation 1 has a maximum (hard) pickup time at 60
 Start solving the problem.
 Initial solution:
 veh 0: [3]
-Objective: 10380
+Objective: 7946
 Route for vehicle 0:
      4 (L: 1, C: 0, T: (60,60))
  ->  3 (L: 0, C: 380, T: (148,148))

diff --git a/tests/tools/drt/drtOrtools/waiting_time3/output.tools b/tests/tools/drt/drtOrtools/waiting_time3/output.tools
@@ -1,3 +1,4 @@
+ Retrying in 1 seconds
 Simulation parameters:
   end: 600.0
   interval: 30
@@ -46,7 +47,7 @@ reservation 1 has a maximum (hard) pickup time at 100
 ## Done
  Set solution heuristic...
 Start solving the problem.
-Objective: 11268
+Objective: 8834
 Route for vehicle 0:
      5 (L: 0, C: 0, T: (1,58))
  ->  1 (L: 1, C: 588, T: (43,100))