Skip to content

Commit

Permalink
adapting to new scipy
Browse files Browse the repository at this point in the history
  • Loading branch information
@behrisch
behrisch committed Oct 13, 2024
1 parent 85f2a55 commit 9c3302f
Show file tree
Hide file tree
Showing 15 changed files with 442 additions and 445 deletions.
42 changes: 23 additions & 19 deletions tests/tools/turndefs/routeSampler/min_count_optimize/output.tools
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
Running HiGHS 1.2.0 [date: 2021-07-09, git hash: n/a]
Copyright (c) 2022 ERGO-Code under MIT licence terms
Presolving model
107 rows, 192 cols, 799 nonzeros
107 rows, 192 cols, 799 nonzeros
Presolve : Reductions: rows 107(-31); columns 192(-31); elements 799(-58)
Solving the presolved LP
Using EKK dual simplex solver - serial
Iteration Objective Infeasibilities num(sum)
0 0.0000000000e+00 Ph1: 0(0) 0s
94 2.3000000000e+01 Pr: 0(0) 0s
Solving the original LP from the solution after postsolve
Model status : Optimal
Simplex iterations: 94
Objective value : 2.3000000000e+01
HiGHS run time : 0.00
Loaded 98 routes (98 distinct)
input route edge count: count 98, min 2.00 (7), max 16.00 (39), mean 8.66, Q1 6.00, median 9.00, Q3 11.00
histogram: [(2, 2), (3, 3), (4, 8), (5, 6), (6, 10), (7, 8), (8, 12), (9, 10), (10, 12), (11, 7), (12, 3), (13, 7), (14, 4), (15, 4), (16, 2)]
input route detector count: count 98, min 1.00 (7), max 15.00 (39), mean 7.66, Q1 5.00, median 8.00, Q3 10.00
histogram: [(1, 2), (2, 3), (3, 8), (4, 6), (5, 10), (6, 8), (7, 12), (8, 10), (9, 12), (10, 7), (11, 3), (12, 7), (13, 4), (14, 4), (15, 2)]
Ignored 13 routes which pass fewer than 4 counting location
Starting optimization for interval [0.0, 99.0] (mismatch 751)
Primal Feasibility Dual Feasibility Duality Gap Step Path Parameter Objective
1.0 1.0 1.0 - 1.0 139.0
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.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 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)
Wrote 88 routes (70 distinct) achieving total count 728 (96.94%) at 138 locations. GEH<5 for 95.65%
result route edge count: count 88, min 5.00 (0), max 16.00 (41), mean 9.27, Q1 7.00, median 9.00, Q3 11.00
histogram: [(5, 8), (6, 10), (7, 8), (8, 14), (9, 11), (10, 11), (11, 6), (12, 3), (13, 7), (14, 5), (15, 4), (16, 1)]
result route detector count: count 88, min 4.00 (0), max 15.00 (41), mean 8.27, Q1 6.00, median 8.00, Q3 10.00
histogram: [(4, 8), (5, 10), (6, 8), (7, 14), (8, 11), (9, 11), (10, 6), (11, 3), (12, 7), (13, 5), (14, 4), (15, 1)]
GEH: count 138, min 0.00 ([-58.121.42 64] 36 36), max 12.06 ([-123.121.42 131] 72 0), mean 0.74, 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)
225 changes: 111 additions & 114 deletions tests/tools/turndefs/routeSampler/min_count_optimize/routes.tools
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/tools/turndefs/routeSampler/optimize_2/output.tools
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Optimization succeeded
Wrote 98 routes (98 distinct) achieving total count 751 (100.00%) at 138 locations. GEH<5 for 100.00%
Wrote 98 routes (96 distinct) achieving total count 751 (100.00%) at 138 locations. GEH<5 for 100.00%
6 changes: 3 additions & 3 deletions tests/tools/turndefs/routeSampler/optimize_2/routes.tools
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 2023-09-16 07:34:08.549013 by routeSampler.py v1_18_0+1600-ddd21fefb94
<!-- generated on 2024-10-13 19:14:21.745485 by routeSampler.py v1_21_0+0025-85f2a55a1cc
<configuration>
<route-files value="input_routes.rou.xml"/>
<turn-files value="input_turns.xml"/>
Expand Down Expand Up @@ -182,10 +182,10 @@
<route edges="-75 -75.121.42 -60 -60.80.00 -31 -31.80.00 -23 -23.80.00 -11 -11.80.00 3 3.180.00 -71"/>
</vehicle>
<vehicle id="57" depart="56.76">
<route edges="120 120.180.00 -109 -109.80.00 -11 -11.80.00 3 3.180.00 27 27.80.00 43 68 -45"/>
<route edges="120 120.180.00 -109 -109.80.00 -11 -11.80.00 3 3.180.00 -71 -55 -55.80.00"/>
</vehicle>
<vehicle id="58" depart="57.31">
<route edges="109 109.80.00 -109 -109.80.00 -11 -11.80.00 3 3.180.00 -71 -55 -55.80.00"/>
<route edges="109 109.80.00 -109 -109.80.00 -11 -11.80.00 3 3.180.00 27 27.80.00 43 68 -45"/>
</vehicle>
<vehicle id="59" depart="60.54">
<route edges="-3.180.00 3 3.180.00 -3"/>
Expand Down
14 changes: 7 additions & 7 deletions tests/tools/turndefs/routeSampler/optimize_few_detectors/routes.tools
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 2023-09-16 07:34:08.526175 by routeSampler.py v1_18_0+1600-ddd21fefb94
<!-- generated on 2024-10-13 19:14:21.815634 by routeSampler.py v1_21_0+0025-85f2a55a1cc
<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"/> <!-- 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 -->
<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"/> <!-- 64 -->
<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"/> <!-- 57 -->
<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"/> <!-- 79 -->

