patching expected results refs #21, #15561

eclipse-sumo · Oct 9, 2024 · 64e0cba · 64e0cba
1 parent 100cba2
commit 64e0cba
Show file tree

Hide file tree

Showing 34 changed files with 816 additions and 53 deletions.
diff --git a/tests/sumo/config.sumo b/tests/sumo/config.sumo
@@ -99,6 +99,7 @@ tripinfosPrefix:pre_tripinfos.xml
 logPrefixed:pre_log.txt
 weights:weights.xml
 lanechanges:lanechanges.xml
+deadlocks:deadlocks.xml
 ssm:ssm.xml
 ssm2:ssm_ego.xml
 png:out.png
@@ -200,6 +201,7 @@ cfg:JuPedSim
 cfg:^$
 weights:<!--{[->]}-->
 lanechanges:<!--{[->]}-->
+deadlocks:<!--{[->]}-->
 ps:%%CreationDate
 ps2:%%CreationDate
 statistic:<performance

diff --git a/tests/sumo/meta/help/output.sumo b/tests/sumo/meta/help/output.sumo
@@ -1,4 +1,4 @@
-Eclipse SUMO sumo Version v1_20_0+0439-a8f3c62bd15
+Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
  Copyright (C) 2001-2024 German Aerospace Center (DLR) and others; https://sumo.dlr.de
 A microscopic, multi-modal traffic simulation.
 
@@ -163,6 +163,7 @@ Output Options:
   --lanedata-output FILE               Write aggregated traffic statistics for
                                         all lanes into FILE
   --statistic-output FILE              Write overall statistics into FILE
+  --deadlock-output FILE               Write reports on deadlocks FILE
   --save-state.times STR[]             Use TIME[] as times at which a network
                                         state written
   --save-state.period TIME             save state repeatedly after TIME period
@@ -267,6 +268,9 @@ Processing Options:
                                         teleporting
   --time-to-teleport.bidi TIME         The waiting time after which vehicles on
                                         bidirectional edges are teleported
+  --time-to-teleport.railsignal-deadlock TIME  The waiting time after which
+                                        vehicles in a rail-signal based deadlock
+                                        are teleported
   --waiting-time-memory TIME           Length of time interval, over which
                                         accumulated waiting time is taken into
                                         account (default is 100s.)

diff --git a/tests/sumo/meta/write_schema/cfg.sumo b/tests/sumo/meta/write_schema/cfg.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:15:32 by Eclipse SUMO sumo Version v1_20_0+0439-a8f3c62bd15
+<!-- generated on 2024-10-09 09:59:48 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
 -->
 
 <xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -128,6 +128,7 @@
             <xsd:element name="edgedata-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="lanedata-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="statistic-output" type="fileOptionType" minOccurs="0"/>
+            <xsd:element name="deadlock-output" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="save-state.times" type="strArrayOptionType" minOccurs="0"/>
             <xsd:element name="save-state.period" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="save-state.period.keep" type="intOptionType" minOccurs="0"/>
@@ -182,6 +183,7 @@
             <xsd:element name="time-to-teleport.remove" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="time-to-teleport.ride" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="time-to-teleport.bidi" type="timeOptionType" minOccurs="0"/>
+            <xsd:element name="time-to-teleport.railsignal-deadlock" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="waiting-time-memory" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="startup-wait-threshold" type="timeOptionType" minOccurs="0"/>
             <xsd:element name="max-depart-delay" type="timeOptionType" minOccurs="0"/>

diff --git a/tests/sumo/meta/write_template_commented_full/cfg.sumo b/tests/sumo/meta/write_template_commented_full/cfg.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:15:32 by Eclipse SUMO sumo Version v1_20_0+0439-a8f3c62bd15
+<!-- generated on 2024-10-09 09:59:48 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
@@ -276,6 +276,9 @@
         <!-- Write overall statistics into FILE -->
         <statistic-output value="" synonymes="statistics-output" type="FILE"/>
 
+        <!-- Write reports on deadlocks FILE -->
+        <deadlock-output value="" type="FILE"/>
+
         <!-- Use TIME[] as times at which a network state written -->
         <save-state.times value="" type="STR[]"/>
 
@@ -414,6 +417,9 @@
         <!-- The waiting time after which vehicles on bidirectional edges are teleported -->
         <time-to-teleport.bidi value="-1" type="TIME"/>
 
+        <!-- The waiting time after which vehicles in a rail-signal based deadlock are teleported -->
+        <time-to-teleport.railsignal-deadlock value="-1" type="TIME"/>
+
         <!-- Length of time interval, over which accumulated waiting time is taken into account (default is 100s.) -->
         <waiting-time-memory value="100" type="TIME"/>
 

diff --git a/tests/sumo/meta/write_template_full/cfg.sumo b/tests/sumo/meta/write_template_full/cfg.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:15:32 by Eclipse SUMO sumo Version v1_20_0+0439-a8f3c62bd15
+<!-- generated on 2024-10-09 09:59:48 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
@@ -100,6 +100,7 @@
         <edgedata-output value="" type="FILE" help="Write aggregated traffic statistics for all edges into FILE"/>
         <lanedata-output value="" type="FILE" help="Write aggregated traffic statistics for all lanes into FILE"/>
         <statistic-output value="" synonymes="statistics-output" type="FILE" help="Write overall statistics into FILE"/>
+        <deadlock-output value="" type="FILE" help="Write reports on deadlocks FILE"/>
         <save-state.times value="" type="STR[]" help="Use TIME[] as times at which a network state written"/>
         <save-state.period value="-1" type="TIME" help="save state repeatedly after TIME period"/>
         <save-state.period.keep value="0" type="INT" help="Keep only the last INT periodic state files"/>
