patching expected results refs #21, #14521

eclipse-sumo · Mar 15, 2024 · b3d883f · b3d883f
1 parent 379077d
commit b3d883f
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 30 deletions.
diff --git a/tests/duarouter/person/personTrip/ride_from_stop/alts.duarouter b/tests/duarouter/person/personTrip/ride_from_stop/alts.duarouter
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Wed Dec 11 23:04:44 2019 by Eclipse SUMO duarouter Version v1_4_0+0051-3f8840f55f
+<!-- generated on 2024-03-15 15:42:58 by Eclipse SUMO duarouter Version v1_19_0+1326-34858f54bfc
 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
-SPDX-License-Identifier: EPL-2.0
+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/duarouterConfiguration.xsd">
 
     <input>
@@ -15,9 +20,8 @@ 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"/>
+        <write-license value="true"/>
     </output>
 
     <report>
@@ -30,7 +34,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="400.00">
-        <stop busStop="stopA_E" duration="0.10"/>
+        <stop busStop="stopA_E" duration="0.10"/> <!-- A  -->
         <personTrip from="railWE" to="railWE" modes="public" departPos="300.00" arrivalPos="1400.00" busStop="stopC_E" walkFactor="0.75" costs="270.90"/>
     </person>
 </routes>
diff --git a/tests/duarouter/person/personTrip/ride_from_stop/routes.duarouter b/tests/duarouter/person/personTrip/ride_from_stop/routes.duarouter
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Mar 15 22:03:22 2019 by Eclipse SUMO duarouter Version v1_1_0+0435-678c69824b
+<!-- generated on 2024-03-15 15:42:58 by Eclipse SUMO duarouter Version v1_19_0+1326-34858f54bfc
 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
-SPDX-License-Identifier: EPL-2.0
+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/duarouterConfiguration.xsd">
 
     <input>
@@ -15,9 +20,8 @@ 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"/>
+        <write-license value="true"/>
     </output>
 
     <report>
@@ -30,7 +34,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="400.00">
-        <stop busStop="stopA_E" duration="0.10"/>
+        <stop busStop="stopA_E" duration="0.10"/> <!-- A  -->
         <ride busStop="stopC_E" lines="tAC" intended="trainAC.0" depart="528.00"/> <!-- C -->
     </person>
 </routes>
diff --git a/tests/duarouter/person/personTrip/ride_trip/alts.duarouter b/tests/duarouter/person/personTrip/ride_trip/alts.duarouter
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2021-06-10 09:08:41 by Eclipse SUMO duarouter Version v1_9_2+0439-960336d
+<!-- generated on 2024-03-15 15:42:58 by Eclipse SUMO duarouter Version v1_19_0+1326-34858f54bfc
 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
-SPDX-License-Identifier: EPL-2.0
+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/duarouterConfiguration.xsd">
 
     <input>
@@ -17,12 +22,10 @@ SPDX-License-Identifier: EPL-2.0
     <output>
         <output-file value="routes.rou.xml"/>
         <write-license value="true"/>
-        <alternatives-output value="routes.rou.alt.xml"/>
     </output>
 
     <report>
         <xml-validation value="never"/>
-        <xml-validation.routes value="never"/>
         <no-step-log value="true"/>
     </report>
 
@@ -31,7 +34,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="400.00">
-        <stop busStop="stopB_S" duration="0.10"/>
+        <stop busStop="stopB_S" duration="0.10"/> <!-- B  -->
         <personTrip from="railNS" to="railNS" modes="public" departPos="300.00" arrivalPos="800.00" busStop="stopA_S" walkFactor="0.75" costs="138.90"/>
         <personTrip from="railNS" to="railWE" modes="public" departPos="800.00" arrivalPos="300.00" busStop="stopA_E" walkFactor="0.75" costs="127.46"/>
         <personTrip from="railWE" to="railWE" modes="public" departPos="300.00" arrivalPos="1400.00" busStop="stopC_E" walkFactor="0.75" costs="9.42 327.01 187.48 368.48 218.35"/>

