Skip to content

Commit

Permalink
patching expected netbuild results after [15320] refs #21
Browse files Browse the repository at this point in the history 
git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15321 afbd958f-9f77-42d5-a016-97a22340ccf4
  • Loading branch information
@namdre
namdre committed Dec 12, 2013
1 parent 9976a65 commit 0cdad96
Show file tree
Hide file tree
Showing 177 changed files with 6,823 additions and 6,821 deletions.
6 changes: 3 additions & 3 deletions sumo/tests/netconvert/bugs/2171355/net.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Fri Oct 25 08:21:13 2013 by SUMO netconvert Version dev-SVN-r14913
<!-- generated on Thu Dec 12 07:35:14 2013 by SUMO netconvert Version dev-SVN-r15319
<?xml version="1.0" encoding="UTF-8"?>
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/netconvertConfiguration.xsd">
Expand Down Expand Up @@ -233,7 +233,7 @@
<connection from=":0_1" to="3o" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":0_1" to="3o" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":0_1" to="3o" fromLane="2" toLane="2" dir="s" state="M"/>
<connection from=":0_4" to="2o" fromLane="0" toLane="2" via=":0_16_0" dir="s" state="M"/>
<connection from=":0_4" to="2o" fromLane="0" toLane="2" via=":0_16_0" dir="s" state="m"/>
<connection from=":0_16" to="2o" fromLane="0" toLane="2" dir="s" state="M"/>
<connection from=":0_5" to="4o" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":0_6" to="1o" fromLane="0" toLane="1" dir="s" state="M"/>
Expand All @@ -242,7 +242,7 @@
<connection from=":0_9" to="4o" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":0_9" to="4o" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":0_9" to="4o" fromLane="2" toLane="2" dir="s" state="M"/>
<connection from=":0_12" to="1o" fromLane="0" toLane="2" via=":0_17_0" dir="s" state="M"/>
<connection from=":0_12" to="1o" fromLane="0" toLane="2" via=":0_17_0" dir="s" state="m"/>
<connection from=":0_17" to="1o" fromLane="0" toLane="2" dir="s" state="M"/>
<connection from=":0_13" to="3o" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":0_14" to="2o" fromLane="0" toLane="1" dir="s" state="M"/>
Expand Down
10 changes: 5 additions & 5 deletions sumo/tests/netconvert/bugs/ticket19_falseFoe/net.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 12/18/12 09:23:45 by SUMO netconvert Version dev-SVN-r13169
<!-- generated on Thu Dec 12 07:35:15 2013 by SUMO netconvert Version dev-SVN-r15319
<?xml version="1.0" encoding="UTF-8"?>
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/netconvertConfiguration.xsd">
Expand Down Expand Up @@ -128,16 +128,16 @@
<connection from="1841" to="-1841" fromLane="0" toLane="0" via=":6365_7_0" tl="6365" linkIndex="7" dir="t" state="o"/>

