patching meso results refs #21

eclipse-sumo · Dec 19, 2024 · 09c1edb · 09c1edb
1 parent 20583af
commit 09c1edb
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 44 deletions.
diff --git a/tests/sumo/devices/rerouting/personTrip/bike_public_walk/output.sumo.meso b/tests/sumo/devices/rerouting/personTrip/bike_public_walk/output.sumo.meso
@@ -1,7 +1,7 @@
 Loading net-file from 'net.net.xml' ... done (1ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1443-eacf6376ad0 started with time: 0.00.
 Simulation ended at time: 1012.00.
 Reason: All vehicles have left the simulation.
 Performance:
@@ -22,13 +22,13 @@ Statistics (avg of 4):
  Duration: 111.00
  WaitingTime: 0.00
  TimeLoss: 0.00
+ DepartDelay: 0.00
 Bike Statistics (avg of 1):
  RouteLength: 748.55
  Speed: 5.20
  Duration: 144.00
  WaitingTime: 0.00
  TimeLoss: 0.00
-Statistics (avg of 5):
  DepartDelay: 0.00
 Pedestrian Statistics (avg of 1 walks):
  RouteLength: 493.08

diff --git a/tests/sumo/devices/taxi/bugs/ticket15907/railsignalvehs.sumo.meso b/tests/sumo/devices/taxi/bugs/ticket15907/railsignalvehs.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-12-18 08:58:19 by Eclipse SUMO sumo Version v1_21_0+1414-ecd7e15422b
+<!-- generated on 2024-12-19 13:18:19 by Eclipse SUMO sumo Version v1_21_0+1443-eacf6376ad0
 <sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -42,4 +42,13 @@
     <railSignal id="J6">
         <link linkIndex="0" from="E5_0" to="E6_0"/>
     </railSignal>
+    <departJunction id="J0">
+        <driveWay id="J0.d0">
+            <entry id="t_0" time="0.00" reason="departed"/>
+            <exit id="t_0" time="7.00" reason="junction"/>
+        </driveWay>
+    </departJunction>
+    <departJunction id="J1">
+        <driveWay id="J1.d0"/>
+    </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/junction_model/bikes/prioLarge_onlyBike/output.sumo.meso b/tests/sumo/junction_model/bikes/prioLarge_onlyBike/output.sumo.meso
@@ -1,12 +1,12 @@
-Loading net-file from 'net3.net.xml' ... done (2ms).
+Loading net-file from 'net3.net.xml' ... done (1ms).
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1443-eacf6376ad0 started with time: 0.00.
 Simulation ended at time: 635.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.01s
- Real time factor: 90714.3
- UPS: 549285.714286
+ Duration: 0.00s
+ Real time factor: 158750
+ UPS: 961250.000000
 Vehicles:
  Inserted: 112
  Running: 0
@@ -17,6 +17,6 @@ Bike Statistics (avg of 50):
  Duration: 35.94
  WaitingTime: 2.36
  TimeLoss: 3.00
- DepartDelay: 0.00
+ DepartDelay: 0.47
 DijkstraRouter answered 112 queries and explored 2.75 edges on average.
 DijkstraRouter spent 0.00s answering queries (0.00ms on average).
diff --git a/tests/sumo/junction_model/indirect_left_turn/priority2_oncoming/output.sumo.meso b/tests/sumo/junction_model/indirect_left_turn/priority2_oncoming/output.sumo.meso
@@ -1,13 +1,13 @@
-Loading net-file from 'net3.net.xml' ... done (2ms).
-Loading additional-files from 'input_additional.add.xml' ... done (1ms).
+Loading net-file from 'net3.net.xml' ... done (1ms).
+Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1443-eacf6376ad0 started with time: 0.00.
 Simulation ended at time: 1029.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.04s
- Real time factor: 29400
- UPS: 311428.571429
+ Duration: 0.01s
+ Real time factor: 102900
+ UPS: 1090000.000000
 Vehicles:
  Inserted: 343
  Running: 0
@@ -18,13 +18,13 @@ Statistics (avg of 181):
  Duration: 25.25
  WaitingTime: 1.72
  TimeLoss: 12.10
+ DepartDelay: 0.00
 Bike Statistics (avg of 162):
  RouteLength: 179.20
  Speed: 4.89
  Duration: 39.07
  WaitingTime: 4.40
  TimeLoss: 6.13
-Statistics (avg of 343):
  DepartDelay: 0.00
 DijkstraRouter answered 343 queries and explored 3.42 edges on average.
 DijkstraRouter spent 0.00s answering queries (0.00ms on average).
diff --git a/tests/sumo/junction_model/indirect_left_turn/priority2_sameStraight/output.sumo.meso b/tests/sumo/junction_model/indirect_left_turn/priority2_sameStraight/output.sumo.meso
@@ -1,13 +1,13 @@
-Loading net-file from 'net3.net.xml' ... done (2ms).
-Loading additional-files from 'input_additional.add.xml' ... done (1ms).
+Loading net-file from 'net3.net.xml' ... done (1ms).
+Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1443-eacf6376ad0 started with time: 0.00.
 Simulation ended at time: 1111.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.10s
- Real time factor: 10682.7
- UPS: 447500.000000
+ Duration: 0.03s
+ Real time factor: 44440
+ UPS: 1861600.000000
 Vehicles:
  Inserted: 834
  Running: 0
@@ -18,13 +18,13 @@ Statistics (avg of 413):
  Duration: 52.34
  WaitingTime: 0.42
  TimeLoss: 38.95
+ DepartDelay: 23.16
 Bike Statistics (avg of 421):
  RouteLength: 179.20
  Speed: 3.26
  Duration: 59.20
  WaitingTime: 0.60
  TimeLoss: 26.45
-Statistics (avg of 834):
- DepartDelay: 29.49
+ DepartDelay: 6.21
 DijkstraRouter answered 907 queries and explored 3.40 edges on average.
 DijkstraRouter spent 0.00s answering queries (0.00ms on average).
diff --git a/tests/sumo/junction_model/indirect_left_turn/priority_oncoming/output.sumo.meso b/tests/sumo/junction_model/indirect_left_turn/priority_oncoming/output.sumo.meso
@@ -1,13 +1,13 @@
-Loading net-file from 'net2.net.xml' ... done (18ms).
+Loading net-file from 'net2.net.xml' ... done (1ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1443-eacf6376ad0 started with time: 0.00.
 Simulation ended at time: 1029.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.02s
- Real time factor: 42875
- UPS: 454166.666667
+ Duration: 0.01s
+ Real time factor: 102900
+ UPS: 1090000.000000
 Vehicles:
  Inserted: 343
  Running: 0
@@ -18,13 +18,13 @@ Statistics (avg of 181):
  Duration: 25.25
  WaitingTime: 1.72
  TimeLoss: 12.10
+ DepartDelay: 0.00
 Bike Statistics (avg of 162):
  RouteLength: 179.20
  Speed: 4.89
  Duration: 39.07
  WaitingTime: 4.40
  TimeLoss: 6.13
-Statistics (avg of 343):
  DepartDelay: 0.00
 DijkstraRouter answered 343 queries and explored 3.42 edges on average.
 DijkstraRouter spent 0.00s answering queries (0.00ms on average).
diff --git a/tests/sumo/junction_model/indirect_left_turn/priority_sameStraight/output.sumo.meso b/tests/sumo/junction_model/indirect_left_turn/priority_sameStraight/output.sumo.meso
@@ -1,13 +1,13 @@
-Loading net-file from 'net2.net.xml' ... done (2ms).
+Loading net-file from 'net2.net.xml' ... done (1ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1443-eacf6376ad0 started with time: 0.00.
 Simulation ended at time: 1111.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.09s
- Real time factor: 12076.1
- UPS: 505869.565217
+ Duration: 0.03s
+ Real time factor: 44440
+ UPS: 1861600.000000
 Vehicles:
  Inserted: 834
  Running: 0
@@ -18,13 +18,13 @@ Statistics (avg of 413):
  Duration: 52.34
  WaitingTime: 0.42
  TimeLoss: 38.95
+ DepartDelay: 23.16
 Bike Statistics (avg of 421):
  RouteLength: 179.20
  Speed: 3.26
  Duration: 59.20
  WaitingTime: 0.60
  TimeLoss: 26.45
-Statistics (avg of 834):
- DepartDelay: 29.49
+ DepartDelay: 6.21
 DijkstraRouter answered 907 queries and explored 3.40 edges on average.
 DijkstraRouter spent 0.00s answering queries (0.00ms on average).
diff --git a/...umo/junction_model/indirect_left_turn/priority_sameStraight_defaultShape/output.sumo.meso b/...umo/junction_model/indirect_left_turn/priority_sameStraight_defaultShape/output.sumo.meso
@@ -1,13 +1,13 @@
-Loading net-file from 'net2.net.xml' ... done (18ms).
+Loading net-file from 'net2.net.xml' ... done (1ms).
 Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
-Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
+Simulation version v1_21_0+1443-eacf6376ad0 started with time: 0.00.
 Simulation ended at time: 1111.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 0.07s
- Real time factor: 15013.5
- UPS: 628918.918919
+ Duration: 0.03s
+ Real time factor: 39678.6
+ UPS: 1662142.857143
 Vehicles:
  Inserted: 834
  Running: 0
@@ -18,13 +18,13 @@ Statistics (avg of 413):
  Duration: 52.34
  WaitingTime: 0.42
  TimeLoss: 38.95
+ DepartDelay: 23.16
 Bike Statistics (avg of 421):
  RouteLength: 179.20
  Speed: 3.26
  Duration: 59.20
  WaitingTime: 0.60
  TimeLoss: 26.45
-Statistics (avg of 834):
- DepartDelay: 29.49
+ DepartDelay: 6.21
 DijkstraRouter answered 907 queries and explored 3.40 edges on average.
 DijkstraRouter spent 0.00s answering queries (0.00ms on average).