update tests ref #21 #14295

Signed-off-by: m-kro <m.barthauer@t-online.de>
eclipse-sumo · Feb 5, 2024 · 9edb474 · 9edb474
1 parent e3cddff
commit 9edb474
Show file tree

Hide file tree

Showing 119 changed files with 610 additions and 552 deletions.
diff --git a/tests/netconvert/bugs/ticket10777/net.netconvert b/tests/netconvert/bugs/ticket10777/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-06-15 14:12:58 by Eclipse SUMO netconvert Version v1_17_0+0949-cba0d01c7a8
+<!-- generated on 2024-02-05 10:33:03 by Eclipse SUMO netconvert Version v1_14_1+11463-7dae0f08724
 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
@@ -400,7 +400,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         </lane>
     </edge>
     <edge id="561742170" from="5414385984" to="5416200780" priority="1" type="highway.footway" spreadType="center" shape="83.64,307.00 81.19,286.28 76.10,243.75 63.30,186.46 45.05,128.85 26.21,90.03 0.00,29.11">
-        <lane id="561742170_0" index="0" allow="pedestrian" speed="2.78" length="292.30" width="2.00" shape="83.64,307.00 81.19,286.28 76.10,243.75 63.30,186.46 45.05,128.85 26.21,90.03 -0.00,29.11">
+        <lane id="561742170_0" index="0" allow="pedestrian" speed="2.78" length="292.30" width="2.00" shape="83.64,307.00 81.19,286.28 76.10,243.75 63.30,186.46 45.05,128.85 26.21,90.03 0.00,29.11">
             <param key="origId" value="561742170"/>
         </lane>
     </edge>
@@ -469,11 +469,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="cluster_28114806_286726503_2952513732_2952513733_#2more" type="actuated" programID="0" offset="0">
         <phase duration="24" state="rrrrGGGGGgg" minDur="5" maxDur="50"/>
-        <phase duration="3"  state="rrrryyyyygg"/>
+        <phase duration="3"  state="rrrryGGGGgg"/>
         <phase duration="6"  state="rrrrrGGGGGG" minDur="5" maxDur="50"/>
-        <phase duration="3"  state="rrrrryyyyyy"/>
+        <phase duration="3"  state="rrrrrGGGGyy"/>
         <phase duration="24" state="GrrGGGGGGrr" minDur="5" maxDur="50"/>
-        <phase duration="3"  state="yrryyyyyyrr"/>
+        <phase duration="3"  state="yrrGyyyyyrr"/>
         <phase duration="24" state="rGGGrrrrrrr" minDur="5" maxDur="50"/>
         <phase duration="3"  state="ryyyrrrrrrr"/>
     </tlLogic>

diff --git a/tests/netconvert/bugs/ticket10826/net.netconvert b/tests/netconvert/bugs/ticket10826/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-05-09 15:52:52 by Eclipse SUMO netconvert Version v1_17_0+0192-02ed9c7dd44
+<!-- generated on 2024-02-05 10:33:03 by Eclipse SUMO netconvert Version v1_14_1+11463-7dae0f08724
 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
@@ -603,14 +603,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="3"  state="rrrrrrrrryyrrrrrrrryrr"/>
         <phase duration="1"  state="rrrrrrrrrrrrrrrrrrrrrr"/>
         <phase duration="15" state="GrrrGrGrrrrGGrrgGrrrGg"/>
-        <phase duration="3"  state="yrrryryrrrryyrryyrrryy"/>
+        <phase duration="3"  state="GrrryryrrrryGrrgyrrryy"/>
         <phase duration="15" state="GGggrrrrrrrrGGGgrrrrrr"/>
-        <phase duration="3"  state="yyggrrrrrrrryyyyrrrrrr"/>
+        <phase duration="3"  state="GGggrrrrrrrryyyyrrrrrr"/>
         <phase duration="6"  state="GGGGrrrrrrrrrrrrrrrrrr"/>
         <phase duration="3"  state="yyyyrrrrrrrrrrrrrrrrrr"/>
         <phase duration="1"  state="rrrrrrrrrrrrrrrrrrrrrr"/>
         <phase duration="15" state="GrrrGgGrrrrGGrrgGrrrGg"/>
