patching expected results. refs #21, #5381

eclipse-sumo · Mar 27, 2019 · 4948b96 · 4948b96
1 parent 4bb984e
commit 4948b96
Show file tree

Hide file tree

Showing 91 changed files with 11,931 additions and 11,856 deletions.
diff --git a/tests/dfrouter/bugs/2149069_internal_edges/emitters.dfrouter b/tests/dfrouter/bugs/2149069_internal_edges/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Wed Aug 15 16:38:03 2018 by Eclipse SUMO dfrouter Version 6423ef4
+<!-- generated on Wed Mar 27 10:37:19 2019 by Eclipse SUMO dfrouter Version v1_0_1+0645-93703db
 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,40 +41,40 @@ SPDX-License-Identifier: EPL-2.0
         <route refId="11_21_to_a4_a5" probability="0.17"/>
         <route refId="11_21_to_a3_b1" probability="1.00"/>
     </routeDistribution>
-    <vehicle id="emitter_LI_0" depart="0.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a3_b1"/>
-    <vehicle id="emitter_LI_6000" depart="6.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a3_b1"/>
-    <vehicle id="emitter_LI_12000" depart="12.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_20_10"/>
-    <vehicle id="emitter_LI_18000" depart="18.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a4_a5"/>
-    <vehicle id="emitter_LI_24000" depart="24.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a3_b1"/>
-    <vehicle id="emitter_LI_30000" depart="30.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_20_10"/>
-    <vehicle id="emitter_LI_36000" depart="36.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a3_b1"/>
-    <vehicle id="emitter_LI_42000" depart="42.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_51_61"/>
-    <vehicle id="emitter_LI_48000" depart="48.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a3_b1"/>
-    <vehicle id="emitter_LI_54000" depart="54.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a3_b1"/>
+    <vehicle id="LI.0" depart="0.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a3_b1"/>
+    <vehicle id="LI.1" depart="6.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a3_b1"/>
+    <vehicle id="LI.2" depart="12.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_20_10"/>
+    <vehicle id="LI.3" depart="18.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a4_a5"/>
+    <vehicle id="LI.4" depart="24.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a3_b1"/>
+    <vehicle id="LI.5" depart="30.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_20_10"/>
+    <vehicle id="LI.6" depart="36.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a3_b1"/>
+    <vehicle id="LI.7" depart="42.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_51_61"/>
+    <vehicle id="LI.8" depart="48.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a3_b1"/>
+    <vehicle id="LI.9" depart="54.00" departLane="0" departPos="100.00" departSpeed="27.78" route="11_21_to_a3_b1"/>
     <routeDistribution id="RI">
         <route refId="60_50_to_51_61" probability="0.42"/>
         <route refId="60_50_to_20_10" probability="0.42"/>
         <route refId="60_50_to_a4_a5" probability="0.17"/>
         <route refId="60_50_to_a3_b1" probability="1.00"/>
     </routeDistribution>
