Skip to content

Commit

Permalink
patching expected results refs #21
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Mar 24, 2024
1 parent c1deaaf commit fe8bb80
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 69 deletions.
128 changes: 65 additions & 63 deletions tests/tools/assign/duaIterateMix/simple/dualog.tools
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ Success.
Loading net-file from '000/../input_net.net.xml' ... done (1ms).
Loading additional-files from '000/../edgedata.add.xml' ... done (0ms).
Loading done.
Simulation version v1_15_0+1302-4c29f3e started with time: 0.00.
Simulation ended at time: 4620.00
Simulation version v1_19_0+1503-61bb69e0a41 started with time: 0.00.
Simulation ended at time: 4623.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 1.71s
Real time factor: 2698.6
UPS: 187584.696262
Duration: 0.65s
Real time factor: 7123.27
UPS: 490231.124807
Vehicles:
Inserted: 1000
Running: 0
Waiting: 0
Statistics (avg of 1000):
RouteLength: 1082.30
Speed: 4.69
Duration: 321.14
WaitingTime: 119.42
TimeLoss: 262.26
DepartDelay: 860.48
RouteLength: 1086.01
Speed: 4.82
Duration: 318.16
WaitingTime: 116.58
TimeLoss: 259.02
DepartDelay: 859.16

DijkstraRouter answered 465 queries and explored 5.77 edges on average.
DijkstraRouter answered 467 queries and explored 5.73 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
-------------------------------------------------------------------------------
['/scr1/sumo/bin/duarouter', '-c', '001/iteration_001_input_routes_000.duarcfg']
Expand All @@ -38,29 +38,29 @@ Success.
Success.
-------------------------------------------------------------------------------
['/scr1/sumo/bin/sumo', '-c', '001/iteration_001.sumocfg']
Loading net-file from '001/../input_net.net.xml' ... done (2ms).
Loading net-file from '001/../input_net.net.xml' ... done (1ms).
Loading additional-files from '001/../edgedata.add.xml' ... done (1ms).
Loading done.
Simulation version v1_15_0+1302-4c29f3e started with time: 0.00.
Simulation ended at time: 2911.00
Simulation version v1_19_0+1503-61bb69e0a41 started with time: 0.00.
Simulation ended at time: 2907.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 1.20s
Real time factor: 2429.88
UPS: 235272.954925
Duration: 0.45s
Real time factor: 6488.84
UPS: 628171.875000
Vehicles:
Inserted: 1000
Running: 0
Waiting: 0
Statistics (avg of 1000):
RouteLength: 1179.40
Speed: 5.75
Duration: 281.86
WaitingTime: 89.39
TimeLoss: 207.56
DepartDelay: 158.04
RouteLength: 1179.77
Speed: 5.76
Duration: 281.42
WaitingTime: 88.56
TimeLoss: 207.11
DepartDelay: 156.20

DijkstraRouter answered 548 queries and explored 5.96 edges on average.
DijkstraRouter answered 544 queries and explored 5.98 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
-------------------------------------------------------------------------------
['/scr1/sumo/bin/duarouter', '-c', '002/iteration_002_input_routes_001.duarcfg']
Expand All @@ -70,29 +70,29 @@ Success.
Success.
-------------------------------------------------------------------------------
['/scr1/sumo/bin/sumo', '-c', '002/iteration_002.sumocfg']
Loading net-file from '002/../input_net.net.xml' ... done (2ms).
Loading net-file from '002/../input_net.net.xml' ... done (1ms).
Loading additional-files from '002/../edgedata.add.xml' ... done (1ms).
Loading done.
Simulation version v1_15_0+1302-4c29f3e started with time: 0.00.
Simulation ended at time: 2554.00
Simulation version v1_19_0+1503-61bb69e0a41 started with time: 0.00.
Simulation ended at time: 2597.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 1.13s
Real time factor: 2264.18
UPS: 251759.751773
Duration: 0.44s
Real time factor: 5915.72
UPS: 661974.943052
Vehicles:
Inserted: 1000
Running: 0
Waiting: 0
Statistics (avg of 1000):
RouteLength: 1202.51
Speed: 5.60
Duration: 283.99
WaitingTime: 80.87
TimeLoss: 205.86
DepartDelay: 99.31
RouteLength: 1200.44
Speed: 5.53
Duration: 290.61
WaitingTime: 85.33
TimeLoss: 212.40
DepartDelay: 96.53

