-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[JuPedSim] Updated a test to take into account multiple vanishing areas.
- Loading branch information
1 parent
16a9a14
commit 25be79a
Showing
8 changed files
with
16,858 additions
and
3,913 deletions.
There are no files selected for viewing
1,128 changes: 1,097 additions & 31 deletions
1,128
tests/sumo/pedestrian_model/jupedsim/vanishing_area/errors.sumo
Large diffs are not rendered by default.
Oops, something went wrong.
19,477 changes: 15,613 additions & 3,864 deletions
19,477
tests/sumo/pedestrian_model/jupedsim/vanishing_area/fcd.sumo
Large diffs are not rendered by default.
Oops, something went wrong.
8 changes: 7 additions & 1 deletion
8
tests/sumo/pedestrian_model/jupedsim/vanishing_area/input_additional.add.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,21 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2024-02-02 16:50:53 by Eclipse SUMO netedit Version v1_19_0+0707-807931593a9 | ||
| <!-- generated on 2024-03-01 11:41:24 by Eclipse SUMO netedit Version v1_19_0+1118-98ab26335df | ||
| --> | ||
|
|
||
| <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd"> | ||
| <!-- Shapes --> | ||
| <poly id="jupedsim.vanishing_area_1" type="jupedsim.vanishing_area" color="green" fill="1" layer="3.00" shape="1712.012992,2043.376863 1710.643636,2048.207646 1723.234102,2051.897299 1724.755608,2046.952403 1712.012992,2043.376863"> | ||
| <param key="period" value="3"/> | ||
| </poly> | ||
| <poly id="jupedsim.vanishing_area_2" type="jupedsim.vanishing_area" color="green" fill="1" layer="3.00" shape="1678.251568,2032.330787 1676.465577,2037.974517 1686.467125,2040.903542 1688.038797,2035.402691 1678.251568,2032.330787"> | ||
| <param key="period" value="5"/> | ||
| </poly> | ||
| <!-- JuPedSim elements --> | ||
| <poly id="jps.walkable_area_0" type="jupedsim.walkable_area" color="179,217,255" fill="1" layer="1.00" shape="1709.216847,2047.782243 1707.204938,2054.823926 1722.042769,2058.879180 1724.086114,2052.026114 1709.216847,2047.782243"/> | ||
| <poly id="jps.walkable_area_1" type="jupedsim.walkable_area" color="179,217,255" fill="1" layer="1.00" shape="1675.450000,2036.770000 1672.790000,2045.510000 1685.150000,2049.510000 1687.720000,2040.380000 1675.450000,2036.770000"/> | ||
| <poly id="jps.obstacle_0" type="jupedsim.obstacle" color="255,204,204" fill="1" layer="2.00" shape="1709.900680,2048.880838 1714.936669,2050.227672 1714.878111,2050.500942 1709.978758,2049.212666 1709.900680,2048.880838"/> | ||
| <poly id="jps.obstacle_1" type="jupedsim.obstacle" color="255,204,204" fill="1" layer="2.00" shape="1715.795519,2051.164600 1716.010232,2050.403346 1723.193347,2052.609030 1722.920076,2053.292207 1715.795519,2051.164600"/> | ||
| <poly id="jps.obstacle_2" type="jupedsim.obstacle" color="255,204,204" fill="1" layer="2.00" shape="1675.569009,2039.725588 1679.891106,2040.982925 1679.969690,2040.432840 1675.804759,2039.254086 1675.569009,2039.725588"/> | ||
| <poly id="jps.obstacle_3" type="jupedsim.obstacle" color="255,204,204" fill="1" layer="2.00" shape="1681.541361,2041.847345 1686.099210,2043.183266 1686.413544,2041.925928 1681.934279,2040.825758 1681.541361,2041.847345"/> | ||
| </additional> |
9 changes: 6 additions & 3 deletions
9
tests/sumo/pedestrian_model/jupedsim/vanishing_area/input_routes.rou.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2024-02-02 16:50:53 by Eclipse SUMO netedit Version v1_19_0+0707-807931593a9 | ||
| <!-- generated on 2024-03-01 11:41:24 by Eclipse SUMO netedit Version v1_19_0+1118-98ab26335df | ||
| --> | ||
|
|
||
| <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"> | ||
| <!-- Vehicles, persons and containers (sorted by depart) --> | ||
| <personFlow id="pf_0" begin="0.00" end="3600.00" personsPerHour="3000"> | ||
| <walk edges="533 E0 E1"/> | ||
| <personFlow id="pf_0" begin="0.00" departPos="0.08" end="3600.00" personsPerHour="3000"> | ||
| <walk edges="533 E2 E3"/> | ||
| </personFlow> | ||
| <personFlow id="pf_1" begin="0.00" end="3600.00" personsPerHour="3000"> | ||
| <walk edges="1391 E0 E1"/> | ||
| </personFlow> | ||
| <personFlow id="pf_2" begin="0.00" end="3600.00" personsPerHour="3000"> | ||
| <walk edges="1464 E0 E1"/> | ||
| </personFlow> | ||
| <personFlow id="pf_3" begin="0.00" end="3600.00" personsPerHour="3000"> | ||
| <walk edges="1464 E2 E3"/> | ||
| </personFlow> | ||
| </routes> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
tests/sumo/pedestrian_model/jupedsim/vanishing_area/options.sumo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| --net-file net.net.xml --route-files input_routes.rou.xml --additional-files input_additional.add.xml --no-step-log --tripinfo-output tripinfos.xml --fcd-output fcd.xml -e 60 --verbose | ||
| --net-file net.net.xml --route-files input_routes.rou.xml --additional-files input_additional.add.xml --no-step-log --tripinfo-output tripinfos.xml --fcd-output fcd.xml -e 100 --verbose |
31 changes: 23 additions & 8 deletions
31
tests/sumo/pedestrian_model/jupedsim/vanishing_area/output.sumo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,37 @@ | ||
| Loading net-file from 'net.net.xml' ... done (3ms). | ||
| Loading net-file from 'net.net.xml' ... done (11ms). | ||
| Loading additional-files from 'input_additional.add.xml' ... done (1ms). | ||
| Loading done. | ||
| Generating initial JuPedSim geometry for pedestrian network ... | ||
| done. | ||
| Simulation version v1_19_0+0807-084171f160e started with time: 0.00. | ||
| Simulation version v1_19_0+1118-98ab26335df started with time: 0.00. | ||
| Person 'pf_2.0' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation. | ||
| Simulation ended at time: 60.00 | ||
| 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. | ||
| Person 'pf_2.2' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation. | ||
| Person 'pf_3.3' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation. | ||
| Person 'pf_3.5' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation. | ||
| Person 'pf_3.7' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation. | ||
| Person 'pf_3.6' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation. | ||
| Person 'pf_3.9' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation. | ||
| Person 'pf_3.10' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation. | ||
| Person 'pf_3.16' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation. | ||
| Person 'pf_3.14' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation. | ||
| Person 'pf_3.1' in vanishing area 'jupedsim.vanishing_area_2' was removed from the simulation. | ||
| Person 'pf_3.17' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation. | ||
| Person 'pf_3.19' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation. | ||
| Person 'pf_3.2' in vanishing area 'jupedsim.vanishing_area_2' was removed from the simulation. | ||
| Simulation ended at time: 100.00 | ||
| Reason: The final simulation step has been reached. | ||
| Performance: | ||
| Duration: 1.29s | ||
| Real time factor: 46.5116 | ||
| Duration: 8.20s | ||
| Real time factor: 12.1996 | ||
| UPS: 0.000000 | ||
| UPS-Persons: 3510.852713 | ||
| UPS-Persons: 1976.088813 | ||
| Vehicles: | ||
| Inserted: 0 | ||
| Running: 0 | ||
| Waiting: 0 | ||
| Persons: | ||
| Inserted: 9000 | ||
| Running: 149 | ||
| Inserted: 12000 | ||
| Running: 299 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters