Skip to content

Commit

Permalink
adapting tests #21 fix #13830
Browse files Browse the repository at this point in the history
  • Loading branch information
@behrisch
behrisch committed Sep 16, 2023
1 parent ad55227 commit a64ee02
Show file tree
Hide file tree
Showing 20 changed files with 1,315 additions and 1,306 deletions.
6 changes: 3 additions & 3 deletions tests/tools/turndefs/routeSampler/intervals/optimize_verbose/routes.tools
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-06-29 15:04:03.298663 by routeSampler.py v1_17_0+1318-85f891f765f
<!-- generated on 2023-09-16 07:34:07.093887 by routeSampler.py v1_18_0+1600-ddd21fefb94
<configuration>
<route-files value="input_routes.rou.xml"/>
<edgedata-files value="input_edgedata.xml"/>
Expand All @@ -16,9 +16,9 @@
<!-- begin="0.0" end="300.0" -->
<route id="0_2" edges="-3 -3.180.00 5"/> <!-- 10 (route_0) -->

<flow id="0_2" begin="4.68" end="300.00" number="10" route="0_2"/>
<flow id="0_2" begin="4.29" end="300.00" number="10" route="0_2"/>
<!-- begin="300.0" end="600.0" -->
<route id="300_0" edges="-3 -3.180.00 11"/> <!-- 8 (route_2) -->

<flow id="300_0" begin="302.12" end="600.00" number="8" route="300_0"/>
<flow id="300_0" begin="322.94" end="600.00" number="8" route="300_0"/>
</routes>
21 changes: 11 additions & 10 deletions tests/tools/turndefs/routeSampler/min_count_optimize/output.tools
View file
Expand Up @@ -10,17 +10,18 @@ Primal Feasibility Dual Feasibility Duality Gap Step Pat
0.2530364874168 0.2530364874168 0.2530364874168 0.7557774493876 0.2530364874168 48.14587142316
0.0789831936971 0.0789831936971 0.0789831936971 0.7017129866465 0.0789831936971 32.10400223723
0.02016485547474 0.02016485547474 0.02016485547474 0.7530111173195 0.02016485547474 25.71737848317
0.002368302573093 0.002368302573095 0.002368302573095 0.8954710687492 0.002368302573096 23.32298291189
8.541601996942e-06 8.54160197789e-06 8.541601977878e-06 0.9966151190339 8.541601977924e-06 23.00106253171
4.271955643889e-10 4.271955736582e-10 4.271956718719e-10 0.9999499864781 4.271955097241e-10 23.00000005314
0.002368302573094 0.002368302573095 0.002368302573095 0.8954710687492 0.002368302573095 23.32298291189
8.541601974607e-06 8.541601985382e-06 8.54160198558e-06 0.9966151190307 8.541601985852e-06 23.00106253171
4.271971523193e-10 4.271978344538e-10 4.271977133567e-10 0.9999499862171 4.271979385405e-10 23.00000005314
Optimization terminated successfully.
Current function value: 23.000000
Iterations: 6
Optimization succeeded
Wrote 88 routes (74 distinct) achieving total count 728 (96.94%) at 138 locations. GEH<5 for 95.65%
result route edge count: count 88, min 5.00 (32), max 16.00 (68), mean 9.27, Q1 7.00, median 9.00, Q3 11.00
histogram: [(5, 8), (6, 10), (7, 8), (8, 14), (9, 11), (10, 12), (11, 6), (12, 2), (13, 7), (14, 4), (15, 4), (16, 2)]
result route detector count: count 88, min 4.00 (32), max 15.00 (68), mean 8.27, Q1 6.00, median 8.00, Q3 10.00
histogram: [(4, 8), (5, 10), (6, 8), (7, 14), (8, 11), (9, 12), (10, 6), (11, 2), (12, 7), (13, 4), (14, 4), (15, 2)]
GEH: count 138, min 0.00 ([-58.121.42 64] 36 36), max 12.06 ([-123.121.42 131] 72 0), mean 0.71, Q1 0.00, median 0.00, Q3 0.00
Warning: underflow locations: count 22, min 1.00 (('-152.80.00', '-131')), max 2.00 (('-123.121.42', '131')), mean 1.05, Q1 1.00, median 1.00, Q3 1.00 (total 23)
Wrote 89 routes (74 distinct) achieving total count 741 (98.67%) at 138 locations. GEH<5 for 95.65%
result route edge count: count 89, min 5.00 (0), max 16.00 (41), mean 9.33, Q1 7.00, median 9.00, Q3 11.00
histogram: [(5, 8), (6, 10), (7, 8), (8, 14), (9, 11), (10, 12), (11, 6), (12, 2), (13, 7), (14, 5), (15, 4), (16, 2)]
result route detector count: count 89, min 4.00 (0), max 15.00 (41), mean 8.33, Q1 6.00, median 8.00, Q3 10.00
histogram: [(4, 8), (5, 10), (6, 8), (7, 14), (8, 11), (9, 12), (10, 6), (11, 2), (12, 7), (13, 5), (14, 4), (15, 2)]
GEH: count 138, min 0.00 ([-58.121.42 64] 36 36), max 12.06 ([-123.121.42 131] 72 0), mean 0.76, Q1 0.00, median 0.00, Q3 0.00
Warning: underflow locations: count 18, min 1.00 (('-152.80.00', '-131')), max 2.00 (('-123.121.42', '131')), mean 1.06, Q1 1.00, median 1.00, Q3 1.00 (total 19)
Warning: overflow locations: count 9, min -1.00 (('-55.80.00', '-27')), max -1.00 (('-55.80.00', '-27')), mean -1.00, Q1 -1.00, median -1.00, Q3 -1.00 (total -9)
347 changes: 175 additions & 172 deletions tests/tools/turndefs/routeSampler/min_count_optimize/routes.tools
View file

