patching expected results refs #3948, refs #21

eclipse-sumo · Mar 28, 2018 · c519dbd · c519dbd
1 parent 5050fba
commit c519dbd
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 33 deletions.
diff --git a/tests/sumo/extended/simulation_routing/personTrip/access/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/access/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/26/18 23:11:06 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:05 2018 by SUMO Version v0_32_0+0926-8475f44
 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
@@ -35,7 +35,7 @@ SPDX-License-Identifier: EPL-2.0
 
     <person id="p0" depart="0.00" arrival="1111.00">
         <walk edges="beg beg2left" busStop="beg2left"/>
-        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
+        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train" intended="train.3" depart="910.00"/>
         <walk edges="left2end end"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/busstop/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/busstop/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/26/18 23:11:04 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:04 2018 by SUMO Version v0_32_0+0926-8475f44
 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,8 +31,8 @@ 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">
     <person id="p0" depart="0.00" arrival="941.00">
         <walk edges="beg" busStop="beg_0"/>
-        <ride from="beg" to="left" busStop="left_0" lines="bus"/>
-        <ride from="left" to="end" busStop="end_0" lines="bus2"/>
+        <ride from="beg" to="left" busStop="left_0" lines="bus" intended="bus.1" depart="310.00"/>
+        <ride from="left" to="end" busStop="end_0" lines="bus2" intended="bus2.1" depart="370.00"/>
         <walk edges="end"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/busstop_early/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/busstop_early/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/26/18 23:11:05 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:04 2018 by SUMO Version v0_32_0+0926-8475f44
 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,8 +31,8 @@ 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">
     <person id="p0" depart="200.00" arrival="1640.00">
         <walk edges="beg" busStop="beg_0"/>
-        <ride from="beg" to="left" busStop="left_0" lines="bus"/>
-        <ride from="left" to="end" busStop="end_0" lines="bus2"/>
+        <ride from="beg" to="left" busStop="left_0" lines="bus" intended="bus.0" depart="1010.00"/>
+        <ride from="left" to="end" busStop="end_0" lines="bus2" intended="bus2.0" depart="1070.00"/>
         <walk edges="end"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/26/18 23:11:04 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:04 2018 by SUMO Version v0_32_0+0926-8475f44
 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,8 +31,8 @@ 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">
     <person id="p0" depart="0.00" arrival="941.00">
         <walk edges="beg" busStop="beg_0"/>
-        <ride from="beg" to="left" busStop="left_0" lines="bus"/>
-        <ride from="left" to="end" busStop="end_0" lines="bus2"/>
+        <ride from="beg" to="left" busStop="left_0" lines="bus" intended="bus.1" depart="310.00"/>
+        <ride from="left" to="end" busStop="end_0" lines="bus2" intended="bus2.1" depart="370.00"/>
         <walk edges="end"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/27/18 11:17:51 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:05 2018 by SUMO Version v0_32_0+0926-8475f44
 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
@@ -39,7 +39,7 @@ SPDX-License-Identifier: EPL-2.0
 
     <person id="p0" depart="0.00" arrival="810.00">
         <ride from="beg" to="beg2left" busStop="beg2left" lines="p0_0"/>
-        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
+        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train" intended="train.1" depart="310.00"/>
         <walk edges="left2end end"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk2/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk2/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/27/18 11:17:51 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:05 2018 by SUMO Version v0_32_0+0926-8475f44
 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
@@ -39,7 +39,7 @@ SPDX-License-Identifier: EPL-2.0
 
     <person id="p0" depart="0.00" arrival="810.00">
         <ride from="beg" to="beg2left" busStop="beg2left" lines="p0_0"/>
-        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
+        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train" intended="train.1" depart="310.00"/>
         <walk edges="left2end end"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk3/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk3/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/27/18 11:17:51 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:05 2018 by SUMO Version v0_32_0+0926-8475f44
 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
@@ -41,7 +41,7 @@ SPDX-License-Identifier: EPL-2.0
     <person id="p0" depart="0.00" arrival="808.00">
         <ride from="beg" to="beg" lines="p0_0"/>
         <walk edges="beg2left" busStop="beg2left"/>
