patching expected results refs #3948, refs #21

eclipse-sumo · Mar 28, 2018 · 75c89cc · 75c89cc
1 parent c99514d
commit 75c89cc
Show file tree

Hide file tree

Showing 35 changed files with 139 additions and 111 deletions.
diff --git a/tests/duarouter/person/personTrip/access/alts.duarouter b/tests/duarouter/person/personTrip/access/alts.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Dec  5 10:50:26 2017 by SUMO duarouter Version v0_31_0+1455-5cdbcac
+<!-- generated on Wed Mar 28 11:06:38 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
         <alternatives-output value="routes.rou.alt.xml"/>
     </output>
@@ -30,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">
         <walk cost="720.00" edges="beg beg2left" busStop="beg2left"/>
-        <ride cost="240.00" busStop="left2end" lines="train"/>
+        <ride cost="240.00" busStop="left2end" lines="train" intended="train.3" depart="910.00"/>
         <walk cost="246.70" edges="left2end end"/>
     </person>
     <person id="p1" depart="0.00">

diff --git a/tests/duarouter/person/personTrip/access/routes.duarouter b/tests/duarouter/person/personTrip/access/routes.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 09/26/17 10:25:35 by SUMO duarouter Version dev-SVN-r26222
+<!-- generated on Wed Mar 28 11:06:38 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,7 +15,9 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
+        <alternatives-output value="routes.rou.alt.xml"/>
     </output>
 
     <report>
@@ -29,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">
         <walk edges="beg beg2left" busStop="beg2left"/>
-        <ride busStop="left2end" lines="train"/>
+        <ride busStop="left2end" lines="train" intended="train.3" depart="910.00"/>
         <walk edges="left2end end"/>
     </person>
     <person id="p1" depart="0.00">

diff --git a/tests/duarouter/person/personTrip/access_shortcut/alts.duarouter b/tests/duarouter/person/personTrip/access_shortcut/alts.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Dec  5 10:50:26 2017 by SUMO duarouter Version v0_31_0+1455-5cdbcac
+<!-- generated on Wed Mar 28 11:06:38 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
         <alternatives-output value="routes.rou.alt.xml"/>
     </output>
@@ -30,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">
         <walk cost="240.00" edges="beg" busStop="beg2left"/>
-        <ride cost="120.00" busStop="left2end" lines="train"/>
+        <ride cost="120.00" busStop="left2end" lines="train" intended="train.1" depart="310.00"/>
         <walk cost="48.00" edges="end"/>
     </person>
     <person id="p1" depart="0.00">

diff --git a/tests/duarouter/person/personTrip/access_shortcut/routes.duarouter b/tests/duarouter/person/personTrip/access_shortcut/routes.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/23/17 12:58:56 by SUMO duarouter Version v0_31_0+1143-87c09f1032
+<!-- generated on Wed Mar 28 11:06:38 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
         <alternatives-output value="routes.rou.alt.xml"/>
     </output>
@@ -30,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">
         <walk edges="beg" busStop="beg2left"/>
-        <ride busStop="left2end" lines="train"/>
+        <ride busStop="left2end" lines="train" intended="train.1" depart="310.00"/>
         <walk edges="end"/>
     </person>
     <person id="p1" depart="0.00">

diff --git a/tests/duarouter/person/personTrip/access_twice/alts.duarouter b/tests/duarouter/person/personTrip/access_twice/alts.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Dec  5 10:50:26 2017 by SUMO duarouter Version v0_31_0+1455-5cdbcac
+<!-- generated on Wed Mar 28 11:06:39 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
         <alternatives-output value="routes.rou.alt.xml"/>
     </output>
@@ -30,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">
         <walk cost="0.00" edges="beg" busStop="beg2left"/>
-        <ride cost="60.00" busStop="left2end" lines="train"/>
+        <ride cost="60.00" busStop="left2end" lines="train" intended="train.0" depart="10.00"/>
         <walk cost="48.00" edges="end"/>
     </person>
     <person id="p1" depart="0.00">

diff --git a/tests/duarouter/person/personTrip/access_twice/routes.duarouter b/tests/duarouter/person/personTrip/access_twice/routes.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Nov 24 08:55:14 2017 by SUMO duarouter Version v0_31_0+1301-485338d
+<!-- generated on Wed Mar 28 11:06:39 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
         <alternatives-output value="routes.rou.alt.xml"/>
     </output>
