patching expected results refs #21, #10665

eclipse-sumo · May 4, 2022 · 8813e81 · 8813e81
1 parent 3c8635a
commit 8813e81
Show file tree

Hide file tree

Showing 41 changed files with 7,970 additions and 7,859 deletions.
diff --git a/tests/sumo/basic/tls/NEMA/basic/output.sumo b/tests/sumo/basic/tls/NEMA/basic/output.sumo
@@ -1,23 +1,23 @@
-Loading net-file from 'net.net.xml' ... done (2ms).
+Loading net-file from 'net.net.xml' ... done (4ms).
 Loading additional-files from 'input_additional.add.xml' ... done (1ms).
 Loading additional-files from 'input_additional2.add.xml' ... done (1ms).
 Loading done.
-Simulation version v1_12_0+0452-f1c085e started with time: 0.00
-Simulation ended at time: 3760.00
+Simulation version v1_13_0+0011-a81882c started with time: 0.00
+Simulation ended at time: 3762.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 1.64s
- Real time factor: 2291.29
- UPS: 130448.507008
+ Duration: 1.62s
+ Real time factor: 2323.66
+ UPS: 128145.151328
 Vehicles: 
  Inserted: 2774
  Running: 0
  Waiting: 0
 Statistics (avg):
- RouteLength: 376.94
- Speed: 6.92
- Duration: 77.17
- WaitingTime: 36.89
- TimeLoss: 57.59
+ RouteLength: 376.93
+ Speed: 7.00
+ Duration: 74.79
+ WaitingTime: 35.03
+ TimeLoss: 55.22
  DepartDelay: 0.78
 
diff --git a/tests/sumo/basic/tls/NEMA/basic/tls_program.sumo b/tests/sumo/basic/tls/NEMA/basic/tls_program.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-02-10 14:18:33 by Eclipse SUMO sumo Version v1_12_0+0453-348ab90
+<!-- generated on 2022-05-04 09:23:09 by Eclipse SUMO sumo Version v1_13_0+0011-a81882c
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -160,10 +160,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="21.00" state="GGGGGrrrrrrr" name="4+4"/>
         <phase duration="5.00"  state="yyyyyrrrrrrr" name="4+4"/>
         <phase duration="1.00"  state="rrrrrrrrrrrr" name="4+4"/>
-        <phase duration="13.00" state="srrrrGGGGrrr" name="1+6"/>
+        <phase duration="14.00" state="srrrrGGGGrrr" name="1+6"/>
         <phase duration="4.00"  state="srrrrGGyyrrr" name="1+6"/>
         <phase duration="1.00"  state="srrrrGGrrrrr" name="1+6"/>
-        <phase duration="70.00" state="srrrrGGrrGGG" name="2+6"/>
+        <phase duration="69.00" state="srrrrGGrrGGG" name="2+6"/>
         <phase duration="4.00"  state="srrrryyrryyy" name="2+6"/>
         <phase duration="1.00"  state="rrrrrrrrrrrr" name="2+6"/>
         <phase duration="21.00" state="GGGGGrrrrrrr" name="4+4"/>
@@ -196,10 +196,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="21.00" state="GGGGGrrrrrrr" name="4+4"/>
         <phase duration="5.00"  state="yyyyyrrrrrrr" name="4+4"/>
         <phase duration="1.00"  state="rrrrrrrrrrrr" name="4+4"/>
-        <phase duration="14.00" state="srrrrGGGGrrr" name="1+6"/>
+        <phase duration="15.00" state="srrrrGGGGrrr" name="1+6"/>
         <phase duration="4.00"  state="srrrrGGyyrrr" name="1+6"/>
         <phase duration="1.00"  state="srrrrGGrrrrr" name="1+6"/>
-        <phase duration="69.00" state="srrrrGGrrGGG" name="2+6"/>
+        <phase duration="68.00" state="srrrrGGrrGGG" name="2+6"/>
         <phase duration="4.00"  state="srrrryyrryyy" name="2+6"/>
         <phase duration="1.00"  state="rrrrrrrrrrrr" name="2+6"/>
         <phase duration="21.00" state="GGGGGrrrrrrr" name="4+4"/>
@@ -277,10 +277,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="21.00" state="GGGGGrrrrrrr" name="4+4"/>
         <phase duration="5.00"  state="yyyyyrrrrrrr" name="4+4"/>
         <phase duration="1.00"  state="rrrrrrrrrrrr" name="4+4"/>
-        <phase duration="16.00" state="srrrrGGGGrrr" name="1+6"/>
+        <phase duration="15.00" state="srrrrGGGGrrr" name="1+6"/>
         <phase duration="4.00"  state="srrrrGGyyrrr" name="1+6"/>
         <phase duration="1.00"  state="srrrrGGrrrrr" name="1+6"/>
-        <phase duration="67.00" state="srrrrGGrrGGG" name="2+6"/>
+        <phase duration="68.00" state="srrrrGGrrGGG" name="2+6"/>
         <phase duration="4.00"  state="srrrryyrryyy" name="2+6"/>
         <phase duration="1.00"  state="rrrrrrrrrrrr" name="2+6"/>
         <phase duration="21.00" state="GGGGGrrrrrrr" name="4+4"/>
@@ -319,7 +319,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="68.00" state="srrrrGGrrGGG" name="2+6"/>
         <phase duration="4.00"  state="srrrryyrryyy" name="2+6"/>
         <phase duration="1.00"  state="rrrrrrrrrrrr" name="2+6"/>
-        <phase duration="19.00" state="GGGGGrrrrrrr" name="4+4"/>
+        <phase duration="21.00" state="GGGGGrrrrrrr" name="4+4"/>
         <phase duration="5.00"  state="yyyyyrrrrrrr" name="4+4"/>
         <phase duration="1.00"  state="rrrrrrrrrrrr" name="4+4"/>
         <phase duration="5.00"  state="srrrrGGGGrrr" name="1+6"/>