-    <vehicle id="emitter_RI_0" depart="0.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_51_61"/>
-    <vehicle id="emitter_RI_6000" depart="6.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_a3_b1"/>
-    <vehicle id="emitter_RI_12000" depart="12.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_a4_a5"/>
-    <vehicle id="emitter_RI_18000" depart="18.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_a4_a5"/>
-    <vehicle id="emitter_RI_24000" depart="24.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_a3_b1"/>
-    <vehicle id="emitter_RI_30000" depart="30.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_20_10"/>
-    <vehicle id="emitter_RI_36000" depart="36.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_51_61"/>
-    <vehicle id="emitter_RI_42000" depart="42.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_a3_b1"/>
-    <vehicle id="emitter_RI_48000" depart="48.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_20_10"/>
-    <vehicle id="emitter_RI_54000" depart="54.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_a3_b1"/>
+    <vehicle id="RI.0" depart="0.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_51_61"/>
+    <vehicle id="RI.1" depart="6.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_a3_b1"/>
+    <vehicle id="RI.2" depart="12.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_a4_a5"/>
+    <vehicle id="RI.3" depart="18.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_a4_a5"/>
+    <vehicle id="RI.4" depart="24.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_a3_b1"/>
+    <vehicle id="RI.5" depart="30.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_20_10"/>
+    <vehicle id="RI.6" depart="36.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_51_61"/>
+    <vehicle id="RI.7" depart="42.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_a3_b1"/>
+    <vehicle id="RI.8" depart="48.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_20_10"/>
+    <vehicle id="RI.9" depart="54.00" departLane="0" departPos="100.00" departSpeed="27.78" route="60_50_to_a3_b1"/>
     <routeDistribution id="BI">
         <route refId="a5_a4_to_a3_b1" probability="1.00"/>
         <route refId="a5_a4_to_20_10" probability="0.42"/>
         <route refId="a5_a4_to_51_61" probability="0.42"/>
         <route refId="a5_a4_to_a4_a5" probability="0.17"/>
     </routeDistribution>
-    <vehicle id="emitter_BI_0" depart="0.00" departLane="0" departPos="50.00" departSpeed="27.78" route="a5_a4_to_a3_b1"/>
-    <vehicle id="emitter_BI_15000" depart="15.00" departLane="0" departPos="50.00" departSpeed="27.78" route="a5_a4_to_20_10"/>
-    <vehicle id="emitter_BI_30000" depart="30.00" departLane="0" departPos="50.00" departSpeed="27.78" route="a5_a4_to_a3_b1"/>
-    <vehicle id="emitter_BI_45000" depart="45.00" departLane="0" departPos="50.00" departSpeed="27.78" route="a5_a4_to_20_10"/>
+    <vehicle id="BI.0" depart="0.00" departLane="0" departPos="50.00" departSpeed="27.78" route="a5_a4_to_a3_b1"/>
+    <vehicle id="BI.1" depart="15.00" departLane="0" departPos="50.00" departSpeed="27.78" route="a5_a4_to_20_10"/>
+    <vehicle id="BI.2" depart="30.00" departLane="0" departPos="50.00" departSpeed="27.78" route="a5_a4_to_a3_b1"/>
+    <vehicle id="BI.3" depart="45.00" departLane="0" departPos="50.00" departSpeed="27.78" route="a5_a4_to_20_10"/>
 </additional>
diff --git a/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_equal/emitters.dfrouter b/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_equal/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Wed Jul 27 17:11:34 2016 by SUMO dfrouter Version dev-SVN-r21246
+<!-- generated on Wed Mar 27 10:37:16 2019 by Eclipse SUMO dfrouter Version v1_0_1+0645-93703db
 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"/>
         <routes-output value="routes.rou.xml"/>
         <emitters-output value="emitters.add.xml"/>
     </output>
@@ -42,34 +43,34 @@ SPDX-License-Identifier: EPL-2.0
         <route refId="beg_to_end_1" probability="0.33"/>
         <route refId="beg_to_end_2" probability="0.33"/>
     </routeDistribution>
