patching expected results. refs #12, #14789

eclipse-sumo · Apr 29, 2024 · 349665b · 349665b
1 parent 059e8d4
commit 349665b
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 20 deletions.
diff --git a/tests/complex/traci/vehicle/changeTarget/runner.py b/tests/complex/traci/vehicle/changeTarget/runner.py
@@ -32,6 +32,7 @@
              "-n", "input_net4.net.xml",
              "-r", "input_routes.rou.xml",
              "--stop-output", "stopinfos.xml",
+             "--vehroute-output", "vehroutes.xml",
              "--no-step-log",
              ] + sys.argv[1:])
 

diff --git a/tests/complex/traci/vehicle/changeTarget/stopinfos.complex b/tests/complex/traci/vehicle/changeTarget/stopinfos.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-04-29 09:27:38 by Eclipse SUMO sumo Version v1_19_0+1962-7cdf26f2482
+<!-- generated on 2024-04-29 09:40:22 by Eclipse SUMO sumo Version v1_19_0+1963-1b04aafd9e3
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -9,6 +9,7 @@
     </input>
 
     <output>
+        <vehroute-output value="vehroutes.xml"/>
         <stop-output value="stopinfos.xml"/>
     </output>
 
@@ -17,11 +18,12 @@
     </report>
 
     <traci_server>
-        <remote-port value="49753"/>
+        <remote-port value="46181"/>
     </traci_server>
 
 </configuration>
 -->
 
 <stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
+    <stopinfo id="v" type="car" lane="B2C2_0" pos="90.60" parking="0" started="23.00" ended="28.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
 </stops>
diff --git a/tests/complex/traci/vehicle/changeTarget/vehroutes.complex b/tests/complex/traci/vehicle/changeTarget/vehroutes.complex
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-04-29 11:05:53 by Eclipse SUMO sumo Version v1_19_0+1964-c613013b36e
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="input_net4.net.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <vehroute-output value="vehroutes.xml"/>
+        <stop-output value="stopinfos.xml"/>
+    </output>
+
+    <report>
+        <no-step-log value="true"/>
+    </report>
+
+    <traci_server>
+        <remote-port value="59703"/>
+    </traci_server>
+
+</configuration>
+-->
+
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+    <vehicle id="v" type="car" depart="0.00" departSpeed="13.89" speedFactor="1.0600" arrival="53.00">
+        <routeDistribution>
+            <route replacedOnEdge="A1B1" reason="traci:changeTarget" replacedAtTime="1.00" probability="0" edges="A1B1 B1B2 B2C2 C2C1 C1D1"/>
+            <route edges="A1B1 B1B2 B2C2 C2D2 D2D1 D1D0"/>
+        </routeDistribution>
+        <stop edge="B2C2" duration="5.00"/>
+    </vehicle>
+
+</routes>
diff --git a/tests/complex/traci/vehicle/vehicle/errors.complex b/tests/complex/traci/vehicle/vehicle/errors.complex
@@ -1,21 +1,20 @@
 Warning: New value of emergencyDecel (3.00) is lower than decel (4.50)
 Warning: Automatically setting emergencyDecel to 5.10 for vType 'DEFAULT_VEHTYPE@horiz' to match decel.
-/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:202: UserWarning: Parameter order has changed for setAdaptedTraveltime(). Attempting legacy ordering. Please update your code.
+/home/erdm_ja/scr1/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:202: UserWarning: Parameter order has changed for setAdaptedTraveltime(). Attempting legacy ordering. Please update your code.
   traci.vehicle.setAdaptedTraveltime(vehID, 0, 1000, "1o", 55)
-/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:203: UserWarning: Parameter order has changed for setEffort(). Attempting legacy ordering. Please update your code.
+/home/erdm_ja/scr1/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:203: UserWarning: Parameter order has changed for setEffort(). Attempting legacy ordering. Please update your code.
   traci.vehicle.setEffort(vehID, 0, 1000, "1o", 54)
 Error: Answered with error to command 0xa4: Vehicle 'bla' is not known.
 Warning: No connection between edge '2fi' and edge 'disconnected' found.
 Warning: No route for vehicle '1' found.
-Error: Answered with error to command 0xc4: Route replacement failed for vehicle '1' (No route found).
-/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:246: UserWarning: Call to deprecated function getNextStops.
+/home/erdm_ja/scr1/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:246: UserWarning: Call to deprecated function getNextStops.
   print("legacy getNextStops", traci.vehicle.getNextStops(vehID))