-        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
+        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train" intended="train.1" depart="310.00"/>
         <walk edges="left2end end"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk4/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk4/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/27/18 11:17:52 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:05 2018 by SUMO Version v0_32_0+0926-8475f44
 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
@@ -39,7 +39,7 @@ SPDX-License-Identifier: EPL-2.0
 
     <person id="p0" depart="0.00" arrival="802.00">
         <ride from="beg" to="beg2left" busStop="beg2left" lines="p0_0"/>
-        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
+        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train" intended="train.1" depart="310.00"/>
         <walk edges="left2end end"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk5/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk5/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/27/18 11:17:52 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:05 2018 by SUMO Version v0_32_0+0926-8475f44
 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
@@ -39,7 +39,7 @@ SPDX-License-Identifier: EPL-2.0
 
     <person id="p0" depart="0.00" arrival="811.00">
         <ride from="beg" to="beg2left" busStop="beg2left" lines="p0_0"/>
-        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
+        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train" intended="train.1" depart="310.00"/>
         <walk edges="left2end end"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk_internal/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk_internal/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/27/18 11:17:52 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:05 2018 by SUMO Version v0_32_0+0926-8475f44
 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
@@ -41,7 +41,7 @@ SPDX-License-Identifier: EPL-2.0
     <person id="p0" depart="0.00" arrival="809.00">
         <ride from="beg" to="beg" lines="p0_0"/>
         <walk edges="beg2left" busStop="beg2left"/>
-        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
+        <ride from="gneE0" to="gneE0" busStop="left2end" lines="train" intended="train.1" depart="310.00"/>
         <walk edges="left2end end"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/early_ending_flow/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/early_ending_flow/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/27/18 11:17:52 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:05 2018 by SUMO Version v0_32_0+0926-8475f44
 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,7 +31,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">
     <person id="public" depart="4.00" arrival="134.00">
         <walk edges="b" busStop="busstop1"/>
-        <ride from="b" to="g" busStop="busstop3" lines="100"/>
+        <ride from="b" to="g" busStop="busstop3" lines="100" intended="0.3" depart="40.00"/>
         <walk edges="g"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/early_pt/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/early_pt/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/27/18 11:17:52 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:05 2018 by SUMO Version v0_32_0+0926-8475f44
 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,7 +31,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">
     <person id="public" depart="4.00" arrival="97.00">
         <walk edges="b" busStop="busstop1"/>
-        <ride from="b" to="g" busStop="busstop3" lines="100"/>
+        <ride from="b" to="g" busStop="busstop3" lines="100" intended="0" depart="50.00"/>
         <walk edges="g"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/late_pt/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/late_pt/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/27/18 11:17:53 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:05 2018 by SUMO Version v0_32_0+0926-8475f44
 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,7 +31,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">
     <person id="public" depart="4.00" arrival="97.00">
         <walk edges="b" busStop="busstop1"/>
-        <ride from="b" to="g" busStop="busstop3" lines="100"/>
+        <ride from="b" to="g" busStop="busstop3" lines="100" intended="0" depart="50.00"/>
         <walk edges="g"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/ptline_routing/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/ptline_routing/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/26/18 23:11:07 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:05 2018 by SUMO Version v0_32_0+0926-8475f44
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -68,7 +68,7 @@
 
     <person id="p0" depart="0.00" arrival="538.00">
         <walk edges="beg" busStop="beg_0"/>
-        <ride from="beg" to="end" busStop="end_0" lines="bus"/>
+        <ride from="beg" to="end" busStop="end_0" lines="bus" intended="bus.3" depart="300.00"/>
         <walk edges="end"/>
     </person>
 

diff --git a/tests/sumo/extended/simulation_routing/personTrip/public_walk/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/public_walk/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/26/18 23:11:04 by SUMO Version v0_32_0+0405-d1c1ff1104
+<!-- generated on Wed Mar 28 12:11:04 2018 by SUMO Version v0_32_0+0926-8475f44
 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,7 +31,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">
     <person id="p0" depart="0.00" arrival="721.00">
         <walk edges="beg" busStop="beg_0"/>
-        <ride from="beg" to="end" busStop="end_0" lines="bus"/>
+        <ride from="beg" to="end" busStop="end_0" lines="bus" intended="bus.1" depart="310.00"/>
         <walk edges="end"/>
     </person>