-        <phase duration="3"  state="yrrryyyrrrryyrryyrrryy"/>
+        <phase duration="3"  state="yrrryyGrrrryyrryGrrryy"/>
     </tlLogic>
 
     <junction id="1582161926" type="dead_end" x="222.40" y="0.00" incLanes="" intLanes="" shape="216.04,-0.67 228.77,0.67"/>
@@ -712,7 +712,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <request index="1" response="000" foes="000" cont="0"/>
         <request index="2" response="000" foes="000" cont="0"/>
     </junction>
-    <junction id="3993282689" type="priority" x="0.00" y="63.27" incLanes="-396516546#0_0" intLanes=":3993282689_0_0" shape="0.00,63.27 -1.12,66.27 -0.00,63.27">
+    <junction id="3993282689" type="priority" x="0.00" y="63.27" incLanes="-396516546#0_0" intLanes=":3993282689_0_0" shape="0.00,63.27 -1.12,66.27 0.00,63.27">
         <request index="0" response="0" foes="0" cont="0"/>
     </junction>
     <junction id="51519926" type="dead_end" x="214.99" y="10.71" incLanes="" intLanes="" shape="213.40,10.50 216.58,10.93"/>

diff --git a/tests/netconvert/bugs/ticket13542b/net.netconvert b/tests/netconvert/bugs/ticket13542b/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-07-05 17:30:20 by Eclipse SUMO netconvert Version v1_18_0+0123-749ff98
+<!-- generated on 2024-02-05 10:33:04 by Eclipse SUMO netconvert Version v1_14_1+11463-7dae0f08724
 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
@@ -230,7 +230,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <tlLogic id="cluster_261705708_8243171049_987195315_9945733967" type="actuated" programID="0" offset="0">
         <phase duration="33" state="rrrgGgGGGGrrrr" minDur="5" maxDur="50"/>
         <phase duration="5"  state="rrrgGgGGGrrrrr"/>
-        <phase duration="3"  state="rrryygyyyrrrrr"/>
+        <phase duration="3"  state="rrryygGGGrrrrr"/>
         <phase duration="6"  state="rrrrrGGGGrrrrr" minDur="5" maxDur="50"/>
         <phase duration="3"  state="rrrrryyyyrrrrr"/>
         <phase duration="32" state="ggGrrrrrrrGGGG" minDur="5" maxDur="50"/>

diff --git a/tests/netconvert/bugs/ticket13581/net.netconvert b/tests/netconvert/bugs/ticket13581/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-07-07 10:01:20 by Eclipse SUMO netconvert Version v1_18_0+0181-0f1bc4f
+<!-- generated on 2024-02-05 10:33:04 by Eclipse SUMO netconvert Version v1_14_1+11463-7dae0f08724
 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
@@ -340,9 +340,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="cluster_102091_2314766396_841514178_841519718_#1more" type="static" programID="0" offset="0">
         <phase duration="42" state="rrGGGGgg"/>
-        <phase duration="3"  state="rryyyyyy"/>
+        <phase duration="3"  state="rryyyygg"/>
         <phase duration="42" state="GGrrrrGG"/>
-        <phase duration="3"  state="yyrrrryy"/>
+        <phase duration="3"  state="yyrrrrgg"/>
     </tlLogic>
 
     <junction id="10597779676" type="traffic_light" x="107.05" y="82.62" incLanes="70521361#0_0 70521361#0_1" intLanes=":10597779676_0_0 :10597779676_0_1" shape="104.33,80.93 109.92,84.04 109.78,84.30 104.18,81.20">

diff --git a/tests/netconvert/bugs/ticket1689/net.netconvert b/tests/netconvert/bugs/ticket1689/net.netconvert
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-01-07 16:21:22 by Eclipse SUMO netconvert Version v1_11_0+0928-18c1b433e84
+<!-- generated on 2024-02-05 10:33:00 by Eclipse SUMO netconvert Version v1_14_1+11463-7dae0f08724
 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/netconvertConfiguration.xsd">
 
     <input>
@@ -19,7 +24,6 @@ SPDX-License-Identifier: EPL-2.0
 
     <report>
         <xml-validation value="never"/>
-        <aggregate-warnings value="5"/>
     </report>
 
 </configuration>
@@ -99,9 +103,9 @@ SPDX-License-Identifier: EPL-2.0
 
     <tlLogic id="42727650" type="static" programID="0" offset="0">
         <phase duration="42" state="rrrGGgGgg"/>