-/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:282: UserWarning: Call to deprecated function getNextStops.
+/home/erdm_ja/scr1/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:282: UserWarning: Call to deprecated function getNextStops.
   print("legacy getNextStops", traci.vehicle.getNextStops(vehID))
 Warning: Vehicle '1' aborts stop.
 Error: Answered with error to command 0xa4: Vehicle 'anotherOne' is not known.
 Warning: Departure time for vehicle 'departInThePast' is in the past; using current time instead.
-/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:379: UserWarning: Call to deprecated function getNextStops.
+/home/erdm_ja/scr1/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:379: UserWarning: Call to deprecated function getNextStops.
   print("legacy getNextStops", traci.vehicle.getNextStops(parkingVeh))
 Warning: Vehicle 'parking2' aborts stop.
 Warning: Teleporting vehicle 'collider'; collision with vehicle 'blocker', lane='2fi_0', gap=-3.74, time=117.00 stage=events.

diff --git a/tests/complex/traci/vehicle/vehicle/tripinfo.complex b/tests/complex/traci/vehicle/vehicle/tripinfo.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-05-17 14:11:28 by Eclipse SUMO sumo Version v1_13_0+0272-b06a2f8ad4b
+<!-- generated on 2024-04-29 11:06:44 by Eclipse SUMO sumo Version v1_19_0+1964-c613013b36e
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -27,7 +27,7 @@
     </report>
 
     <traci_server>
-        <remote-port value="56198"/>
+        <remote-port value="57787"/>
     </traci_server>
 
     <gui_only>
@@ -49,7 +49,7 @@
     <tripinfo id="routeTest" depart="34.00" departLane="2fi_0" departPos="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="131.00" routeLength="790.32" waitingTime="44.00" waitingCount="1" stopTime="3.00" timeLoss="60.38" rerouteNo="1" devices="vehroute_routeTest tripinfo_routeTest" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
     <tripinfo id="routeTest2" depart="50.00" departLane="2fi_0" departPos="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="115.00" routeLength="770.25" waitingTime="32.00" waitingCount="2" stopTime="3.00" timeLoss="46.14" rerouteNo="0" devices="vehroute_routeTest2 tripinfo_routeTest2" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
     <tripinfo id="bus" depart="64.00" departLane="2fi_0" departPos="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="101.00" routeLength="745.53" waitingTime="19.00" waitingCount="2" stopTime="2.00" timeLoss="35.39" rerouteNo="0" devices="vehroute_bus tripinfo_bus" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
-    <tripinfo id="triptest" depart="78.00" departLane="3si_0" departPos="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="87.00" routeLength="904.86" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="9.03" rerouteNo="2" devices="vehroute_triptest tripinfo_triptest" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
+    <tripinfo id="triptest" depart="78.00" departLane="3si_0" departPos="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="87.00" routeLength="904.86" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="9.03" rerouteNo="1" devices="vehroute_triptest tripinfo_triptest" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
     <tripinfo id="parking" depart="78.00" departLane="2fi_0" departPos="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="87.00" routeLength="510.26" waitingTime="12.00" waitingCount="1" stopTime="10.00" timeLoss="34.55" rerouteNo="0" devices="vehroute_parking tripinfo_parking" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
     <tripinfo id="parking2" depart="98.00" departLane="2fi_0" departPos="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="67.00" routeLength="885.50" waitingTime="0.00" waitingCount="0" stopTime="61.00" timeLoss="9.61" rerouteNo="0" devices="vehroute_parking2 tripinfo_parking2" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
     <tripinfo id="blocker" depart="114.00" departLane="2fi_0" departPos="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="51.00" routeLength="490.69" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="10.23" rerouteNo="0" devices="vehroute_blocker tripinfo_blocker" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>

diff --git a/tests/complex/traci/vehicle/vehicle_sublane/errors.complex b/tests/complex/traci/vehicle/vehicle_sublane/errors.complex
@@ -1,21 +1,20 @@
 Warning: New value of emergencyDecel (3.00) is lower than decel (4.50)
 Warning: Automatically setting emergencyDecel to 5.10 for vType 'DEFAULT_VEHTYPE@horiz' to match decel.
-/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:202: UserWarning: Parameter order has changed for setAdaptedTraveltime(). Attempting legacy ordering. Please update your code.
+/home/erdm_ja/scr1/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:202: UserWarning: Parameter order has changed for setAdaptedTraveltime(). Attempting legacy ordering. Please update your code.
   traci.vehicle.setAdaptedTraveltime(vehID, 0, 1000, "1o", 55)
-/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:203: UserWarning: Parameter order has changed for setEffort(). Attempting legacy ordering. Please update your code.
+/home/erdm_ja/scr1/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:203: UserWarning: Parameter order has changed for setEffort(). Attempting legacy ordering. Please update your code.
   traci.vehicle.setEffort(vehID, 0, 1000, "1o", 54)
 Error: Answered with error to command 0xa4: Vehicle 'bla' is not known.
 Warning: No connection between edge '2fi' and edge 'disconnected' found.
 Warning: No route for vehicle '1' found.
