patching meso tests for repeated stops on the route. Results are now …

…closer to micro sim results, refs eclipse-sumo#7500 eclipse-sumo#21
abcsyald · Oct 13, 2020 · e3b4fa3 · e3b4fa3
1 parent 092f39e
commit e3b4fa3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 21 deletions.
diff --git a/tests/sumo/devices/rerouting/stops/cyclic_trip/stopinfos.sumo.meso b/tests/sumo/devices/rerouting/stops/cyclic_trip/stopinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Sun Mar 31 18:34:27 2019 by Eclipse SUMO Version v1_1_0+0435-678c69824b
+<!-- generated on Tue Oct 13 13:26:00 2020 by Eclipse SUMO sumo Version v1_7_0+0594-1f29e2c600
 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
@@ -31,6 +31,7 @@ SPDX-License-Identifier: EPL-2.0
 
     <report>
         <xml-validation value="never"/>
+        <xml-validation.routes value="never"/>
         <duration-log.disable value="true"/>
         <no-step-log value="true"/>
     </report>
@@ -43,16 +44,16 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
-    <stopinfo id="bus" type="bus" edge="a" pos="0.00" parking="0" started="38.00" ended="38.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_a"/>
-    <stopinfo id="bus" type="bus" edge="c" pos="0.00" parking="0" started="82.00" ended="82.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_c"/>
-    <stopinfo id="bus" type="bus" edge="-c" pos="0.00" parking="0" started="119.00" ended="119.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_-c"/>
-    <stopinfo id="bus" type="bus" edge="-a" pos="0.00" parking="0" started="164.00" ended="164.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_-a"/>
-    <stopinfo id="bus" type="bus" edge="a" pos="0.00" parking="0" started="191.00" ended="191.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_a"/>
-    <stopinfo id="bus" type="bus" edge="c" pos="0.00" parking="0" started="225.00" ended="225.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_c"/>
-    <stopinfo id="bus" type="bus" edge="-c" pos="0.00" parking="0" started="252.00" ended="252.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_-c"/>
-    <stopinfo id="bus" type="bus" edge="-a" pos="0.00" parking="0" started="287.00" ended="287.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_-a"/>
-    <stopinfo id="bus" type="bus" edge="a" pos="0.00" parking="0" started="304.00" ended="304.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_a"/>
-    <stopinfo id="bus" type="bus" edge="c" pos="0.00" parking="0" started="328.00" ended="328.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_c"/>
-    <stopinfo id="bus" type="bus" edge="-c" pos="0.00" parking="0" started="346.00" ended="346.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_-c"/>
-    <stopinfo id="bus" type="bus" edge="-a" pos="0.00" parking="0" started="370.00" ended="370.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_-a"/>
+    <stopinfo id="bus" type="bus" edge="a" pos="0.00" parking="0" started="0.00" ended="18.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_a"/>
+    <stopinfo id="bus" type="bus" edge="c" pos="0.00" parking="0" started="24.40" ended="42.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_c"/>
+    <stopinfo id="bus" type="bus" edge="-c" pos="0.00" parking="0" started="41.60" ended="59.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_-c"/>
+    <stopinfo id="bus" type="bus" edge="-a" pos="0.00" parking="0" started="66.00" ended="84.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_-a"/>
+    <stopinfo id="bus" type="bus" edge="a" pos="0.00" parking="0" started="83.19" ended="101.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_a"/>
+    <stopinfo id="bus" type="bus" edge="c" pos="0.00" parking="0" started="107.59" ended="125.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_c"/>
+    <stopinfo id="bus" type="bus" edge="-c" pos="0.00" parking="0" started="124.79" ended="142.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_-c"/>
+    <stopinfo id="bus" type="bus" edge="-a" pos="0.00" parking="0" started="149.19" ended="167.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_-a"/>
+    <stopinfo id="bus" type="bus" edge="a" pos="0.00" parking="0" started="166.39" ended="184.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_a"/>
+    <stopinfo id="bus" type="bus" edge="c" pos="0.00" parking="0" started="190.79" ended="208.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_c"/>
+    <stopinfo id="bus" type="bus" edge="-c" pos="0.00" parking="0" started="207.99" ended="226.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_-c"/>
+    <stopinfo id="bus" type="bus" edge="-a" pos="0.00" parking="0" started="232.38" ended="250.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_-a"/>
 </stops>