-    <vehicle id="emitter_MQ_beg_0" depart="0.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_2000" depart="2.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_4000" depart="4.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
-    <vehicle id="emitter_MQ_beg_6000" depart="6.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
-    <vehicle id="emitter_MQ_beg_8000" depart="8.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
-    <vehicle id="emitter_MQ_beg_10000" depart="10.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
-    <vehicle id="emitter_MQ_beg_12000" depart="12.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_14000" depart="14.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
-    <vehicle id="emitter_MQ_beg_16000" depart="16.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
-    <vehicle id="emitter_MQ_beg_18000" depart="18.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_20000" depart="20.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
-    <vehicle id="emitter_MQ_beg_22000" depart="22.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_24000" depart="24.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
-    <vehicle id="emitter_MQ_beg_26000" depart="26.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
-    <vehicle id="emitter_MQ_beg_28000" depart="28.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
-    <vehicle id="emitter_MQ_beg_30000" depart="30.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
-    <vehicle id="emitter_MQ_beg_32000" depart="32.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
-    <vehicle id="emitter_MQ_beg_34000" depart="34.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_36000" depart="36.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
-    <vehicle id="emitter_MQ_beg_38000" depart="38.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_40000" depart="40.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
-    <vehicle id="emitter_MQ_beg_42000" depart="42.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
-    <vehicle id="emitter_MQ_beg_44000" depart="44.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
-    <vehicle id="emitter_MQ_beg_46000" depart="46.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
-    <vehicle id="emitter_MQ_beg_48000" depart="48.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_50000" depart="50.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_52000" depart="52.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_54000" depart="54.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
-    <vehicle id="emitter_MQ_beg_56000" depart="56.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
-    <vehicle id="emitter_MQ_beg_58000" depart="58.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
+    <vehicle id="MQ_beg.0" depart="0.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.1" depart="2.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.2" depart="4.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
+    <vehicle id="MQ_beg.3" depart="6.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
+    <vehicle id="MQ_beg.4" depart="8.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
+    <vehicle id="MQ_beg.5" depart="10.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
+    <vehicle id="MQ_beg.6" depart="12.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.7" depart="14.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
+    <vehicle id="MQ_beg.8" depart="16.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
+    <vehicle id="MQ_beg.9" depart="18.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.10" depart="20.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
+    <vehicle id="MQ_beg.11" depart="22.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.12" depart="24.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
+    <vehicle id="MQ_beg.13" depart="26.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
+    <vehicle id="MQ_beg.14" depart="28.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
+    <vehicle id="MQ_beg.15" depart="30.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
+    <vehicle id="MQ_beg.16" depart="32.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
+    <vehicle id="MQ_beg.17" depart="34.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.18" depart="36.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
+    <vehicle id="MQ_beg.19" depart="38.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.20" depart="40.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
+    <vehicle id="MQ_beg.21" depart="42.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
+    <vehicle id="MQ_beg.22" depart="44.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
+    <vehicle id="MQ_beg.23" depart="46.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
+    <vehicle id="MQ_beg.24" depart="48.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.25" depart="50.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.26" depart="52.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.27" depart="54.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
+    <vehicle id="MQ_beg.28" depart="56.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_1"/>
+    <vehicle id="MQ_beg.29" depart="58.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end"/>
 </additional>
diff --git a/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_left/emitters.dfrouter b/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_left/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Wed Jul 27 17:11:34 2016 by SUMO dfrouter Version dev-SVN-r21246
+<!-- generated on Wed Mar 27 10:37:16 2019 by Eclipse SUMO dfrouter Version v1_0_1+0645-93703db
 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"/>
         <routes-output value="routes.rou.xml"/>
         <emitters-output value="emitters.add.xml"/>
     </output>
@@ -42,14 +43,14 @@ SPDX-License-Identifier: EPL-2.0
         <route refId="beg_to_end_1" probability="0.00"/>
         <route refId="beg_to_end_2" probability="1.00"/>
     </routeDistribution>
-    <vehicle id="emitter_MQ_beg_0" depart="0.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_6000" depart="6.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_12000" depart="12.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_18000" depart="18.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_24000" depart="24.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_30000" depart="30.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_36000" depart="36.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_42000" depart="42.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_48000" depart="48.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
-    <vehicle id="emitter_MQ_beg_54000" depart="54.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.0" depart="0.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.1" depart="6.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.2" depart="12.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.3" depart="18.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.4" depart="24.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.5" depart="30.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.6" depart="36.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.7" depart="42.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.8" depart="48.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
+    <vehicle id="MQ_beg.9" depart="54.00" departLane="0" departPos="5.00" departSpeed="27.78" route="beg_to_end_2"/>
 </additional>