<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"/>
<flow id="10" begin="0.88" end="99.00" number="64" route="10"/>
<flow id="17" begin="0.92" end="99.00" number="79" route="17"/>
<flow id="13" begin="1.00" end="99.00" number="57" route="13"/>
</routes>
2 changes: 1 addition & 1 deletion tests/tools/turndefs/routeSampler/optimize_full/output.tools
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Optimization succeeded
Wrote 98 routes (98 distinct) achieving total count 751 (100.00%) at 138 locations. GEH<5 for 100.00%
Wrote 98 routes (96 distinct) achieving total count 751 (100.00%) at 138 locations. GEH<5 for 100.00%
6 changes: 3 additions & 3 deletions tests/tools/turndefs/routeSampler/optimize_full/routes.tools
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 2023-09-16 07:34:08.448755 by routeSampler.py v1_18_0+1600-ddd21fefb94
<!-- generated on 2024-10-13 19:14:21.688203 by routeSampler.py v1_21_0+0025-85f2a55a1cc
<configuration>
<route-files value="input_routes.rou.xml"/>
<turn-files value="input_turns.xml"/>
Expand Down Expand Up @@ -110,7 +110,7 @@
<route edges="-37.80.00 -23 -23.80.00 109 109.80.00 -109"/>
</vehicle>
<vehicle id="33" depart="36.90">
<route edges="120 120.180.00 -109 -109.80.00 -11 -11.80.00 3 3.180.00 27 27.80.00 43 68 -45"/>
<route edges="120 120.180.00 -109 -109.80.00 -11 -11.80.00 3 3.180.00 -71 -55 -55.80.00"/>
</vehicle>
<vehicle id="34" depart="39.07">
<route edges="-27 -27.80.00 -3 -3.180.00 15 15.180.00 -144 -144.121.42 144 144.121.42"/>
Expand Down Expand Up @@ -170,7 +170,7 @@
<route edges="11.80.00 23 23.80.00 31"/>
</vehicle>
<vehicle id="53" depart="55.27">
<route edges="109 109.80.00 -109 -109.80.00 -11 -11.80.00 3 3.180.00 -71 -55 -55.80.00"/>
<route edges="109 109.80.00 -109 -109.80.00 -11 -11.80.00 3 3.180.00 27 27.80.00 43 68 -45"/>
</vehicle>
<vehicle id="54" depart="56.63">
<route edges="45 -68 -43 -43.80.00 -27 -27.80.00 -3 -3.180.00 11 11.80.00 109 109.80.00 123 123.121.42"/>
Expand Down
6 changes: 3 additions & 3 deletions tests/tools/turndefs/routeSampler/small_input_noSampling_optimize/output.tools
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Optimization succeeded
Wrote 52 routes (29 distinct) achieving total count 431 (57.39%) at 138 locations. GEH<5 for 44.93%
Warning: underflow locations: count 101, min 1.00 (('-58.121.42', '64')), max 14.00 (('23', '23.80.00')), mean 3.21, Q1 1.00, median 2.00, Q3 3.00 (total 324)
Warning: overflow locations: count 4, min -1.00 (('-58.121.42', '-31')), max -1.00 (('-58.121.42', '-31')), mean -1.00, Q1 -1.00, median -1.00, Q3 -1.00 (total -4)
Wrote 51 routes (28 distinct) achieving total count 426 (56.72%) at 138 locations. GEH<5 for 44.93%
Warning: underflow locations: count 101, min 1.00 (('-58.121.42', '64')), max 15.00 (('11', '11.80.00')), mean 3.25, Q1 1.00, median 2.00, Q3 3.00 (total 328)
Warning: overflow locations: count 3, min -1.00 (('-58.121.42', '-31')), max -1.00 (('-58.121.42', '-31')), mean -1.00, Q1 -1.00, median -1.00, Q3 -1.00 (total -3)
Loading

0 comments on commit 9c3302f

Please sign in to comment.