patching expected results refs #21, #13875

eclipse-sumo · Dec 20, 2024 · 81db1ed · 81db1ed
1 parent 8a992dc
commit 81db1ed
Show file tree

Hide file tree

Showing 239 changed files with 1,142 additions and 909 deletions.
diff --git a/tests/sumo/basic/container/container_start_containerStop/output.sumo.meso b/tests/sumo/basic/container/container_start_containerStop/output.sumo.meso
@@ -1,13 +1,14 @@
-Loading net-file from 'net.net.xml' ... done (17ms).
-Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading net-file from 'net.net.xml' ... done (10ms).
+Loading additional-files from 'input_additional.add.xml' ... done (1ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 51.00.
 Reason: All vehicles have left the simulation.
 Performance:
  Duration: 0.00s
- Real time factor: 12750
- UPS: 10000.000000
+ Real time factor: 51000
+ UPS: 40000.000000
 Vehicles:
  Inserted: 1
  Running: 0

diff --git a/tests/sumo/basic/container/leaving_vehicle_at_stop/output.sumo.meso b/tests/sumo/basic/container/leaving_vehicle_at_stop/output.sumo.meso
@@ -1,13 +1,14 @@
-Loading net-file from 'net.net.xml' ... done (17ms).
+Loading net-file from 'net.net.xml' ... done (6ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 198.00.
 Reason: All vehicles have left the simulation.
 Performance:
  Duration: 0.00s
- Real time factor: 99000
- UPS: 142000.000000
+ Real time factor: 198000
+ UPS: 284000.000000
 Vehicles:
  Inserted: 2
  Running: 0

diff --git a/tests/sumo/basic/container/trip_chain/output.sumo.meso b/tests/sumo/basic/container/trip_chain/output.sumo.meso
@@ -1,13 +1,14 @@
-Loading net-file from 'net.net.xml' ... done (24ms).
+Loading net-file from 'net.net.xml' ... done (5ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 289.00.
 Reason: All vehicles have left the simulation.
 Performance:
  Duration: 0.00s
- Real time factor: 96333.3
- UPS: 61333.333333
+ Real time factor: 289000
+ UPS: 184000.000000
 Vehicles:
  Inserted: 2
  Running: 0

diff --git a/tests/sumo/basic/container/trip_chain_busStop/output.sumo.meso b/tests/sumo/basic/container/trip_chain_busStop/output.sumo.meso
@@ -1,13 +1,14 @@
-Loading net-file from 'net.net.xml' ... done (29ms).
+Loading net-file from 'net.net.xml' ... done (6ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 289.00.
 Reason: All vehicles have left the simulation.
 Performance:
  Duration: 0.00s
- Real time factor: 144500
- UPS: 92000.000000
+ Real time factor: 289000
+ UPS: 184000.000000
 Vehicles:
  Inserted: 2
  Running: 0

diff --git a/tests/sumo/basic/container/trip_chain_containerStop_input/output.sumo.meso b/tests/sumo/basic/container/trip_chain_containerStop_input/output.sumo.meso
@@ -1,13 +1,14 @@
-Loading net-file from 'net.net.xml' ... done (29ms).
+Loading net-file from 'net.net.xml' ... done (5ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 289.00.
 Reason: All vehicles have left the simulation.
 Performance:
  Duration: 0.00s
- Real time factor: 144500
- UPS: 92000.000000
+ Real time factor: 289000
+ UPS: 184000.000000
 Vehicles:
  Inserted: 2
  Running: 0

diff --git a/tests/sumo/basic/container/trip_chain_no_from/output.sumo.meso b/tests/sumo/basic/container/trip_chain_no_from/output.sumo.meso
@@ -1,13 +1,14 @@
-Loading net-file from 'net.net.xml' ... done (33ms).
-Loading additional-files from 'input_additional.add.xml' ... done (1ms).
+Loading net-file from 'net.net.xml' ... done (5ms).
+Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 289.00.
 Reason: All vehicles have left the simulation.
 Performance:
  Duration: 0.00s
- Real time factor: 144500
- UPS: 92000.000000
+ Real time factor: 289000
+ UPS: 184000.000000
 Vehicles:
  Inserted: 2
  Running: 0

diff --git a/tests/sumo/basic/containerFlow/trip_chain/output.sumo.meso b/tests/sumo/basic/containerFlow/trip_chain/output.sumo.meso
@@ -1,13 +1,14 @@
-Loading net-file from 'net.net.xml' ... done (24ms).
-Loading additional-files from 'input_additional.add.xml' ... done (1ms).
+Loading net-file from 'net.net.xml' ... done (5ms).
+Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 280.00.
 Reason: All vehicles have left the simulation.
 Performance:
  Duration: 0.00s
- Real time factor: 93333.3
- UPS: 42333.333333
+ Real time factor: 280000
+ UPS: 127000.000000
 Vehicles:
  Inserted: 2
  Running: 0

diff --git a/tests/sumo/basic/dynamics/insertion/backlog_lanewise/output.sumo.meso b/tests/sumo/basic/dynamics/insertion/backlog_lanewise/output.sumo.meso
@@ -1,6 +1,7 @@
 Loading net-file from 'motorway.net.xml' ... done (1ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 116.00.
 Reason: All vehicles have left the simulation.
 Performance:

diff --git a/tests/sumo/basic/dynamics/insertion/bestLane4/output.sumo.meso b/tests/sumo/basic/dynamics/insertion/bestLane4/output.sumo.meso
@@ -1,12 +1,13 @@
 Loading net-file from 'net.net.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 3600.00.
 Reason: The final simulation step has been reached.
 Performance:
- Duration: 0.42s
- Real time factor: 8633.09
- UPS: 621944.844125
+ Duration: 0.11s
+ Real time factor: 32142.9
+ UPS: 2315633.928571
 Vehicles:
  Inserted: 7466 (Loaded: 7998)
  Running: 83

diff --git a/tests/sumo/basic/dynamics/insertion/best_distance/output.sumo.meso b/tests/sumo/basic/dynamics/insertion/best_distance/output.sumo.meso
@@ -1,14 +1,15 @@
-Loading net-file from 'motorway.net.xml' ... done (1ms).
+Loading net-file from 'motorway.net.xml' ... done (0ms).
 Loading additional-files from 'input_additional.add.xml' ...
  done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 900.00.
 Reason: The final simulation step has been reached.
 Performance:
- Duration: 0.32s
- Real time factor: 2857.14
- UPS: 1930987.301587
+ Duration: 0.06s
+ Real time factor: 14062.5
+ UPS: 9504078.125000
 Vehicles:
  Inserted: 1526 (Loaded: 2997)
  Running: 1046

diff --git a/tests/sumo/basic/dynamics/insertion/force_unsafe_followspeed/output.sumo.meso b/tests/sumo/basic/dynamics/insertion/force_unsafe_followspeed/output.sumo.meso
@@ -1,6 +1,7 @@
 Loading net-file from 'motorway.net.xml' ... done (1ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 99.00.
 Reason: All vehicles have left the simulation.
 Performance:

diff --git a/tests/sumo/basic/dynamics/insertion/high_flow1/output.sumo.meso b/tests/sumo/basic/dynamics/insertion/high_flow1/output.sumo.meso
@@ -1,13 +1,14 @@
 Loading net-file from 'motorway.net.xml' ... done (1ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 1904.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.07s
- Real time factor: 26444.4
- UPS: 1762763.888889
+ Duration: 0.02s
+ Real time factor: 79333.3
+ UPS: 5288291.666667
 Vehicles:
  Inserted: 1200
  Running: 0

diff --git a/tests/sumo/basic/dynamics/insertion/high_flow1_extreme/output.sumo.meso b/tests/sumo/basic/dynamics/insertion/high_flow1_extreme/output.sumo.meso
@@ -1,13 +1,14 @@
 Loading net-file from 'motorway.net.xml' ... done (1ms).
-Loading additional-files from 'input_additional.add.xml' ... done (1ms).
+Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 1898.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.12s
- Real time factor: 16362.1
- UPS: 1579301.724138
+ Duration: 0.03s
+ Real time factor: 55823.5
+ UPS: 5388205.882353
 Vehicles:
  Inserted: 1800
  Running: 0

diff --git a/tests/sumo/basic/dynamics/insertion/high_flow2/output.sumo.meso b/tests/sumo/basic/dynamics/insertion/high_flow2/output.sumo.meso
@@ -1,13 +1,14 @@
-Loading net-file from 'motorway.net.xml' ... done (2ms).
-Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading net-file from 'motorway.net.xml' ... done (0ms).
+Loading additional-files from 'input_additional.add.xml' ... done (1ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 2413.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.24s
- Real time factor: 10012.4
- UPS: 5251186.721992
+ Duration: 0.06s
+ Real time factor: 42333.3
+ UPS: 22202385.964912
 Vehicles:
  Inserted: 2900 (Loaded: 3600)
  Running: 0

diff --git a/tests/sumo/basic/dynamics/insertion/high_flow2_emergencyDecel/output.sumo.meso b/tests/sumo/basic/dynamics/insertion/high_flow2_emergencyDecel/output.sumo.meso
@@ -1,13 +1,14 @@
-Loading net-file from 'motorway.net.xml' ... done (1ms).
+Loading net-file from 'motorway.net.xml' ... done (0ms).
 Loading additional-files from 'input_additional.add.xml' ... done (1ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 2413.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.20s
- Real time factor: 11886.7
- UPS: 6234167.487685
+ Duration: 0.09s
+ Real time factor: 26811.1
+ UPS: 14061511.111111
 Vehicles:
  Inserted: 2900 (Loaded: 3600)
  Running: 0

diff --git a/tests/sumo/basic/dynamics/insertion/high_flow3/output.sumo.meso b/tests/sumo/basic/dynamics/insertion/high_flow3/output.sumo.meso
@@ -1,13 +1,14 @@
-Loading net-file from 'motorway.net.xml' ... done (1ms).
+Loading net-file from 'motorway.net.xml' ... done (0ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 1800.00.
 Reason: The final simulation step has been reached.
 Performance:
- Duration: 0.39s
- Real time factor: 4603.58
- UPS: 544695.652174
+ Duration: 0.09s
+ Real time factor: 20224.7
+ UPS: 2392988.764045
 Vehicles:
  Inserted: 2520 (Loaded: 5997)
  Running: 121

diff --git a/tests/sumo/basic/person/person_number/output.sumo.meso b/tests/sumo/basic/person/person_number/output.sumo.meso
@@ -1,14 +1,15 @@
-Loading net-file from 'net.net.xml' ... done (35ms).
+Loading net-file from 'net.net.xml' ... done (11ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 140.00.
 Reason: The final simulation step has been reached.
 Performance:
- Duration: 0.01s
- Real time factor: 20000
- UPS: 17571.428571
- UPS-Persons: 20000.000000
+ Duration: 0.00s
+ Real time factor: 35000
+ UPS: 30750.000000
+ UPS-Persons: 35000.000000
 Vehicles:
  Inserted: 2
  Running: 1

diff --git a/tests/sumo/basic/person/riding/leaving_vehicle_at_stop/output.sumo.meso b/tests/sumo/basic/person/riding/leaving_vehicle_at_stop/output.sumo.meso
@@ -1,14 +1,15 @@
-Loading net-file from 'net.net.xml' ... done (23ms).
+Loading net-file from 'net.net.xml' ... done (6ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 284.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.01s
- Real time factor: 35500
- UPS: 40500.000000
- UPS-Persons: 66125.000000
+ Duration: 0.00s
+ Real time factor: 142000
+ UPS: 162000.000000
+ UPS-Persons: 264500.000000
 Vehicles:
  Inserted: 3
  Running: 0

diff --git a/tests/sumo/basic/person/riding/leaving_vehicle_at_stop_subsecond/output.sumo.meso b/tests/sumo/basic/person/riding/leaving_vehicle_at_stop_subsecond/output.sumo.meso
@@ -1,14 +1,15 @@
-Loading net-file from 'net.net.xml' ... done (23ms).
+Loading net-file from 'net.net.xml' ... done (5ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 280.90.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.03s
- Real time factor: 10803.8
- UPS: 124076.923077
- UPS-Persons: 201923.076923
+ Duration: 0.01s
+ Real time factor: 56180
+ UPS: 645200.000000
+ UPS-Persons: 1050000.000000
 Vehicles:
  Inserted: 3
  Running: 0
@@ -17,4 +18,4 @@ Persons:
  Inserted: 2
  Running: 0
 DijkstraRouter answered 4 queries and explored 117.00 edges on average.
-DijkstraRouter spent 0.00s answering queries (0.25ms on average).
+DijkstraRouter spent 0.00s answering queries (0.00ms on average).
diff --git a/tests/sumo/basic/person/riding/veh_is_triggered/ride_triggered_scale/output.sumo.meso b/tests/sumo/basic/person/riding/veh_is_triggered/ride_triggered_scale/output.sumo.meso
@@ -1,5 +1,6 @@
 Loading net-file from 'three_split.net.xml' ... done (1ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 79.00.
 Reason: All vehicles have left the simulation.
diff --git a/tests/sumo/basic/person/trip_chain/output.sumo.meso b/tests/sumo/basic/person/trip_chain/output.sumo.meso
@@ -1,14 +1,15 @@
-Loading net-file from 'net.net.xml' ... done (23ms).
-Loading additional-files from 'input_additional.add.xml' ... done (1ms).
+Loading net-file from 'net.net.xml' ... done (6ms).
+Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading route-files incrementally from 'input_routes.rou.xml'
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
 Simulation ended at time: 275.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.01s
- Real time factor: 45833.3
- UPS: 27333.333333
- UPS-Persons: 45666.666667
+ Duration: 0.00s
+ Real time factor: 137500
+ UPS: 82000.000000
+ UPS-Persons: 137000.000000
 Vehicles:
  Inserted: 2
  Running: 0