referring to schemata in outputs, refs #2, #21

git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15824 afbd958f-9f77-42d5-a016-97a22340ccf4
eclipse-sumo · Mar 5, 2014 · de3a5e6 · de3a5e6
1 parent 2be07f9
commit de3a5e6
Show file tree

Hide file tree

Showing 282 changed files with 961 additions and 641 deletions.
diff --git a/sumo/tests/complex/traci/closingOutput/sumo-gui/tripinfo.complex b/sumo/tests/complex/traci/closingOutput/sumo-gui/tripinfo.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02.05.2013 13:54:12 by SUMO gui Version 0.17.0
+<!-- generated on 05.03.2014 13:04:05 by SUMO gui Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/sumo-gui.exeConfiguration.xsd">
@@ -13,6 +13,7 @@
     <output>
         <netstate-dump value="state.xml"/>
         <tripinfo-output value="tripinfo.xml"/>
+        <save-state.prefix value="state"/>
     </output>
 
     <time>
@@ -25,6 +26,10 @@
         <no-step-log value="true"/>
     </report>
 
+    <emissions>
+        <phemlight-path value="./PHEMlight/"/>
+    </emissions>
+
     <traci_server>
         <remote-port value="8813"/>
     </traci_server>
@@ -37,5 +42,5 @@
 </configuration>
 -->
 
-<tripinfos>
+<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/tripinfo_file.xsd">
 </tripinfos>
diff --git a/sumo/tests/complex/traci/closingOutput/sumo/tripinfo.complex b/sumo/tests/complex/traci/closingOutput/sumo/tripinfo.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 05/02/13 13:54:01 by SUMO sumo Version 0.17.0
+<!-- generated on 03/05/14 13:03:54 by SUMO sumo Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/sumoConfiguration.xsd">
@@ -13,6 +13,7 @@
     <output>
         <netstate-dump value="state.xml"/>
         <tripinfo-output value="tripinfo.xml"/>
+        <save-state.prefix value="state"/>
     </output>
 
     <time>
@@ -25,12 +26,16 @@
         <no-step-log value="true"/>
     </report>
 
+    <emissions>
+        <phemlight-path value="./PHEMlight/"/>
+    </emissions>
+
     <traci_server>
         <remote-port value="8813"/>
     </traci_server>
 
 </configuration>
 -->
 
-<tripinfos>
+<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/tripinfo_file.xsd">
 </tripinfos>
diff --git a/sumo/tests/complex/tutorial/traci_tls/plain/tripinfo.complex b/sumo/tests/complex/tutorial/traci_tls/plain/tripinfo.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Thu Dec 12 07:45:08 2013 by SUMO sumo Version dev-SVN-r15319
+<!-- generated on 03/05/14 13:05:24 by SUMO sumo Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/sumoConfiguration.xsd">
@@ -25,14 +25,18 @@
         <no-step-log value="true"/>
     </report>
 
+    <emissions>
+        <phemlight-path value="data/./PHEMlight/"/>
+    </emissions>
+
     <traci_server>
         <remote-port value="8813"/>
     </traci_server>
 
 </configuration>
 -->
 
-<tripinfos>
+<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/tripinfo_file.xsd">
     <tripinfo id="left_0" depart="0.00" departLane="52o_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="92.00" arrivalLane="51i_0" arrivalPos="10.00" arrivalSpeed="11.75" duration="92.00" routeLength="1005.40" waitSteps="0" rerouteNo="0" devices="tripinfo_left_0" vType="typeWE" vaporized=""/>
     <tripinfo id="right_2" depart="3.00" departLane="51o_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="94.00" arrivalLane="52i_0" arrivalPos="10.00" arrivalSpeed="11.45" duration="91.00" routeLength="1005.40" waitSteps="0" rerouteNo="0" devices="tripinfo_right_2" vType="typeWE" vaporized=""/>
     <tripinfo id="left_1" depart="4.00" departLane="52o_0" departPos="5.10" departSpeed="0.00" departDelay="2.00" arrival="95.00" arrivalLane="51i_0" arrivalPos="10.00" arrivalSpeed="11.45" duration="91.00" routeLength="1005.40" waitSteps="1" rerouteNo="0" devices="tripinfo_left_1" vType="typeWE" vaporized=""/>