@@ -150,6 +151,7 @@
         <time-to-teleport.remove value="false" type="BOOL" help="Whether vehicles shall be removed after waiting too long instead of being teleported"/>
         <time-to-teleport.ride value="-1" type="TIME" help="The waiting time after which persons / containers waiting for a pickup are teleported. Negative values disable teleporting"/>
         <time-to-teleport.bidi value="-1" type="TIME" help="The waiting time after which vehicles on bidirectional edges are teleported"/>
+        <time-to-teleport.railsignal-deadlock value="-1" type="TIME" help="The waiting time after which vehicles in a rail-signal based deadlock are teleported"/>
         <waiting-time-memory value="100" type="TIME" help="Length of time interval, over which accumulated waiting time is taken into account (default is 100s.)"/>
         <startup-wait-threshold value="2" type="TIME" help="Minimum consecutive waiting time before applying startupDelay"/>
         <max-depart-delay value="-1" type="TIME" help="How long vehicles wait for departure before being skipped, defaults to -1 which means vehicles are never skipped"/>

diff --git a/tests/sumo/rail/options.sumo b/tests/sumo/rail/options.sumo
@@ -1 +1,2 @@
 --railsignal-block-output railsignal_blocks.xml
+--time-to-teleport.railsignal-deadlock 200
diff --git a/tests/sumo/rail/siding/circle_3veh/deadlocks.sumo b/tests/sumo/rail/siding/circle_3veh/deadlocks.sumo
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:58:26 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+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
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+    <deadlock time="243.00" signals="C A B" vehicles="t0 t1 t2"/>
+</additional>
diff --git a/tests/sumo/rail/siding/circle_3veh/errors.sumo b/tests/sumo/rail/siding/circle_3veh/errors.sumo
@@ -1,4 +1,2 @@
-Warning: Teleporting vehicle 't2'; waited too long (yield), lane='c_0', time=343.00.
-Warning: Teleporting vehicle 't0'; waited too long (yield), lane='a_0', time=357.00.
-Warning: Vehicle 't2' ends teleporting on edge 'a', time=357.00.
-Warning: Vehicle 't0' ends teleporting on edge 'b', time=363.00.
+Warning: Teleporting vehicle 't2'; waited too long (yield, railSignal), lane='c_0', time=243.00.
+Warning: Vehicle 't2' ends teleporting on edge 'a', time=283.00.
diff --git a/tests/sumo/rail/siding/circle_3veh/tripinfos.sumo b/tests/sumo/rail/siding/circle_3veh/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-08 08:28:01 by Eclipse SUMO sumo Version v1_20_0+0623-4d64fbde829
+<!-- generated on 2024-10-09 09:58:26 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
 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
@@ -22,9 +22,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
         <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
     </output>
 
     <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -38,7 +40,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="t2" depart="0.00" departLane="c_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="419.00" arrivalLane="b_0" arrivalPos="340.10" arrivalSpeed="12.20" duration="419.00" routeLength="912.88" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="342.77" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t1" depart="0.00" departLane="b_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="426.00" arrivalLane="a_0" arrivalPos="381.52" arrivalSpeed="13.89" duration="426.00" routeLength="914.16" waitingTime="291.00" waitingCount="1" stopTime="0.00" timeLoss="360.04" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="439.00" arrivalLane="c_0" arrivalPos="240.10" arrivalSpeed="11.00" duration="439.00" routeLength="912.88" waitingTime="307.00" waitingCount="2" stopTime="0.00" timeLoss="370.52" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="345.00" arrivalLane="c_0" arrivalPos="240.10" arrivalSpeed="11.88" duration="345.00" routeLength="914.14" waitingTime="207.00" waitingCount="1" stopTime="0.00" timeLoss="278.51" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t1" depart="0.00" departLane="b_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="346.00" arrivalLane="a_0" arrivalPos="381.52" arrivalSpeed="5.25" duration="346.00" routeLength="914.16" waitingTime="191.00" waitingCount="1" stopTime="0.00" timeLoss="280.00" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t2" depart="0.00" departLane="c_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="376.00" arrivalLane="b_0" arrivalPos="340.10" arrivalSpeed="13.00" duration="376.00" routeLength="912.88" waitingTime="213.00" waitingCount="2" stopTime="0.00" timeLoss="273.74" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/rail/siding/loop_3veh/deadlocks.sumo b/tests/sumo/rail/siding/loop_3veh/deadlocks.sumo
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:46:20 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+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
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/sumo/rail/siding/loop_4veh/deadlocks.sumo b/tests/sumo/rail/siding/loop_4veh/deadlocks.sumo
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-09 09:58:26 by Eclipse SUMO sumo Version v1_20_0+0627-9f0eaa86dc7
+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
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+        <deadlock-output value="deadlocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+    <deadlock time="272.00" signals="A D G C2" vehicles="t0 t3 t2 t1"/>
+</additional>
diff --git a/tests/sumo/rail/siding/loop_4veh/errors.sumo b/tests/sumo/rail/siding/loop_4veh/errors.sumo
@@ -1,2 +1,2 @@
-Warning: Teleporting vehicle 't1'; waited too long (yield), lane='a_0', time=318.00.
-Warning: Vehicle 't1' ends teleporting on edge 'e', time=415.00.
+Warning: Teleporting vehicle 't1'; waited too long (yield, railSignal), lane='a_0', time=272.00.
+Warning: Vehicle 't1' ends teleporting on edge 'e', time=369.00.