diff --git a/tests/sumo/devices/rerouting/stops/cyclic_trip/vehroutes.sumo.meso b/tests/sumo/devices/rerouting/stops/cyclic_trip/vehroutes.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Wed Nov 27 10:01:33 2019 by Eclipse SUMO Version v1_3_1+1134-4107d93
+<!-- generated on Tue Oct 13 13:26:00 2020 by Eclipse SUMO sumo Version v1_7_0+0594-1f29e2c600
 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
@@ -31,6 +31,7 @@ SPDX-License-Identifier: EPL-2.0
 
     <report>
         <xml-validation value="never"/>
+        <xml-validation.routes value="never"/>
         <duration-log.disable value="true"/>
         <no-step-log value="true"/>
     </report>
@@ -43,7 +44,7 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vehicle id="bus" type="bus" depart="0.00" departPos="0.00" arrival="370.00">
+    <vehicle id="bus" type="bus" depart="0.00" departPos="0.00" arrival="250.00">
         <route edges="a b c -c -b -a a b c -c -b -a a b c -c -b -a"/>
         <stop busStop="busStop_a" duration="10.00"/>
         <stop busStop="busStop_c" duration="10.00"/>

diff --git a/tests/sumo/devices/rerouting/stops/cyclic_trip_past_stop/stopinfos.sumo.meso b/tests/sumo/devices/rerouting/stops/cyclic_trip_past_stop/stopinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Sun Mar 31 18:34:27 2019 by Eclipse SUMO Version v1_1_0+0435-678c69824b
+<!-- generated on Tue Oct 13 13:26:00 2020 by Eclipse SUMO sumo Version v1_7_0+0594-1f29e2c600
 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
@@ -33,6 +33,7 @@ SPDX-License-Identifier: EPL-2.0
 
     <report>
         <xml-validation value="never"/>
+        <xml-validation.routes value="never"/>
         <duration-log.disable value="true"/>
         <no-step-log value="true"/>
     </report>
@@ -45,6 +46,6 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
-    <stopinfo id="bus" type="bus" edge="a" pos="0.00" parking="0" started="37.00" ended="37.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_a"/>
-    <stopinfo id="bus" type="bus" edge="c" pos="0.00" parking="0" started="103.00" ended="103.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_c"/>
+    <stopinfo id="bus" type="bus" edge="a" pos="0.00" parking="0" started="165.32" ended="202.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_a"/>
+    <stopinfo id="bus" type="bus" edge="c" pos="0.00" parking="0" started="225.68" ended="268.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="busStop_c"/>
 </stops>
diff --git a/tests/sumo/devices/rerouting/stops/cyclic_trip_past_stop/vehroutes.sumo.meso b/tests/sumo/devices/rerouting/stops/cyclic_trip_past_stop/vehroutes.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Sun Mar 31 18:34:27 2019 by Eclipse SUMO Version v1_1_0+0435-678c69824b
+<!-- generated on Tue Oct 13 13:26:00 2020 by Eclipse SUMO sumo Version v1_7_0+0594-1f29e2c600
 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
@@ -33,6 +33,7 @@ SPDX-License-Identifier: EPL-2.0
 
     <report>
         <xml-validation value="never"/>
+        <xml-validation.routes value="never"/>
         <duration-log.disable value="true"/>
         <no-step-log value="true"/>
     </report>
@@ -45,10 +46,11 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vehicle id="bus" type="bus" depart="0.00" departPos="0.00" arrival="103.00">
+    <vehicle id="bus" type="bus" depart="0.00" departPos="0.00" arrival="268.00">
         <routeDistribution>
             <route replacedOnEdge="a" reason="device.rerouting" replacedAtTime="2.00" probability="0" edges="a b c -c -b -a a b c"/>
-            <route edges="a b c"/>
+            <route replacedOnEdge="b" reason="device.rerouting" replacedAtTime="28.00" probability="0" edges="a b c"/>
+            <route edges="a b c -c -b -a a b c"/>
         </routeDistribution>
         <stop busStop="busStop_a" duration="10.00"/>
         <stop busStop="busStop_c" duration="10.00"/>