<connection from=":6365_0" to="-1841" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":6365_1" to="1839" fromLane="0" toLane="0" via=":6365_8_0" dir="s" state="M"/>
<connection from=":6365_1" to="1839" fromLane="0" toLane="0" via=":6365_8_0" dir="s" state="m"/>
<connection from=":6365_8" to="1839" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":6365_2" to="-1841" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":6365_3" to="1839" fromLane="0" toLane="0" via=":6365_9_0" dir="s" state="M"/>
<connection from=":6365_3" to="1839" fromLane="0" toLane="0" via=":6365_9_0" dir="s" state="m"/>
<connection from=":6365_9" to="1839" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":6365_4" to="1839" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":6365_5" to="-1841" fromLane="0" toLane="0" via=":6365_10_0" dir="s" state="M"/>
<connection from=":6365_5" to="-1841" fromLane="0" toLane="0" via=":6365_10_0" dir="s" state="m"/>
<connection from=":6365_10" to="-1841" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":6365_6" to="1839" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":6365_7" to="-1841" fromLane="0" toLane="0" via=":6365_11_0" dir="s" state="M"/>
<connection from=":6365_7" to="-1841" fromLane="0" toLane="0" via=":6365_11_0" dir="s" state="m"/>
<connection from=":6365_11" to="-1841" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":6454_0" to="-1839" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":6562_0" to="1841" fromLane="0" toLane="0" dir="s" state="M"/>
Expand Down
4 changes: 2 additions & 2 deletions sumo/tests/netconvert/bugs/ticket252/net.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Tue Nov 12 16:55:02 2013 by SUMO netconvert Version dev-SVN-r15089
<!-- generated on Thu Dec 12 07:35:14 2013 by SUMO netconvert Version dev-SVN-r15319
<?xml version="1.0" encoding="UTF-8"?>
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/netconvertConfiguration.xsd">
Expand Down Expand Up @@ -334,7 +334,7 @@
<connection from=":450601590_1" to="38232899#1" fromLane="2" toLane="2" dir="s" state="M"/>
<connection from=":49613629_0" to="6034273#1" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":49613629_0" to="6034273#1" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":49613629_2" to="6033364#0" fromLane="0" toLane="0" via=":49613629_8_0" dir="s" state="M"/>
<connection from=":49613629_2" to="6033364#0" fromLane="0" toLane="0" via=":49613629_8_0" dir="s" state="m"/>
<connection from=":49613629_8" to="6033364#0" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":49613629_3" to="-6034273#0" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":49613629_4" to="6034273#1" fromLane="0" toLane="1" dir="s" state="M"/>
Expand Down
6 changes: 3 additions & 3 deletions sumo/tests/netconvert/bugs/ticket267/net.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Tue Nov 12 16:55:02 2013 by SUMO netconvert Version dev-SVN-r15089
<!-- generated on Thu Dec 12 07:35:15 2013 by SUMO netconvert Version dev-SVN-r15319
<?xml version="1.0" encoding="UTF-8"?>
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/netconvertConfiguration.xsd">
Expand Down Expand Up @@ -215,9 +215,9 @@
<connection from=":0_2" to="2o" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":0_3" to="1o" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":0_4" to="2o" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":0_5" to="1o" fromLane="0" toLane="0" via=":0_9_0" dir="s" state="M"/>
<connection from=":0_5" to="1o" fromLane="0" toLane="0" via=":0_9_0" dir="s" state="m"/>
<connection from=":0_9" to="1o" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":0_6" to="3o" fromLane="0" toLane="0" via=":0_10_0" dir="s" state="M"/>
<connection from=":0_6" to="3o" fromLane="0" toLane="0" via=":0_10_0" dir="s" state="m"/>
<connection from=":0_10" to="3o" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":0_7" to="3o" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":0_8" to="2o" fromLane="0" toLane="0" dir="s" state="M"/>
Expand Down
4 changes: 2 additions & 2 deletions sumo/tests/netconvert/bugs/ticket810/net.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 12/18/12 09:23:46 by SUMO netconvert Version dev-SVN-r13169
<!-- generated on Thu Dec 12 07:35:15 2013 by SUMO netconvert Version dev-SVN-r15319
<?xml version="1.0" encoding="UTF-8"?>
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/netconvertConfiguration.xsd">
Expand Down Expand Up @@ -129,7 +129,7 @@
<connection from=":gneJ1_2" to="s_out" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":gneJ1_3" to="e_out" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":gneJ1_4" to="n_out" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":gneJ1_5" to="w_out" fromLane="0" toLane="0" via=":gneJ1_12_0" dir="s" state="M"/>
<connection from=":gneJ1_5" to="w_out" fromLane="0" toLane="0" via=":gneJ1_12_0" dir="s" state="m"/>
<connection from=":gneJ1_12" to="w_out" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":gneJ1_6" to="s_out" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":gneJ1_7" to="e_out" fromLane="0" toLane="0" dir="s" state="M"/>
Expand Down
22 changes: 11 additions & 11 deletions sumo/tests/netconvert/bugs/ticket854/net.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Tue Nov 12 16:55:03 2013 by SUMO netconvert Version dev-SVN-r15089
<!-- generated on Thu Dec 12 07:35:15 2013 by SUMO netconvert Version dev-SVN-r15319
<?xml version="1.0" encoding="UTF-8"?>
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/netconvertConfiguration.xsd">
Expand Down Expand Up @@ -284,38 +284,38 @@
<connection from=":54541538_0" to="-51806386" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541546_0" to="51806362" fromLane="0" toLane="1" dir="s" state="M"/>
<connection from=":54541549_0" to="51806386" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541549_1" to="-51806348" fromLane="0" toLane="1" via=":54541549_5_0" dir="s" state="M"/>
<connection from=":54541549_1" to="-51806348" fromLane="0" toLane="1" via=":54541549_5_0" dir="s" state="m"/>
<connection from=":54541549_5" to="-51806348" fromLane="0" toLane="1" dir="s" state="M"/>
<connection from=":54541549_2" to="-51806348" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541549_2" to="-51806348" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":54541549_4" to="51806386" fromLane="0" toLane="0" via=":54541549_6_0" dir="s" state="M"/>
<connection from=":54541549_4" to="51806386" fromLane="0" toLane="0" via=":54541549_6_0" dir="s" state="m"/>
<connection from=":54541549_6" to="51806386" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541554_0" to="51806348" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541554_1" to="-51806362" fromLane="0" toLane="0" via=":54541554_9_0" dir="s" state="M"/>
<connection from=":54541554_1" to="-51806362" fromLane="0" toLane="0" via=":54541554_9_0" dir="s" state="m"/>
<connection from=":54541554_9" to="-51806362" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541554_2" to="-51806349" fromLane="0" toLane="0" via=":54541554_10_0" dir="s" state="M"/>
<connection from=":54541554_2" to="-51806349" fromLane="0" toLane="0" via=":54541554_10_0" dir="s" state="m"/>
<connection from=":54541554_10" to="-51806349" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541554_3" to="-51806349" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541554_4" to="51806348" fromLane="0" toLane="0" via=":54541554_11_0" dir="s" state="M"/>
<connection from=":54541554_4" to="51806348" fromLane="0" toLane="0" via=":54541554_11_0" dir="s" state="m"/>
<connection from=":54541554_11" to="51806348" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541554_5" to="-51806362" fromLane="0" toLane="0" via=":54541554_12_0" dir="s" state="M"/>
<connection from=":54541554_5" to="-51806362" fromLane="0" toLane="0" via=":54541554_12_0" dir="s" state="m"/>
<connection from=":54541554_12" to="-51806362" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541554_6" to="-51806362" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541554_7" to="-51806349" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541554_8" to="51806348" fromLane="0" toLane="0" via=":54541554_13_0" dir="s" state="M"/>
<connection from=":54541554_8" to="51806348" fromLane="0" toLane="0" via=":54541554_13_0" dir="s" state="m"/>
<connection from=":54541554_13" to="51806348" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541558_0" to="51806379" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541559_0" to="51806349" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541559_1" to="-51806379" fromLane="0" toLane="0" via=":54541559_9_0" dir="s" state="M"/>
<connection from=":54541559_1" to="-51806379" fromLane="0" toLane="0" via=":54541559_9_0" dir="s" state="m"/>
<connection from=":54541559_9" to="-51806379" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541559_2" to="-51806367" fromLane="0" toLane="0" via=":54541559_10_0" dir="s" state="M"/>
<connection from=":54541559_2" to="-51806367" fromLane="0" toLane="0" via=":54541559_10_0" dir="s" state="m"/>
<connection from=":54541559_10" to="-51806367" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541559_3" to="-51806367" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541559_4" to="51806349" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541559_5" to="-51806379" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541559_6" to="-51806379" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541559_7" to="-51806367" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541559_8" to="51806349" fromLane="0" toLane="0" via=":54541559_11_0" dir="s" state="M"/>
<connection from=":54541559_8" to="51806349" fromLane="0" toLane="0" via=":54541559_11_0" dir="s" state="m"/>
<connection from=":54541559_11" to="51806349" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":54541560_0" to="51806367" fromLane="0" toLane="0" dir="s" state="M"/>

