From 76f13ee7d93b79ee9e0aafe5982c1b031519621f Mon Sep 17 00:00:00 2001 From: Tobias Kohl Date: Tue, 17 Dec 2024 16:41:37 +0100 Subject: [PATCH] replace expected result for routing with changed SpeedyALT --- .../withEvents/cut_change_events.xml | 652 +++++++++++++++++- .../withEvents/cut_network.xml | 34 +- .../withEvents/cut_population.xml | 260 +++---- .../withoutEvents/cut_network.xml | 34 +- .../withoutEvents/cut_population.xml | 260 +++---- 5 files changed, 950 insertions(+), 290 deletions(-) diff --git a/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withEvents/cut_change_events.xml b/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withEvents/cut_change_events.xml index 7f5645d4767..e2d9f794088 100644 --- a/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withEvents/cut_change_events.xml +++ b/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withEvents/cut_change_events.xml @@ -14162,125 +14162,605 @@ - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -14881,6 +15361,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withEvents/cut_network.xml b/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withEvents/cut_network.xml index 4c70637cf82..7e1de671b3c 100644 --- a/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withEvents/cut_network.xml +++ b/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withEvents/cut_network.xml @@ -369,9 +369,33 @@ 1 - + - 127 + 122 + 1 + + + + + 123 + 1 + + + + + 124 + 1 + + + + + 125 + 1 + + + + + 126 1 @@ -411,6 +435,12 @@ 1 + + + 133 + 1 + + 134 diff --git a/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withEvents/cut_population.xml b/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withEvents/cut_population.xml index b8cdc8c384b..cf8f852d7b4 100644 --- a/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withEvents/cut_population.xml +++ b/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withEvents/cut_population.xml @@ -1083,81 +1083,6 @@ - - - - - 81 - - - - - - - - - - - - - - - - - - - - - - - - - 37 - - - - - - - - - - - - - - - - - - - - - - - - - 73 - - - - - - - - - - - - - - - - - - - - @@ -1183,31 +1108,6 @@ - - - - - 8 - - - - - - - - - - - - - - - - - - - - @@ -1260,24 +1160,24 @@ - + - 88 + 35 - + - + - + - + @@ -2260,24 +2160,24 @@ - + - 30 + 37 - + - + - + - + @@ -2285,20 +2185,20 @@ - + - 37 + 38 - + - + @@ -2310,20 +2210,20 @@ - + - 38 + 60 - + - + @@ -2358,6 +2258,31 @@ + + + + + 17 + + + + + + + + + + + + + + + + + + + + @@ -2385,24 +2310,24 @@ - + - 35 + 79 - + - + - + - + @@ -2410,20 +2335,20 @@ - + - 12 + 41 - + - + @@ -2433,6 +2358,31 @@ + + + + + 35 + + + + + + + + + + + + + + + + + + + + @@ -2558,6 +2508,56 @@ + + + + + 21 + + + + + + + + + + + + + + + + + + + + + + + + + 52 + + + + + + + + + + + + + + + + + + + + diff --git a/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withoutEvents/cut_network.xml b/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withoutEvents/cut_network.xml index b5c2b9a3cbc..b223b64805a 100644 --- a/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withoutEvents/cut_network.xml +++ b/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withoutEvents/cut_network.xml @@ -369,9 +369,33 @@ 1 - + - 127 + 122 + 1 + + + + + 123 + 1 + + + + + 124 + 1 + + + + + 125 + 1 + + + + + 126 1 @@ -411,6 +435,12 @@ 1 + + + 133 + 1 + + 134 diff --git a/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withoutEvents/cut_population.xml b/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withoutEvents/cut_population.xml index b8cdc8c384b..cf8f852d7b4 100644 --- a/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withoutEvents/cut_population.xml +++ b/contribs/application/test/input/org/matsim/application/prepare/scenario/CreateScenarioCutOutTest/withoutEvents/cut_population.xml @@ -1083,81 +1083,6 @@ - - - - - 81 - - - - - - - - - - - - - - - - - - - - - - - - - 37 - - - - - - - - - - - - - - - - - - - - - - - - - 73 - - - - - - - - - - - - - - - - - - - - @@ -1183,31 +1108,6 @@ - - - - - 8 - - - - - - - - - - - - - - - - - - - - @@ -1260,24 +1160,24 @@ - + - 88 + 35 - + - + - + - + @@ -2260,24 +2160,24 @@ - + - 30 + 37 - + - + - + - + @@ -2285,20 +2185,20 @@ - + - 37 + 38 - + - + @@ -2310,20 +2210,20 @@ - + - 38 + 60 - + - + @@ -2358,6 +2258,31 @@ + + + + + 17 + + + + + + + + + + + + + + + + + + + + @@ -2385,24 +2310,24 @@ - + - 35 + 79 - + - + - + - + @@ -2410,20 +2335,20 @@ - + - 12 + 41 - + - + @@ -2433,6 +2358,31 @@ + + + + + 35 + + + + + + + + + + + + + + + + + + + + @@ -2558,6 +2508,56 @@ + + + + + 21 + + + + + + + + + + + + + + + + + + + + + + + + + 52 + + + + + + + + + + + + + + + + + + + +