diff --git a/tests/duarouter/person/personTrip/ride_trip/routes.duarouter b/tests/duarouter/person/personTrip/ride_trip/routes.duarouter
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2021-06-10 09:08:41 by Eclipse SUMO duarouter Version v1_9_2+0439-960336d
+<!-- generated on 2024-03-15 15:42:58 by Eclipse SUMO duarouter Version v1_19_0+1326-34858f54bfc
 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
-SPDX-License-Identifier: EPL-2.0
+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/duarouterConfiguration.xsd">
 
     <input>
@@ -17,12 +22,10 @@ SPDX-License-Identifier: EPL-2.0
     <output>
         <output-file value="routes.rou.xml"/>
         <write-license value="true"/>
-        <alternatives-output value="routes.rou.alt.xml"/>
     </output>
 
     <report>
         <xml-validation value="never"/>
-        <xml-validation.routes value="never"/>
         <no-step-log value="true"/>
     </report>
 
@@ -31,7 +34,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="400.00">
-        <stop busStop="stopB_S" duration="0.10"/>
+        <stop busStop="stopB_S" duration="0.10"/> <!-- B  -->
         <ride busStop="stopA_S" lines="tBA" intended="trainBA.0" depart="439.00"/> <!-- A -->
         <walk edges="accessA" busStop="stopA_E"/> <!-- A -->
         <walk edges="accessA" busStop="stopA_N"/> <!-- A -->

diff --git a/tests/duarouter/person/personTrip/stop_access_stop/alts.duarouter b/tests/duarouter/person/personTrip/stop_access_stop/alts.duarouter
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2021-06-10 09:08:41 by Eclipse SUMO duarouter Version v1_9_2+0439-960336d
+<!-- generated on 2024-03-15 15:42:58 by Eclipse SUMO duarouter Version v1_19_0+1326-34858f54bfc
 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
-SPDX-License-Identifier: EPL-2.0
+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/duarouterConfiguration.xsd">
 
     <input>
@@ -17,12 +22,10 @@ SPDX-License-Identifier: EPL-2.0
     <output>
         <output-file value="routes.rou.xml"/>
         <write-license value="true"/>
-        <alternatives-output value="routes.rou.alt.xml"/>
     </output>
 
     <report>
         <xml-validation value="never"/>
-        <xml-validation.routes value="never"/>
         <no-step-log value="true"/>
     </report>
 
@@ -31,7 +34,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">
-        <stop busStop="stopA_S" duration="0.10"/>
+        <stop busStop="stopA_S" duration="0.10"/> <!-- A  -->
         <personTrip from="railNS" to="railEW" departPos="800.00" arrivalPos="1400.00" busStop="stopA_W" walkFactor="0.75" costs="119.34"/>
     </person>
     <person id="p1" depart="100.00" departPos="100.00">

diff --git a/tests/duarouter/person/personTrip/stop_access_stop/routes.duarouter b/tests/duarouter/person/personTrip/stop_access_stop/routes.duarouter
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Nov 29 10:23:58 2019 by Eclipse SUMO duarouter Version v1_3_1+1197-f313815
+<!-- generated on 2024-03-15 15:42:58 by Eclipse SUMO duarouter Version v1_19_0+1326-34858f54bfc
 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
-SPDX-License-Identifier: EPL-2.0
+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/duarouterConfiguration.xsd">
 
     <input>
@@ -15,9 +20,8 @@ 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"/>
+        <write-license value="true"/>
     </output>
 
     <report>
@@ -30,7 +34,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">
-        <stop busStop="stopA_S" duration="0.10"/>
+        <stop busStop="stopA_S" duration="0.10"/> <!-- A  -->
         <walk edges="accessA" busStop="stopA_W"/> <!-- A -->
     </person>
     <person id="p1" depart="100.00" departPos="100.00">