-        <phase duration="3"  state="rrryyyyyy"/>
+        <phase duration="3"  state="rrrGyyyyy"/>
         <phase duration="42" state="GGgGrrrrr"/>
-        <phase duration="3"  state="yyyyrrrrr"/>
+        <phase duration="3"  state="yyyGrrrrr"/>
     </tlLogic>
 
     <junction id="42726349" type="priority" x="137.80" y="0.00" incLanes="-7144718_0" intLanes=":42726349_0_0" shape="137.80,0.00 134.81,-1.13 137.80,0.00">
@@ -121,7 +125,7 @@ SPDX-License-Identifier: EPL-2.0
         <request index="7" response="000011000" foes="000011110" cont="1"/>
         <request index="8" response="000010001" foes="000010001" cont="1"/>
     </junction>
-    <junction id="42728382" type="priority" x="0.00" y="80.74" incLanes="7144711_0" intLanes=":42728382_0_0" shape="0.00,80.74 1.78,83.40 0.00,80.74">
+    <junction id="42728382" type="priority" x="0.00" y="80.74" incLanes="7144711_0" intLanes=":42728382_0_0" shape="-0.00,80.74 1.78,83.40 0.00,80.74">
         <request index="0" response="0" foes="0" cont="0"/>
     </junction>
 

diff --git a/tests/netconvert/bugs/ticket2086/net.netconvert b/tests/netconvert/bugs/ticket2086/net.netconvert
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-01-07 16:21:22 by Eclipse SUMO netconvert Version v1_11_0+0928-18c1b433e84
+<!-- generated on 2024-02-05 10:33:00 by Eclipse SUMO netconvert Version v1_14_1+11463-7dae0f08724
 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/netconvertConfiguration.xsd">
 
     <input>
@@ -23,7 +28,6 @@ SPDX-License-Identifier: EPL-2.0
 
     <report>
         <xml-validation value="never"/>
-        <aggregate-warnings value="5"/>
     </report>
 
 </configuration>
@@ -119,11 +123,11 @@ SPDX-License-Identifier: EPL-2.0
 
     <tlLogic id="c2a" type="static" programID="0" offset="0">
         <phase duration="27" state="rrGGGGGgGGgrrGGG"/>
-        <phase duration="3"  state="rryyyyyyyyyrryyy"/>
+        <phase duration="3"  state="rrGyyyyyGGgrryyy"/>
         <phase duration="27" state="GGGrrrrrGGGrrrrr"/>
         <phase duration="3"  state="yyyrrrrryyyrrrrr"/>
         <phase duration="27" state="rrrrrGGGrrrGGGrr"/>
-        <phase duration="3"  state="rrrrryyyrrryyyrr"/>
+        <phase duration="3"  state="rrrrrGGgrrryyGrr"/>
     </tlLogic>
 
     <junction id="54534761" type="traffic_light" x="203.72" y="91.65" incLanes="-51812270_0 717744589_0 717744589_1 -51811859_0 -51811859_1" intLanes=":54534761_0_0 :54534761_1_0 :54534761_2_0 :54534761_3_0 :54534761_3_1 :54534761_5_0 :54534761_5_1 :54534761_8_0" shape="212.60,98.05 214.66,91.99 212.71,90.86 212.16,90.09 211.90,89.18 211.93,88.13 212.24,86.94 200.21,82.57 195.33,96.32 207.42,100.51 208.58,98.56 209.37,98.01 210.30,97.74 211.38,97.75">

diff --git a/tests/netconvert/bugs/ticket2094/net.netconvert b/tests/netconvert/bugs/ticket2094/net.netconvert
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-01-07 16:21:22 by Eclipse SUMO netconvert Version v1_11_0+0928-18c1b433e84
+<!-- generated on 2024-02-05 10:33:00 by Eclipse SUMO netconvert Version v1_14_1+11463-7dae0f08724
 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/netconvertConfiguration.xsd">
 
     <input>
@@ -21,7 +26,6 @@ SPDX-License-Identifier: EPL-2.0
 
     <report>
         <xml-validation value="never"/>
-        <aggregate-warnings value="5"/>
         <ignore-errors.edge-type value="true"/>
     </report>
 
@@ -92,9 +96,9 @@ SPDX-License-Identifier: EPL-2.0
 
     <tlLogic id="cluster_294152029_560899595_593898177" type="static" programID="0" offset="0">
         <phase duration="42" state="GGrrrGGGG"/>