@@ -30,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">
         <walk edges="beg" busStop="beg2left"/>
-        <ride busStop="left2end" lines="train"/>
+        <ride busStop="left2end" lines="train" intended="train.0" depart="10.00"/>
         <walk edges="end"/>
     </person>
     <person id="p1" depart="0.00">

diff --git a/tests/duarouter/person/personTrip/busstop/alts.duarouter b/tests/duarouter/person/personTrip/busstop/alts.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Dec  5 10:50:25 2017 by SUMO duarouter Version v0_31_0+1455-5cdbcac
+<!-- generated on Wed Mar 28 11:06:38 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
         <alternatives-output value="routes.rou.alt.xml"/>
     </output>
@@ -30,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">
         <walk cost="240.00" edges="beg" busStop="beg_0"/>
-        <ride cost="120.00" busStop="left_0" lines="bus"/>
-        <ride cost="50.00" busStop="end_0" lines="bus2"/>
+        <ride cost="120.00" busStop="left_0" lines="bus" intended="bus.1" depart="310.00"/>
+        <ride cost="50.00" busStop="end_0" lines="bus2" intended="bus2.1" depart="370.00"/>
         <walk cost="240.00" edges="end"/>
     </person>
 </routes>
diff --git a/tests/duarouter/person/personTrip/busstop/routes.duarouter b/tests/duarouter/person/personTrip/busstop/routes.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 09/26/17 10:25:34 by SUMO duarouter Version dev-SVN-r26222
+<!-- generated on Wed Mar 28 11:06:38 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,7 +15,9 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
+        <alternatives-output value="routes.rou.alt.xml"/>
     </output>
 
     <report>
@@ -29,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">
         <walk edges="beg" busStop="beg_0"/>
-        <ride busStop="left_0" lines="bus"/>
-        <ride busStop="end_0" lines="bus2"/>
+        <ride busStop="left_0" lines="bus" intended="bus.1" depart="310.00"/>
+        <ride busStop="end_0" lines="bus2" intended="bus2.1" depart="370.00"/>
         <walk edges="end"/>
     </person>
 </routes>
diff --git a/tests/duarouter/person/personTrip/busstop_early/alts.duarouter b/tests/duarouter/person/personTrip/busstop_early/alts.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Dec  5 10:50:25 2017 by SUMO duarouter Version v0_31_0+1455-5cdbcac
+<!-- generated on Wed Mar 28 11:06:38 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
         <alternatives-output value="routes.rou.alt.xml"/>
     </output>
@@ -30,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">
         <walk cost="240.00" edges="beg" busStop="beg_0"/>
-        <ride cost="620.00" busStop="left_0" lines="bus"/>
-        <ride cost="50.00" busStop="end_0" lines="bus2"/>
+        <ride cost="620.00" busStop="left_0" lines="bus" intended="bus.0" depart="1010.00"/>
+        <ride cost="50.00" busStop="end_0" lines="bus2" intended="bus2.0" depart="1070.00"/>
         <walk cost="240.00" edges="end"/>
     </person>
 </routes>
diff --git a/tests/duarouter/person/personTrip/busstop_early/routes.duarouter b/tests/duarouter/person/personTrip/busstop_early/routes.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 15:23:09 by SUMO duarouter Version v0_31_0+1143-87c09f1032
+<!-- generated on Wed Mar 28 11:06:38 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
         <alternatives-output value="routes.rou.alt.xml"/>
     </output>
@@ -30,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">
         <walk edges="beg" busStop="beg_0"/>
-        <ride busStop="left_0" lines="bus"/>
-        <ride busStop="end_0" lines="bus2"/>
+        <ride busStop="left_0" lines="bus" intended="bus.0" depart="1010.00"/>
+        <ride busStop="end_0" lines="bus2" intended="bus2.0" depart="1070.00"/>
         <walk edges="end"/>
     </person>
 </routes>
diff --git a/tests/duarouter/person/personTrip/busstop_too_late/alts.duarouter b/tests/duarouter/person/personTrip/busstop_too_late/alts.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Dec  5 10:50:25 2017 by SUMO duarouter Version v0_31_0+1455-5cdbcac
+<!-- generated on Wed Mar 28 11:06:38 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
         <alternatives-output value="routes.rou.alt.xml"/>
     </output>