Expand Down
12 changes: 6 additions & 6 deletions sumo/tests/netconvert/examples/messstrecke/net.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Tue Nov 12 16:53:51 2013 by SUMO netconvert Version dev-SVN-r15089
<!-- generated on Thu Dec 12 07:34:25 2013 by SUMO netconvert Version dev-SVN-r15319
<?xml version="1.0" encoding="UTF-8"?>
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/netconvertConfiguration.xsd">
Expand Down Expand Up @@ -511,10 +511,10 @@
<connection from=":EinsteinEnd_1" to="EinsteinSinkN" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":ErnstRuskaAltglienicker_0" to="ErnstRuska4W" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":ErnstRuskaAltglienicker_0" to="ErnstRuska4W" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":ErnstRuskaAltglienicker_2" to="AltglienickerBreitS" fromLane="0" toLane="0" via=":ErnstRuskaAltglienicker_8_0" dir="s" state="M"/>
<connection from=":ErnstRuskaAltglienicker_2" to="AltglienickerBreitS" fromLane="0" toLane="0" via=":ErnstRuskaAltglienicker_8_0" dir="s" state="m"/>
<connection from=":ErnstRuskaAltglienicker_8" to="AltglienickerBreitS" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":ErnstRuskaAltglienicker_3" to="ErnstRuska5O" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":ErnstRuskaAltglienicker_4" to="ErnstRuska4W" fromLane="0" toLane="1" via=":ErnstRuskaAltglienicker_9_0" dir="s" state="M"/>
<connection from=":ErnstRuskaAltglienicker_4" to="ErnstRuska4W" fromLane="0" toLane="1" via=":ErnstRuskaAltglienicker_9_0" dir="s" state="m"/>
<connection from=":ErnstRuskaAltglienicker_9" to="ErnstRuska4W" fromLane="0" toLane="1" dir="s" state="M"/>
<connection from=":ErnstRuskaAltglienicker_5" to="AltglienickerBreitS" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":ErnstRuskaAltglienicker_6" to="ErnstRuska5O" fromLane="0" toLane="0" dir="s" state="M"/>
Expand All @@ -526,7 +526,7 @@
<connection from=":ErnstRuskaEinstein_3" to="ErnstRuska1W" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":ErnstRuskaEinstein_5" to="ErnstRuska2O" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":ErnstRuskaEinstein_5" to="ErnstRuska2O" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":ErnstRuskaEinstein_7" to="EinsteinN" fromLane="0" toLane="0" via=":ErnstRuskaEinstein_8_0" dir="s" state="M"/>
<connection from=":ErnstRuskaEinstein_7" to="EinsteinN" fromLane="0" toLane="0" via=":ErnstRuskaEinstein_8_0" dir="s" state="m"/>
<connection from=":ErnstRuskaEinstein_8" to="EinsteinN" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":ErnstRuskaEnd1_0" to="ErnstRuskaSink1W" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":ErnstRuskaEnd1_0" to="ErnstRuskaSink1W" fromLane="1" toLane="1" dir="s" state="M"/>
Expand All @@ -545,7 +545,7 @@
<connection from=":ErnstRuskaHavestadt_4" to="ErnstRuska231W" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":ErnstRuskaHavestadt_6" to="ErnstRuska232O" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":ErnstRuskaHavestadt_6" to="ErnstRuska232O" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":ErnstRuskaHavestadt_8" to="HavestadtN" fromLane="0" toLane="0" via=":ErnstRuskaHavestadt_9_0" dir="s" state="M"/>
<connection from=":ErnstRuskaHavestadt_8" to="HavestadtN" fromLane="0" toLane="0" via=":ErnstRuskaHavestadt_9_0" dir="s" state="m"/>
<connection from=":ErnstRuskaHavestadt_9" to="HavestadtN" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":ErnstRuskaHavestadtDiv1_0" to="ErnstRuska2W" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":ErnstRuskaHavestadtDiv1_0" to="ErnstRuska2W" fromLane="1" toLane="1" dir="s" state="M"/>
Expand All @@ -563,7 +563,7 @@
<connection from=":ErnstRuskaVolmer_3" to="ErnstRuska3W" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":ErnstRuskaVolmer_5" to="ErnstRuska4O" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":ErnstRuskaVolmer_5" to="ErnstRuska4O" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":ErnstRuskaVolmer_7" to="VolmerN" fromLane="0" toLane="0" via=":ErnstRuskaVolmer_8_0" dir="s" state="M"/>
<connection from=":ErnstRuskaVolmer_7" to="VolmerN" fromLane="0" toLane="0" via=":ErnstRuskaVolmer_8_0" dir="s" state="m"/>
<connection from=":ErnstRuskaVolmer_8" to="VolmerN" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":HavestadtEnd_0" to="HavestadtS" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":HavestadtEnd_0" to="HavestadtS" fromLane="1" toLane="1" dir="s" state="M"/>
Expand Down
Loading

0 comments on commit 0cdad96

Please sign in to comment.