DijkstraRouter answered 721 queries and explored 7.56 edges on average.
DijkstraRouter answered 661 queries and explored 6.72 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
-------------------------------------------------------------------------------
['/scr1/sumo/bin/duarouter', '-c', '003/iteration_003_input_routes_002.duarcfg']
Expand All @@ -102,59 +102,61 @@ Success.
Success.
-------------------------------------------------------------------------------
['/scr1/sumo/bin/sumo', '-c', '003/iteration_003.sumocfg']
Loading net-file from '003/../input_net.net.xml' ... done (2ms).
Loading net-file from '003/../input_net.net.xml' ... done (1ms).
Loading additional-files from '003/../edgedata.add.xml' ... done (0ms).
Loading done.
Simulation version v1_15_0+1302-4c29f3e started with time: 0.00.
Simulation ended at time: 2490.00
Simulation version v1_19_0+1503-61bb69e0a41 started with time: 0.00.
Simulation ended at time: 2498.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 1.14s
Real time factor: 2180.39
UPS: 253539.404553
Duration: 0.43s
Real time factor: 5809.3
UPS: 670246.511628
Vehicles:
Inserted: 1000
Running: 0
Waiting: 0
Statistics (avg of 1000):
RouteLength: 1202.26
Speed: 5.51
Duration: 289.54
WaitingTime: 81.04
TimeLoss: 210.39
DepartDelay: 78.65
RouteLength: 1194.08
Speed: 5.42
Duration: 288.21
WaitingTime: 80.22
TimeLoss: 209.60
DepartDelay: 77.49

DijkstraRouter answered 774 queries and explored 7.57 edges on average.
DijkstraRouter answered 659 queries and explored 6.46 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
-------------------------------------------------------------------------------
['/scr1/sumo/bin/duarouter', '-c', '004/iteration_004_input_routes_003.duarcfg']
Success.
-------------------------------------------------------------------------------
['/scr1/sumo/bin/duarouter', '-c', '004/iteration_004_input_routes2_003.duarcfg']
Warning: No interval matches passed time=262.80 in edge 'c'.
Using edge's length / max speed.
Success.
-------------------------------------------------------------------------------
['/scr1/sumo/bin/sumo', '-c', '004/iteration_004.sumocfg']
Loading net-file from '004/../input_net.net.xml' ... done (2ms).
Loading net-file from '004/../input_net.net.xml' ... done (1ms).
Loading additional-files from '004/../edgedata.add.xml' ... done (0ms).
Loading done.
Simulation version v1_15_0+1302-4c29f3e started with time: 0.00.
Simulation ended at time: 2486.00
Simulation version v1_19_0+1503-61bb69e0a41 started with time: 0.00.
Simulation ended at time: 2554.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 1.12s
Real time factor: 2213.71
UPS: 251835.262689
Duration: 0.44s
Real time factor: 5817.77
UPS: 643779.043280
Vehicles:
Inserted: 1000
Running: 0
Waiting: 0
Statistics (avg of 1000):
RouteLength: 1204.79
Speed: 5.65
Duration: 282.81
RouteLength: 1187.50
Speed: 5.60
Duration: 282.62
WaitingTime: 80.38
TimeLoss: 203.80
DepartDelay: 82.85
TimeLoss: 204.58
DepartDelay: 79.81

DijkstraRouter answered 721 queries and explored 7.33 edges on average.
DijkstraRouter answered 616 queries and explored 6.10 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
6 changes: 3 additions & 3 deletions tests/tools/assign/duaIterateMix/simple/xmlstats0.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-06-06 07:38:08 by Eclipse SUMO sumo Version v1_17_0+0729-0f1b512
<!-- generated on 2024-03-24 09:21:13 by Eclipse SUMO sumo Version v1_19_0+1503-61bb69e0a41
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<input>
Expand Down Expand Up @@ -43,13 +43,13 @@
-->

