Skip to content

Commit

Permalink
partial revert of a9c9568 due to platform differences. refs #21
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Dec 21, 2024
1 parent ba65e57 commit e0f6c56
Show file tree
Hide file tree
Showing 10 changed files with 65 additions and 65 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Generating initial JuPedSim geometry for pedestrian network ...
done.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation version v1_20_0+0890-9635231af2a started with time: 0.00.
Simulation ended at time: 2000.00.
Reason: The final simulation step has been reached.
Performance:
Duration: 1.02s
Real time factor: 1960.78
UPS: 12986.274510
UPS-Persons: 4882.352941
Duration: 3.31s
Real time factor: 604.412
UPS: 4003.022061
UPS-Persons: 1504.986401
Vehicles:
Inserted: 43
Running: 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Loading net-file from 'net3.net.xml' ... done (2ms).
Loading net-file from 'net3.net.xml' ... done (3ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Generating initial JuPedSim geometry for pedestrian network ...
done.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation version v1_20_0+0890-9635231af2a started with time: 0.00.
Simulation ended at time: 2000.00.
Reason: The final simulation step has been reached.
Performance:
Duration: 0.58s
Real time factor: 3466.2
UPS: 10360.485269
UPS-Persons: 4887.348354
Duration: 1.87s
Real time factor: 1070.66
UPS: 3200.214133
UPS-Persons: 1509.635974
Vehicles:
Inserted: 43
Running: 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Loading net-file from 'net3.net.xml' ... done (1ms).
Loading net-file from 'net3.net.xml' ... done (2ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Generating initial JuPedSim geometry for pedestrian network ...
done.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation version v1_20_0+0890-9635231af2a started with time: 0.00.
Simulation ended at time: 2000.00.
Reason: The final simulation step has been reached.
Performance:
Duration: 0.78s
Real time factor: 2570.69
UPS: 16892.030848
UPS-Persons: 6323.907455
Duration: 2.62s
Real time factor: 764.234
UPS: 5021.780665
UPS-Persons: 1880.015285
Vehicles:
Inserted: 43
Running: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Generating initial JuPedSim geometry for pedestrian network ...
done.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation version v1_20_0+0793-91f7adb8122 started with time: 0.00.
Simulation ended at time: 2000.00.
Reason: The final simulation step has been reached.
Performance:
Duration: 11.87s
Real time factor: 168.506
UPS: 105.063611
UPS-Persons: 2064.116606
Duration: 77.35s
Real time factor: 25.8568
UPS: 16.121734
UPS-Persons: 320.508345
Vehicles:
Inserted: 43
Running: 0
Expand All @@ -27,7 +27,7 @@ Statistics (avg of 43):
DepartDelay: 0.00
Pedestrian Statistics (avg of 60 walks):
RouteLength: 60.27
Duration: 204.16
TimeLoss: 160.76
Duration: 206.59
TimeLoss: 163.19
DijkstraRouter answered 60 queries and explored 15.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Loading net-file from 'net3.net.xml' ... done (2ms).
Loading net-file from 'net3.net.xml' ... done (6ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Generating initial JuPedSim geometry for pedestrian network ...
done.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation version v1_20_0+0890-9635231af2a started with time: 0.00.
Simulation ended at time: 2000.00.
Reason: The final simulation step has been reached.
Performance:
Duration: 1.02s
Real time factor: 1958.86
UPS: 773.751224
UPS-Persons: 3098.922625
Duration: 2.73s
Real time factor: 732.332
UPS: 283.046503
UPS-Persons: 1172.098133
Vehicles:
Inserted: 43
Running: 0
Expand All @@ -20,14 +20,14 @@ Persons:
Running: 0
Statistics (avg of 43):
RouteLength: 194.90
Speed: 11.06
Duration: 18.37
WaitingTime: 2.05
TimeLoss: 3.55
Speed: 11.32
Duration: 17.98
WaitingTime: 1.86
TimeLoss: 3.12
DepartDelay: 0.00
Pedestrian Statistics (avg of 60 walks):
RouteLength: 66.80
Duration: 52.73
TimeLoss: 4.65
Duration: 53.35
TimeLoss: 5.26
DijkstraRouter answered 60 queries and explored 21.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Loading net-file from 'net3.net.xml' ... done (1ms).
Loading net-file from 'net3.net.xml' ... done (4ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Generating initial JuPedSim geometry for pedestrian network ...
done.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation version v1_20_0+0890-9635231af2a started with time: 0.00.
Simulation ended at time: 2000.00.
Reason: The final simulation step has been reached.
Performance:
Duration: 11.55s
Real time factor: 173.16
UPS: 262.251082
UPS-Persons: 2085.108225
Duration: 25.63s
Real time factor: 78.0396
UPS: 124.824411
UPS-Persons: 954.151709
Vehicles:
Inserted: 43
Running: 0
Expand All @@ -20,14 +20,14 @@ Persons:
Running: 0
Statistics (avg of 43):
RouteLength: 194.90
Speed: 10.52
Duration: 35.22
WaitingTime: 18.98
TimeLoss: 20.79
Speed: 10.48
Duration: 37.20
WaitingTime: 20.95
TimeLoss: 22.76
DepartDelay: 0.00
Pedestrian Statistics (avg of 60 walks):
RouteLength: 60.27
Duration: 200.69
TimeLoss: 157.29
Duration: 203.78
TimeLoss: 160.38
DijkstraRouter answered 60 queries and explored 15.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Original file line number Diff line number Diff line change
@@ -1 +1 @@
POLYGON ((762.864081 470.711723, 762.863974 470.712088, 757.503974 489.152088, 757.503779 489.152913, 757.503509 489.153741, 757.502541 489.158149, 757.501641 489.161956, 757.501546 489.162684, 757.501384 489.163422, 757.500837 489.168076, 757.500320 489.172009, 757.500302 489.172631, 757.500227 489.173265, 757.500140 489.178149, 757.500023 489.182145, 757.500060 489.182653, 757.500050 489.183175, 757.500467 489.188281, 757.500754 489.192258, 757.500823 489.192649, 757.500856 489.193054, 757.501833 489.198411, 757.502506 489.202245, 757.502583 489.202518, 757.502635 489.202804, 757.504284 489.208547, 757.505260 489.212004, 757.505322 489.212163, 757.505371 489.212331, 757.508080 489.219137, 757.508988 489.221434, 757.509014 489.221485, 757.509036 489.221539, 757.513595 489.230340, 757.513626 489.230388, 757.513651 489.230437, 757.514981 489.232470, 757.519003 489.238646, 757.519111 489.238781, 757.519203 489.238922, 757.521459 489.241707, 757.525206 489.246377, 757.525408 489.246583, 757.525585 489.246802, 757.528328 489.249561, 757.532144 489.253455, 760.812144 492.283455, 760.819561 492.289669, 760.827544 492.295137, 760.836018 492.299809, 760.844904 492.303639, 760.852920 492.306208, 760.852904 492.306263, 903.580585 533.802682, 909.090200 536.966718, 909.091969 536.967620, 909.093621 536.968595, 909.096257 536.969810, 909.098980 536.971199, 909.100928 536.971963, 909.102762 536.972808, 909.105415 536.973720, 909.108158 536.974795, 909.110275 536.975392, 909.112280 536.976081, 918.236182 539.608357, 893.603149 624.944932, 895.716851 625.555068, 920.376851 540.125068, 920.373937 540.124227, 920.374113 540.123804, 920.377026 540.114207, 921.607026 535.184207, 921.608463 535.177466, 922.518463 530.047466, 922.519351 530.041376, 923.119351 524.801376, 923.119860 524.795296, 923.399860 519.515296, 923.399998 519.509425, 923.369998 514.289425, 923.369789 514.283505, 923.299894 513.209667, 923.299788 513.203498, 923.039788 509.213498, 923.038636 509.203542, 923.038636 509.203540, 923.038636 509.203538, 923.038184 509.201477, 923.036494 509.193753, 923.036491 509.193745, 923.036490 509.193737, 923.035352 509.190258, 923.033382 509.184227, 923.033377 509.184214, 923.033372 509.184201, 923.031705 509.180429, 923.031528 509.180028, 909.304674 370.191887, 907.115326 370.408113, 920.835364 509.327244, 911.380178 510.260484, 911.379393 510.260598, 911.378625 510.260649, 911.375035 510.261236, 911.370880 510.261845, 911.369991 510.262062, 911.369115 510.262205, 911.365673 510.263116, 911.361752 510.264073, 911.360770 510.264413, 911.359798 510.264670, 911.356541 510.265877, 911.352873 510.267148, 911.351815 510.267629, 911.350762 510.268020, 911.347721 510.269494, 911.344321 510.271042, 911.343207 510.271682, 911.342090 510.272224, 911.339289 510.273933, 911.336173 510.275723, 911.335023 510.276536, 911.333863 510.277243, 911.331322 510.279152, 911.328501 510.281147, 911.327338 510.282145, 911.326158 510.283031, 910.076981 511.319170, 767.426132 469.855083, 767.424807 469.853842, 765.373875 468.108578, 714.796065 360.173250, 712.803935 361.106750, 763.366120 469.008730, 762.864081 470.711723), (761.563950 490.221896, 766.868100 471.983934, 909.416062 513.418114, 904.111888 531.666056, 761.563950 490.221896), (921.460303 515.867926, 921.769928 520.682086, 921.680159 524.661825, 921.121633 528.601427, 920.013166 533.284952, 919.371997 535.567511, 910.277816 532.933947, 910.268074 532.931647, 910.258151 532.930333, 910.248147 532.930017, 910.238161 532.930703, 908.043532 533.192371, 913.476028 514.497905, 913.478228 514.488740, 913.479556 514.479409, 913.480000 514.469994, 913.479555 514.460579, 913.478226 514.451247, 913.476024 514.442083, 913.472969 514.433166, 913.469088 514.424577, 913.464416 514.416391, 913.458994 514.408681, 913.452870 514.401516, 913.345591 514.287367, 921.237018 513.510620, 921.460303 515.867926))
POLYGON ((762.863974 470.712088, 757.503974 489.152088, 757.503779 489.152913, 757.503509 489.153741, 757.502541 489.158149, 757.501641 489.161956, 757.501546 489.162684, 757.501384 489.163422, 757.500837 489.168076, 757.50032 489.172009, 757.500302 489.172631, 757.500227 489.173265, 757.50014 489.178149, 757.500023 489.182145, 757.50006 489.182653, 757.50005 489.183175, 757.500467 489.188281, 757.500754 489.192258, 757.500823 489.192649, 757.500856 489.193054, 757.501833 489.198411, 757.502506 489.202245, 757.502583 489.202518, 757.502635 489.202804, 757.504284 489.208547, 757.50526 489.212004, 757.505322 489.212163, 757.505371 489.212331, 757.50808 489.219137, 757.508988 489.221434, 757.509014 489.221485, 757.509036 489.221539, 757.513595 489.23034, 757.513626 489.230388, 757.513651 489.230437, 757.514981 489.23247, 757.519003 489.238646, 757.519111 489.238781, 757.519203 489.238922, 757.521459 489.241707, 757.525206 489.246377, 757.525408 489.246583, 757.525585 489.246802, 757.528328 489.249561, 757.532144 489.253455, 760.812144 492.283455, 760.819561 492.289669, 760.827544 492.295137, 760.836018 492.299809, 760.844904 492.303639, 760.85292 492.306208, 760.852904 492.306263, 903.580585 533.802682, 909.0902 536.966718, 909.091969 536.96762, 909.093621 536.968595, 909.096257 536.96981, 909.09898 536.971199, 909.100928 536.971963, 909.102762 536.972808, 909.105415 536.97372, 909.108158 536.974795, 909.110275 536.975392, 909.11228 536.976081, 918.236182 539.608357, 893.603149 624.944932, 895.716851 625.555068, 920.376851 540.125068, 920.373937 540.124227, 920.374113 540.123804, 920.377026 540.114207, 921.607026 535.184207, 921.608463 535.177466, 922.518463 530.047466, 922.519351 530.041376, 923.119351 524.801376, 923.11986 524.795296, 923.39986 519.515296, 923.399998 519.509425, 923.369998 514.289425, 923.369789 514.283505, 923.299894 513.209667, 923.299788 513.203498, 923.039788 509.213498, 923.038636 509.203542, 923.038636 509.20354, 923.038636 509.203538, 923.038184 509.201477, 923.036494 509.193753, 923.036491 509.193745, 923.03649 509.193737, 923.035352 509.190258, 923.033382 509.184227, 923.033377 509.184214, 923.033372 509.184201, 923.031705 509.180429, 923.031528 509.180028, 909.304674 370.191887, 907.115326 370.408113, 920.835364 509.327244, 911.380178 510.260484, 911.379393 510.260598, 911.378625 510.260649, 911.375035 510.261236, 911.37088 510.261845, 911.369991 510.262062, 911.369115 510.262205, 911.365673 510.263116, 911.361752 510.264073, 911.36077 510.264413, 911.359798 510.26467, 911.356541 510.265877, 911.352873 510.267148, 911.351815 510.267629, 911.350762 510.26802, 911.347721 510.269494, 911.344321 510.271042, 911.343207 510.271682, 911.34209 510.272224, 911.339289 510.273933, 911.336173 510.275723, 911.335023 510.276536, 911.333863 510.277243, 911.331322 510.279152, 911.328501 510.281147, 911.327338 510.282145, 911.326158 510.283031, 910.076981 511.31917, 767.426132 469.855083, 767.424807 469.853842, 765.373875 468.108578, 714.796065 360.17325, 712.803935 361.10675, 763.36612 469.00873, 762.864081 470.711723, 762.863974 470.712088), (766.8681 471.983934, 909.416062 513.418114, 904.111888 531.666056, 761.56395 490.221896, 766.8681 471.983934), (921.769928 520.682086, 921.680159 524.661825, 921.121633 528.601427, 920.013166 533.284952, 919.371997 535.567511, 910.277816 532.933947, 910.268074 532.931647, 910.258151 532.930333, 910.248147 532.930017, 910.238161 532.930703, 908.043532 533.192371, 913.476028 514.497905, 913.478228 514.48874, 913.479556 514.479409, 913.48 514.469994, 913.479555 514.460579, 913.478226 514.451247, 913.476024 514.442083, 913.472969 514.433166, 913.469088 514.424577, 913.464416 514.416391, 913.458994 514.408681, 913.45287 514.401516, 913.345591 514.287367, 921.237018 513.51062, 921.460303 515.867926, 921.769928 520.682086))
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Loading net-file from 'net.net.xml' ... done (2ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading net-file from 'net.net.xml' ... done (3ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading done.
Generating initial JuPedSim geometry for pedestrian network ... done.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation version v1_20_0+0489-544538faa8e started with time: 0.00.
Simulation ended at time: 900.00.
Reason: The final simulation step has been reached.
DijkstraRouter answered 321 queries and explored 8.00 edges on average.
Expand Down
14 changes: 7 additions & 7 deletions tests/sumo/pedestrian_model/jupedsim/larger_net/tripinfos.sumo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-12-20 18:40:22 by Eclipse SUMO sumo Version v1_21_0+1570-8eaf427e473
<!-- generated on 2024-10-14 15:36:05 by Eclipse SUMO sumo Version v1_21_0+0034-0908301ff0a
This data file and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
Expand Down Expand Up @@ -68,11 +68,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<personinfo id="15" depart="15.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="616.00" waitingTime="0.00" timeLoss="13.22" traveltime="616.00">
<walk depart="15.00" departPos="0.00" arrival="631.00" arrivalPos="111.78" duration="616.00" routeLength="837.20" timeLoss="13.22" maxSpeed="1.39"/>
</personinfo>
<personinfo id="7" depart="7.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="749.00" waitingTime="0.00" timeLoss="14.46" traveltime="749.00">
<walk depart="7.00" departPos="0.00" arrival="756.00" arrivalPos="106.30" duration="749.00" routeLength="1020.20" timeLoss="14.46" maxSpeed="1.39"/>
<personinfo id="7" depart="7.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="750.00" waitingTime="0.00" timeLoss="15.46" traveltime="750.00">
<walk depart="7.00" departPos="0.00" arrival="757.00" arrivalPos="106.30" duration="750.00" routeLength="1020.20" timeLoss="15.46" maxSpeed="1.39"/>
</personinfo>
<personinfo id="16" depart="16.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="740.00" waitingTime="0.00" timeLoss="30.45" traveltime="740.00">
<walk depart="16.00" departPos="0.00" arrival="756.00" arrivalPos="118.50" duration="740.00" routeLength="985.49" timeLoss="30.45" maxSpeed="1.39"/>
<personinfo id="16" depart="16.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="749.00" waitingTime="0.00" timeLoss="39.45" traveltime="749.00">
<walk depart="16.00" departPos="0.00" arrival="765.00" arrivalPos="118.50" duration="749.00" routeLength="985.49" timeLoss="39.45" maxSpeed="1.39"/>
</personinfo>
<personinfo id="17" depart="17.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="837.00" waitingTime="0.00" timeLoss="13.63" traveltime="837.00">
<walk depart="17.00" departPos="0.00" arrival="854.00" arrivalPos="107.02" duration="837.00" routeLength="1143.57" timeLoss="13.63" maxSpeed="1.39"/>
Expand All @@ -86,8 +86,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<personinfo id="1" depart="1.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="959.00" waitingTime="0.00" timeLoss="16.29" traveltime="959.00">
<walk depart="1.00" departPos="0.00" arrival="960.00" arrivalPos="46.08" duration="959.00" routeLength="1309.32" timeLoss="16.29" maxSpeed="1.39"/>
</personinfo>
<personinfo id="12" depart="12.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="974.00" waitingTime="0.00" timeLoss="8.26" traveltime="974.00">
<walk depart="12.00" departPos="0.00" arrival="986.00" arrivalPos="86.58" duration="974.00" routeLength="1341.30" timeLoss="8.26" maxSpeed="1.39"/>
<personinfo id="12" depart="12.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="975.00" waitingTime="0.00" timeLoss="9.26" traveltime="975.00">
<walk depart="12.00" departPos="0.00" arrival="987.00" arrivalPos="86.58" duration="975.00" routeLength="1341.30" timeLoss="9.26" maxSpeed="1.39"/>
</personinfo>
<personinfo id="3" depart="3.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="1099.00" waitingTime="0.00" timeLoss="-3.35" traveltime="1099.00">
<walk depart="3.00" departPos="0.00" arrival="1102.00" arrivalPos="70.38" duration="1099.00" routeLength="1531.04" timeLoss="-3.35" maxSpeed="1.39"/>
Expand Down
12 changes: 6 additions & 6 deletions tests/sumo/pedestrian_model/jupedsim/vanishing_area/output.sumo
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading net-file from 'net.net.xml' ... done (3ms).
Loading additional-files from 'input_additional.add.xml' ... done (1ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Generating initial JuPedSim geometry for pedestrian network ...
done.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation version v1_20_0+0821-7931dbe8026 started with time: 0.00.
Person 'pf_2.0' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation.
Person 'pf_3.0' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation.
Person 'pf_2.1' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation.
Expand Down Expand Up @@ -60,10 +60,10 @@ Person 'pf_2.26' in vanishing area 'jupedsim.vanishing_area_1' was removed from
Simulation ended at time: 100.00.
Reason: The final simulation step has been reached.
Performance:
Duration: 9.33s
Real time factor: 10.7204
Duration: 14.90s
Real time factor: 6.71366
UPS: 0.000000
UPS-Persons: 1683.640652
UPS-Persons: 1054.380665
Vehicles:
Inserted: 0
Running: 0
Expand Down

0 comments on commit e0f6c56

Please sign in to comment.