@@ -30,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">
         <walk cost="240.00" edges="beg" busStop="beg_0"/>
-        <ride cost="120.00" busStop="left_0" lines="bus"/>
-        <ride cost="50.00" busStop="end_0" lines="bus2"/>
+        <ride cost="120.00" busStop="left_0" lines="bus" intended="bus.1" depart="310.00"/>
+        <ride cost="50.00" busStop="end_0" lines="bus2" intended="bus2.1" depart="370.00"/>
         <walk cost="240.00" edges="end"/>
     </person>
     <person id="p1" depart="2000.00">

diff --git a/tests/duarouter/person/personTrip/busstop_too_late/routes.duarouter b/tests/duarouter/person/personTrip/busstop_too_late/routes.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 09/26/17 10:25:34 by SUMO duarouter Version dev-SVN-r26222
+<!-- generated on Wed Mar 28 11:06:38 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,7 +15,9 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
+        <alternatives-output value="routes.rou.alt.xml"/>
     </output>
 
     <report>
@@ -29,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">
         <walk edges="beg" busStop="beg_0"/>
-        <ride busStop="left_0" lines="bus"/>
-        <ride busStop="end_0" lines="bus2"/>
+        <ride busStop="left_0" lines="bus" intended="bus.1" depart="310.00"/>
+        <ride busStop="end_0" lines="bus2" intended="bus2.1" depart="370.00"/>
         <walk edges="end"/>
     </person>
     <person id="p1" depart="2000.00">

diff --git a/tests/duarouter/person/personTrip/car_public_walk/alts.duarouter b/tests/duarouter/person/personTrip/car_public_walk/alts.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Dec  5 10:50:26 2017 by SUMO duarouter Version v0_31_0+1455-5cdbcac
+<!-- generated on Wed Mar 28 11:06:39 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
         <alternatives-output value="routes.rou.alt.xml"/>
     </output>
@@ -35,7 +36,7 @@ SPDX-License-Identifier: EPL-2.0
     </vehicle>
     <person id="p0" depart="0.00">
         <ride cost="26.93" from="beg" to="beg2left" busStop="beg2left" lines="p0_0"/>
-        <ride cost="333.07" busStop="left2end" lines="train"/>
+        <ride cost="333.07" busStop="left2end" lines="train" intended="train.1" depart="310.00"/>
         <walk cost="241.57" edges="left2end end"/>
     </person>
 </routes>
diff --git a/tests/duarouter/person/personTrip/car_public_walk/routes.duarouter b/tests/duarouter/person/personTrip/car_public_walk/routes.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Nov 17 14:05:35 2017 by SUMO duarouter Version v0_31_0+1192-ab298a6
+<!-- generated on Wed Mar 28 11:06:39 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
         <alternatives-output value="routes.rou.alt.xml"/>
     </output>
@@ -33,7 +34,7 @@ SPDX-License-Identifier: EPL-2.0
     </vehicle>
     <person id="p0" depart="0.00">
         <ride from="beg" to="beg2left" busStop="beg2left" lines="p0_0"/>
-        <ride busStop="left2end" lines="train"/>
+        <ride busStop="left2end" lines="train" intended="train.1" depart="310.00"/>
         <walk edges="left2end end"/>
     </person>
 </routes>
diff --git a/tests/duarouter/person/personTrip/car_public_walk2/alts.duarouter b/tests/duarouter/person/personTrip/car_public_walk2/alts.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Dec  5 10:50:26 2017 by SUMO duarouter Version v0_31_0+1455-5cdbcac
+<!-- generated on Wed Mar 28 11:06:39 2018 by SUMO duarouter Version v0_32_0+0923-1eeb288
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="routes.rou.xml"/>
         <alternatives-output value="routes.rou.alt.xml"/>
     </output>
@@ -35,7 +36,7 @@ SPDX-License-Identifier: EPL-2.0
     </vehicle>
     <person id="p0" depart="0.00">
         <ride cost="34.12" from="beg" to="beg2left" busStop="beg2left" lines="p0_0"/>
-        <ride cost="325.88" busStop="left2end" lines="train"/>
+        <ride cost="325.88" busStop="left2end" lines="train" intended="train.1" depart="310.00"/>
         <walk cost="241.57" edges="left2end end"/>
     </person>
 </routes>