<statistics xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/statistic_file.xsd">
<performance clockBegin="1686029888.24" clockEnd="1686029890.74" clockDuration="2.50" traciDuration="0.00" realTimeFactor="1848.00" vehicleUpdatesPerSecond="128458.00" personUpdatesPerSecond="0.00" begin="0.00" end="4620.00" duration="4620.00"/>
<performance clockBegin="1711268473.82" clockEnd="1711268474.47" clockDuration="0.65" traciDuration="0.00" realTimeFactor="7123.27" vehicleUpdatesPerSecond="490231.12" personUpdatesPerSecond="0.00" begin="0.00" end="4623.00" duration="4623.00"/>
<vehicles loaded="1000" inserted="1000" running="0" waiting="0"/>
<teleports total="0" jam="0" yield="0" wrongLane="0"/>
<safety collisions="0" emergencyStops="0" emergencyBraking="0"/>
<persons loaded="0" running="0" jammed="0"/>
<personTeleports total="0" abortWait="0" wrongDest="0"/>
<vehicleTripStatistics count="1000" routeLength="1082.30" speed="4.69" duration="321.14" waitingTime="119.42" timeLoss="262.26" departDelay="860.48" departDelayWaiting="-1.00" totalTravelTime="321145.00" totalDepartDelay="860476.00"/>
<vehicleTripStatistics count="1000" routeLength="1086.01" speed="4.82" duration="318.16" waitingTime="116.58" timeLoss="259.02" departDelay="859.16" departDelayWaiting="-1.00" totalTravelTime="318160.00" totalDepartDelay="859161.00"/>
<pedestrianStatistics number="0" routeLength="0.00" duration="0.00" timeLoss="0.00"/>
<rideStatistics number="0"/>
<transportStatistics number="0"/>
Expand Down
6 changes: 3 additions & 3 deletions tests/tools/assign/duaIterateMix/simple/xmlstats1.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-06-06 07:38:10 by Eclipse SUMO sumo Version v1_17_0+0729-0f1b512
<!-- generated on 2024-03-24 09:21:14 by Eclipse SUMO sumo Version v1_19_0+1503-61bb69e0a41
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<input>
Expand Down Expand Up @@ -43,13 +43,13 @@
-->

<statistics xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/statistic_file.xsd">
<performance clockBegin="1686029890.97" clockEnd="1686029892.18" clockDuration="1.21" traciDuration="0.00" realTimeFactor="2407.78" vehicleUpdatesPerSecond="233132.34" personUpdatesPerSecond="0.00" begin="0.00" end="2911.00" duration="2911.00"/>
<performance clockBegin="1711268474.60" clockEnd="1711268475.05" clockDuration="0.45" traciDuration="0.00" realTimeFactor="6488.84" vehicleUpdatesPerSecond="628171.88" personUpdatesPerSecond="0.00" begin="0.00" end="2907.00" duration="2907.00"/>
<vehicles loaded="1000" inserted="1000" running="0" waiting="0"/>
<teleports total="0" jam="0" yield="0" wrongLane="0"/>
<safety collisions="0" emergencyStops="0" emergencyBraking="0"/>
<persons loaded="0" running="0" jammed="0"/>
<personTeleports total="0" abortWait="0" wrongDest="0"/>
<vehicleTripStatistics count="1000" routeLength="1179.40" speed="5.75" duration="281.86" waitingTime="89.39" timeLoss="207.56" departDelay="158.04" departDelayWaiting="-1.00" totalTravelTime="281857.00" totalDepartDelay="158042.00"/>
<vehicleTripStatistics count="1000" routeLength="1179.77" speed="5.76" duration="281.42" waitingTime="88.56" timeLoss="207.11" departDelay="156.20" departDelayWaiting="-1.00" totalTravelTime="281421.00" totalDepartDelay="156198.00"/>
<pedestrianStatistics number="0" routeLength="0.00" duration="0.00" timeLoss="0.00"/>
<rideStatistics number="0"/>
<transportStatistics number="0"/>
Expand Down

0 comments on commit fe8bb80

Please sign in to comment.