-Error: Answered with error to command 0xc4: Route replacement failed for vehicle '1' (No route found).
-/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:246: UserWarning: Call to deprecated function getNextStops.
+/home/erdm_ja/scr1/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:246: UserWarning: Call to deprecated function getNextStops.
   print("legacy getNextStops", traci.vehicle.getNextStops(vehID))
-/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:282: UserWarning: Call to deprecated function getNextStops.
+/home/erdm_ja/scr1/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:282: UserWarning: Call to deprecated function getNextStops.
   print("legacy getNextStops", traci.vehicle.getNextStops(vehID))
 Warning: Vehicle '1' aborts stop.
 Error: Answered with error to command 0xa4: Vehicle 'anotherOne' is not known.
 Warning: Departure time for vehicle 'departInThePast' is in the past; using current time instead.
-/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:379: UserWarning: Call to deprecated function getNextStops.
+/home/erdm_ja/scr1/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:379: UserWarning: Call to deprecated function getNextStops.
   print("legacy getNextStops", traci.vehicle.getNextStops(parkingVeh))
 Warning: Vehicle 'parking2' aborts stop.
 Warning: Teleporting vehicle 'collider'; collision with vehicle 'blocker', lane='2fi_0', gap=-3.74', latGap=-1.80, time=117.00 stage=events.

diff --git a/tests/complex/traci/vehicle/vehicle_sublane/tripinfo.complex b/tests/complex/traci/vehicle/vehicle_sublane/tripinfo.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-05-17 14:11:28 by Eclipse SUMO sumo Version v1_13_0+0272-b06a2f8ad4b
+<!-- generated on 2024-04-29 11:06:44 by Eclipse SUMO sumo Version v1_19_0+1964-c613013b36e
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -28,7 +28,7 @@
     </report>
 
     <traci_server>
-        <remote-port value="56197"/>
+        <remote-port value="36153"/>
     </traci_server>
 
 </configuration>
@@ -45,7 +45,7 @@
     <tripinfo id="routeTest" depart="34.00" departLane="2fi_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalPosLat="0.00" arrivalSpeed="-1.00" duration="131.00" routeLength="790.32" waitingTime="44.00" waitingCount="1" stopTime="3.00" timeLoss="60.38" rerouteNo="1" devices="vehroute_routeTest tripinfo_routeTest" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
     <tripinfo id="routeTest2" depart="50.00" departLane="2fi_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalPosLat="0.00" arrivalSpeed="-1.00" duration="115.00" routeLength="770.25" waitingTime="32.00" waitingCount="2" stopTime="3.00" timeLoss="46.14" rerouteNo="0" devices="vehroute_routeTest2 tripinfo_routeTest2" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
     <tripinfo id="bus" depart="64.00" departLane="2fi_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalPosLat="0.00" arrivalSpeed="-1.00" duration="101.00" routeLength="745.53" waitingTime="19.00" waitingCount="2" stopTime="2.00" timeLoss="35.39" rerouteNo="0" devices="vehroute_bus tripinfo_bus" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
-    <tripinfo id="triptest" depart="78.00" departLane="3si_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalPosLat="0.00" arrivalSpeed="-1.00" duration="87.00" routeLength="904.86" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="9.03" rerouteNo="2" devices="vehroute_triptest tripinfo_triptest" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
+    <tripinfo id="triptest" depart="78.00" departLane="3si_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalPosLat="0.00" arrivalSpeed="-1.00" duration="87.00" routeLength="904.86" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="9.03" rerouteNo="1" devices="vehroute_triptest tripinfo_triptest" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
     <tripinfo id="parking" depart="78.00" departLane="2fi_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalPosLat="0.00" arrivalSpeed="-1.00" duration="87.00" routeLength="510.26" waitingTime="12.00" waitingCount="1" stopTime="10.00" timeLoss="34.55" rerouteNo="0" devices="vehroute_parking tripinfo_parking" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
     <tripinfo id="parking2" depart="98.00" departLane="2fi_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalPosLat="0.00" arrivalSpeed="-1.00" duration="67.00" routeLength="885.50" waitingTime="0.00" waitingCount="0" stopTime="61.00" timeLoss="9.61" rerouteNo="0" devices="vehroute_parking2 tripinfo_parking2" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>
     <tripinfo id="blocker" depart="114.00" departLane="2fi_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalPosLat="0.00" arrivalSpeed="-1.00" duration="51.00" routeLength="490.69" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="10.23" rerouteNo="0" devices="vehroute_blocker tripinfo_blocker" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized="end"/>