diff --git a/sumo/tests/dfrouter/bugs/2149069_internal_edges/emitters.dfrouter b/sumo/tests/dfrouter/bugs/2149069_internal_edges/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 06/10/13 09:46:16 by SUMO dfrouter Version dev-SVN-r14133
+<!-- generated on 03/05/14 13:06:33 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -23,12 +23,13 @@
 
     <report>
         <verbose value="true"/>
+        <xml-validation value="never"/>
     </report>
 
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="LI">
         <route refId="11_21_to_20_10" probability="0.42"/>
         <route refId="11_21_to_51_61" probability="0.42"/>

diff --git a/sumo/tests/dfrouter/emitters/messstrecke/emitters.dfrouter b/sumo/tests/dfrouter/emitters/messstrecke/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 05/02/13 14:00:45 by SUMO dfrouter Version 0.17.0
+<!-- generated on 03/05/14 13:05:33 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -15,10 +15,14 @@
         <emitters-output value="emitters.add.xml"/>
     </output>
 
+    <report>
+        <xml-validation value="never"/>
+    </report>
+
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="MQ11Fs1">
         <route refId="ErnstRuska2O_to_HavestadtN" probability="1.00"/>
         <route refId="ErnstRuska2O_to_VolmerN" probability="1.00"/>

diff --git a/sumo/tests/dfrouter/emitters/tri/emitters.dfrouter b/sumo/tests/dfrouter/emitters/tri/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 05/02/13 14:00:45 by SUMO dfrouter Version 0.17.0
+<!-- generated on 03/05/14 13:05:33 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -19,10 +19,14 @@
         <keep-longer-routes value="true"/>
     </processing>
 
+    <report>
+        <xml-validation value="never"/>
+    </report>
+
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="MQ_beg">
         <route refId="beg_to_end" probability="1.00"/>
         <route refId="beg_to_end_1" probability="1.00"/>

diff --git a/sumo/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_equal/emitters.dfrouter b/sumo/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 06/10/13 09:45:37 by SUMO dfrouter Version dev-SVN-r14133
+<!-- generated on 03/05/14 13:05:35 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -25,10 +25,14 @@
         <end value="60"/>
     </time>
 
+    <report>
+        <xml-validation value="never"/>
+    </report>
+
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="MQ_beg">
         <route refId="beg_to_end" probability="0.33"/>
         <route refId="beg_to_end_1" probability="0.33"/>

diff --git a/sumo/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_left/emitters.dfrouter b/sumo/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 Mon Mar  3 14:00:11 2014 by SUMO dfrouter Version dev-SVN-r15793
+<!-- generated on 03/05/14 13:05:35 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -32,7 +32,7 @@
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="MQ_beg">
         <route refId="beg_to_end" probability="0.00"/>
         <route refId="beg_to_end_1" probability="0.00"/>

diff --git a/sumo/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_more_left/emitters.dfrouter b/sumo/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_more_left/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Mon Mar  3 14:00:12 2014 by SUMO dfrouter Version dev-SVN-r15793
+<!-- generated on 03/05/14 13:05:37 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -32,7 +32,7 @@
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="MQ_beg">
         <route refId="beg_to_end" probability="0.25"/>
         <route refId="beg_to_end_1" probability="0.25"/>

diff --git a/sumo/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_more_right/emitters.dfrouter b/sumo/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_more_right/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Mon Mar  3 14:00:11 2014 by SUMO dfrouter Version dev-SVN-r15793
+<!-- generated on 03/05/14 13:05:36 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -32,7 +32,7 @@
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="MQ_beg">
         <route refId="beg_to_end" probability="0.25"/>
         <route refId="beg_to_end_1" probability="0.50"/>