-        <phase duration="3"  state="yyrrryyyy"/>
+        <phase duration="3"  state="yyrrrGyyy"/>
         <phase duration="42" state="rrGGgGrrr"/>
-        <phase duration="3"  state="rryyyyrrr"/>
+        <phase duration="3"  state="rryyyGrrr"/>
     </tlLogic>
 
     <junction id="1656195449" type="dead_end" x="0.00" y="33.92" incLanes="" intLanes="" shape="-2.46,35.96 2.46,31.88"/>

diff --git a/tests/netconvert/bugs/ticket9810/net.netconvert b/tests/netconvert/bugs/ticket9810/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-11-19 16:52:55 by Eclipse SUMO netconvert Version v1_15_0+0444-dbd4d39ef68
+<!-- generated on 2024-02-05 10:33:02 by Eclipse SUMO netconvert Version v1_14_1+11463-7dae0f08724
 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
@@ -503,46 +503,25 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </edge>
 
     <tlLogic id="gneJ55" type="static" programID="0" offset="0">
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
+        <phase duration="90" state="GG"/>
     </tlLogic>
     <tlLogic id="sz1" type="static" programID="0" offset="0">
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
+        <phase duration="90" state="GG"/>
     </tlLogic>
     <tlLogic id="sz135" type="static" programID="0" offset="0">
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
+        <phase duration="90" state="GG"/>
     </tlLogic>
     <tlLogic id="sz14" type="static" programID="0" offset="0">
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
+        <phase duration="90" state="GG"/>
     </tlLogic>
     <tlLogic id="sz3" type="static" programID="0" offset="0">
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
+        <phase duration="90" state="GG"/>
     </tlLogic>
     <tlLogic id="sz5" type="static" programID="0" offset="0">
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
+        <phase duration="90" state="GG"/>
     </tlLogic>
     <tlLogic id="szJ25" type="static" programID="0" offset="0">
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
+        <phase duration="90" state="GG"/>
     </tlLogic>
 
     <junction id="gneJ0" type="priority" x="631.28" y="139.33" incLanes="-gneE4_0 gneE58_0 gneE3_0" intLanes=":gneJ0_0_0 :gneJ0_6_0 :gneJ0_2_0 :gneJ0_3_0 :gneJ0_4_0 :gneJ0_7_0" shape="631.89,141.01 633.30,140.51 631.99,136.58 629.13,137.48 629.32,138.58 629.30,139.11 629.21,139.64 629.03,140.16 628.78,140.67 630.08,141.42 630.81,140.45 631.13,140.27 631.42,140.31 631.67,140.56">

diff --git a/tests/netconvert/examples/messstrecke/net.netconvert b/tests/netconvert/examples/messstrecke/net.netconvert
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-01-07 16:20:38 by Eclipse SUMO netconvert Version v1_11_0+0928-18c1b433e84
+<!-- generated on 2024-02-05 10:31:37 by Eclipse SUMO netconvert Version v1_14_1+11463-7dae0f08724
 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/netconvertConfiguration.xsd">
 
     <input>
@@ -25,7 +30,6 @@ SPDX-License-Identifier: EPL-2.0
 
     <report>
         <xml-validation value="never"/>
-        <aggregate-warnings value="5"/>
     </report>
 
 </configuration>
@@ -333,11 +337,11 @@ SPDX-License-Identifier: EPL-2.0
 
     <tlLogic id="ErnstRuskaAltglienicker" type="static" programID="0" offset="0">
         <phase duration="36" state="GGgrrGGG"/>
-        <phase duration="4"  state="yygrryyy"/>
+        <phase duration="4"  state="GGgrryyy"/>
         <phase duration="6"  state="GGGrrrrr"/>
         <phase duration="4"  state="yyyrrrrr"/>
         <phase duration="36" state="rrrGGGrr"/>
-        <phase duration="4"  state="rrryyyrr"/>
+        <phase duration="4"  state="rrryyGrr"/>
     </tlLogic>
 
     <junction id="AltglienickerBreit" type="priority" x="1908.47" y="180.00" incLanes="AltglienickerBreitS_0 AltglienickerN_0" intLanes=":AltglienickerBreit_0_0 :AltglienickerBreit_1_0 :AltglienickerBreit_1_1" shape="1905.27,184.00 1914.87,184.00 1914.04,180.97 1912.50,179.03 1911.91,177.79 1911.67,176.00 1905.27,176.00">