adapting jupedsim tests #21

eclipse-sumo · Feb 14, 2024 · 29afb80 · 29afb80
1 parent b4a731b
commit 29afb80
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/tests/sumo/pedestrian_model/jupedsim/bad_state_bug/errors.sumo b/tests/sumo/pedestrian_model/jupedsim/bad_state_bug/errors.sumo
@@ -1 +1 @@
-Warning: While generating geometry 2 connected components were detected, 99.26% of total pedestrian area is covered by the first.
+Warning: While generating geometry 2 connected components were detected, 99.26% of total pedestrian area is covered by the largest.
diff --git a/tests/sumo/pedestrian_model/jupedsim/geometry_check/errors.sumo b/tests/sumo/pedestrian_model/jupedsim/geometry_check/errors.sumo
@@ -1,6 +1,6 @@
 Warning: Polygon for junction 'J1' has been dilated as it is just a segment.
 Warning: Polygon 'jps.walkable_area_1' will be skipped as it is just a point.
 Warning: Polygon 'jps.walkable_area_2' had some equal consecutive points removed: 300.000000000,0.000000000 300.000000000,10.000000000
-Warning: While generating geometry 2 connected components were detected, 59.15% of total pedestrian area is covered by the first.
+Warning: While generating geometry 2 connected components were detected, 59.15% of total pedestrian area is covered by the largest.
 Warning: Error while adding waypoint for person 'p_0': WayPoint (199.9, -1.6) not inside walkable area
 Warning: The pedestrian model uses infrastructure which is not in the network, timeLoss and routeLength may be invalid.
diff --git a/tests/sumo/pedestrian_model/jupedsim/larger_net/errors.sumo b/tests/sumo/pedestrian_model/jupedsim/larger_net/errors.sumo
@@ -10,4 +10,4 @@ Warning: Polygon on junction '318' has been replaced by its convex hull as it is
 Warning: Polygon on junction '318' has been replaced by its convex hull as it is not simple.
 Warning: Polygon on junction '620' has been replaced by its convex hull as it is not simple.
 Warning: Polygon on junction '620' has been replaced by its convex hull as it is not simple.
-Warning: While generating geometry 2 connected components were detected, 99.98% of total pedestrian area is covered by the first.
+Warning: While generating geometry 2 connected components were detected, 99.98% of total pedestrian area is covered by the largest.
diff --git a/tests/sumo/pedestrian_model/jupedsim/vanishing_area/errors.sumo b/tests/sumo/pedestrian_model/jupedsim/vanishing_area/errors.sumo
@@ -1,4 +1,4 @@
-Warning: While generating geometry 2 connected components were detected, 97.51% of total pedestrian area is covered by the first.
+Warning: While generating geometry 2 connected components were detected, 97.51% of total pedestrian area is covered by the largest.
 Warning: Error while adding person 'pf_0.10' as JuPedSim agent: Model constraint violation: Agent (1596.52, 1889.3) too close to agent (1596.6354138289284, 1889.5504644398566): distance 0.2757766986904751
 Warning: Error while adding person 'pf_1.10' as JuPedSim agent: Model constraint violation: Agent (1790.93, 1898.96) too close to agent (1790.9555326732425, 1899.2345921887609): distance 0.27577669867371
 Warning: Error while adding person 'pf_2.10' as JuPedSim agent: Model constraint violation: Agent (1799.82, 2076.16) too close to agent (1799.547239134107, 2076.023280800467): distance 0.3051075703477827

diff --git a/tests/sumo/pedestrian_model/jupedsim/vanishing_area/output.sumo b/tests/sumo/pedestrian_model/jupedsim/vanishing_area/output.sumo
@@ -1,16 +1,17 @@
-Loading net-file from 'net.net.xml' ... done (11ms).
+Loading net-file from 'net.net.xml' ... done (3ms).
 Loading additional-files from 'input_additional.add.xml' ... done (1ms).
 Loading done.
-Geometry generation for JuPedSim done.
-Simulation version v1_19_0+0707-807931593a9 started with time: 0.00.
+Generating initial JuPedSim geometry for pedestrian network ... 
+done.
+Simulation version v1_19_0+0807-084171f160e 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
 Reason: The final simulation step has been reached.
 Performance: 
- Duration: 3.19s
- Real time factor: 18.8029
+ Duration: 1.29s
+ Real time factor: 46.5116
  UPS: 0.000000
- UPS-Persons: 1419.304293
+ UPS-Persons: 3510.852713
 Vehicles: 
  Inserted: 0
  Running: 0

diff --git a/tests/sumo/pedestrian_model/jupedsim/walking_area/errors.sumo b/tests/sumo/pedestrian_model/jupedsim/walking_area/errors.sumo
@@ -1 +1 @@
-Warning: While generating geometry 2 connected components were detected, 99.26% of total pedestrian area is covered by the first.
+Warning: While generating geometry 2 connected components were detected, 99.26% of total pedestrian area is covered by the largest.