diff --git a/...ests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_more_straight/emitters.dfrouter b/...ests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_more_straight/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 06/10/13 09:45:37 by SUMO dfrouter Version dev-SVN-r14133
+<!-- generated on 03/05/14 13:05:36 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -25,10 +25,14 @@
         <end value="60"/>
     </time>
 
+    <report>
+        <xml-validation value="never"/>
+    </report>
+
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="MQ_beg">
         <route refId="beg_to_end" probability="0.50"/>
         <route refId="beg_to_end_1" probability="0.25"/>

diff --git a/sumo/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_right/emitters.dfrouter b/sumo/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_right/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Mon Mar  3 14:00:11 2014 by SUMO dfrouter Version dev-SVN-r15793
+<!-- generated on 03/05/14 13:05:34 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -32,7 +32,7 @@
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="MQ_beg">
         <route refId="beg_to_end" probability="0.00"/>
         <route refId="beg_to_end_1" probability="1.00"/>

diff --git a/sumo/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_straight/emitters.dfrouter b/sumo/tests/dfrouter/emitters/tri_completely_defined/tri_cd_1min_straight/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 06/10/13 09:45:35 by SUMO dfrouter Version dev-SVN-r14133
+<!-- generated on 03/05/14 13:05:34 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -25,10 +25,14 @@
         <end value="60"/>
     </time>
 
+    <report>
+        <xml-validation value="never"/>
+    </report>
+
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="MQ_beg">
         <route refId="beg_to_end" probability="1.00"/>
         <route refId="beg_to_end_1" probability="0.00"/>

diff --git a/sumo/tests/dfrouter/emitters/tri_last_only/tri_cd_1min_equal/emitters.dfrouter b/sumo/tests/dfrouter/emitters/tri_last_only/tri_cd_1min_equal/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 06/10/13 09:45:41 by SUMO dfrouter Version dev-SVN-r14133
+<!-- generated on 03/05/14 13:05:42 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -25,10 +25,14 @@
         <end value="60"/>
     </time>
 
+    <report>
+        <xml-validation value="never"/>
+    </report>
+
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="MQ_beg">
         <route refId="beg_to_end" probability="0.33"/>
         <route refId="beg_to_end_1" probability="0.33"/>

diff --git a/sumo/tests/dfrouter/emitters/tri_last_only/tri_cd_1min_left/emitters.dfrouter b/sumo/tests/dfrouter/emitters/tri_last_only/tri_cd_1min_left/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Mon Mar  3 14:00:13 2014 by SUMO dfrouter Version dev-SVN-r15793
+<!-- generated on 03/05/14 13:05:42 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -32,7 +32,7 @@
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="MQ_beg">
         <route refId="beg_to_end" probability="0.00"/>
         <route refId="beg_to_end_1" probability="0.00"/>

diff --git a/sumo/tests/dfrouter/emitters/tri_last_only/tri_cd_1min_more_left/emitters.dfrouter b/sumo/tests/dfrouter/emitters/tri_last_only/tri_cd_1min_more_left/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Mon Mar  3 14:00:14 2014 by SUMO dfrouter Version dev-SVN-r15793
+<!-- generated on 03/05/14 13:05:44 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -32,7 +32,7 @@
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="MQ_beg">
         <route refId="beg_to_end" probability="0.25"/>
         <route refId="beg_to_end_1" probability="0.25"/>

diff --git a/sumo/tests/dfrouter/emitters/tri_last_only/tri_cd_1min_more_right/emitters.dfrouter b/sumo/tests/dfrouter/emitters/tri_last_only/tri_cd_1min_more_right/emitters.dfrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Mon Mar  3 14:00:14 2014 by SUMO dfrouter Version dev-SVN-r15793
+<!-- generated on 03/05/14 13:05:43 by SUMO dfrouter Version dev-SVN-r15814
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/dfrouterConfiguration.xsd">
@@ -32,7 +32,7 @@
 </configuration>
 -->
 
-<additional>
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/additional_file.xsd">
     <routeDistribution id="MQ_beg">
         <route refId="beg_to_end" probability="0.25"/>
         <route refId="beg_to_end_1" probability="0.50"/>