Large diffs are not rendered by default.

392 changes: 196 additions & 196 deletions tests/tools/turndefs/routeSampler/optimize_1/routes.tools
View file

Large diffs are not rendered by default.

388 changes: 194 additions & 194 deletions tests/tools/turndefs/routeSampler/optimize_2/routes.tools
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions tests/tools/turndefs/routeSampler/optimize_few_detectors/output.tools
View file
@@ -1,3 +1,2 @@
Optimization succeeded
Wrote 201 routes (3 distinct) achieving total count 402 (100.50%) at 2 locations. GEH<5 for 100.00%
Warning: overflow locations: count 2, min -1.00 (('-3.180.00', '11')), max -1.00 (('-3.180.00', '11')), mean -1.00, Q1 -1.00, median -1.00, Q3 -1.00 (total -2)
Wrote 200 routes (3 distinct) achieving total count 400 (100.00%) at 2 locations. GEH<5 for 100.00%
10 changes: 5 additions & 5 deletions tests/tools/turndefs/routeSampler/optimize_few_detectors/routes.tools
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-06-29 15:04:11.381182 by routeSampler.py v1_17_0+1318-85f891f765f
<!-- generated on 2023-09-16 07:34:08.526175 by routeSampler.py v1_18_0+1600-ddd21fefb94
<configuration>
<route-files value="input_routes2.rou.xml"/>
<turn-files value="input_turns.xml"/>
Expand All @@ -12,11 +12,11 @@

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<!-- begin="0.0" end="99.0" -->
<route id="10" edges="-27.80.00 -3 -3.180.00 11 11.80.00 23 23.80.00 31 31.80.00 60 60.80.00 75 75.121.42"/> <!-- 69 -->
<route id="10" edges="-27.80.00 -3 -3.180.00 11 11.80.00 23 23.80.00 31 31.80.00 60 60.80.00 75 75.121.42"/> <!-- 68 -->
<route id="13" edges="-43 -43.80.00 -27 -27.80.00 -3 -3.180.00 11 11.80.00 23 23.80.00 31 31.80.00 60 60.80.00 -60 -60.80.00"/> <!-- 55 -->
<route id="17" edges="-68 -43 -43.80.00 -27 -27.80.00 -3 -3.180.00 11 11.80.00 23 23.80.00 31 31.80.00 60"/> <!-- 77 -->

<flow id="13" begin="0.21" end="99.00" number="55" route="13"/>
<flow id="10" begin="0.40" end="99.00" number="69" route="10"/>
<flow id="17" begin="0.90" end="99.00" number="77" route="17"/>
<flow id="10" begin="0.83" end="99.00" number="68" route="10"/>
<flow id="17" begin="0.94" end="99.00" number="77" route="17"/>
<flow id="13" begin="1.04" end="99.00" number="55" route="13"/>
</routes>

0 comments on commit a64ee02

Please sign in to comment.