[JuPedSim] Corrected a bug when multiple vanishing areas are present.

eclipse-sumo · Mar 1, 2024 · 16a9a14 · 16a9a14
1 parent abb5b85
commit 16a9a14
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/microsim/transportables/MSPModel_JuPedSim.cpp b/src/microsim/transportables/MSPModel_JuPedSim.cpp
@@ -362,12 +362,12 @@ MSPModel_JuPedSim::execute(SUMOTime time) {
     }
 
     // Remove pedestrians that are in a predefined area, at a predefined rate.
-    for (const AreaData& area : myAreas) {
+    for (AreaData& area : myAreas) {
         const std::vector<JPS_Point>& areaBoundary = area.areaBoundary;
         JPS_AgentIdIterator agentsInArea = JPS_Simulation_AgentsInPolygon(myJPSSimulation, areaBoundary.data(), areaBoundary.size());
         if (area.areaType == "vanishing_area") {
             const SUMOTime period = area.params.count("period") > 0 ? string2time(area.params.at("period")) : 1000;
-            if (time - myLastRemovalTime >= period) {
+            if (time - area.lastRemovalTime >= period) {
                 const JPS_AgentId agentID = JPS_AgentIdIterator_Next(agentsInArea);
                 if (agentID != 0) {
                     auto lambda = [agentID](const PState * const p) {
@@ -385,7 +385,7 @@ MSPModel_JuPedSim::execute(SUMOTime time) {
                             registerArrived();
                             JPS_Simulation_MarkAgentForRemoval(myJPSSimulation, agentID, nullptr);
                             myPedestrianStates.erase(iterator);
-                            myLastRemovalTime = time;
+                            area.lastRemovalTime = time;
                         }
                     }
                 }

diff --git a/src/microsim/transportables/MSPModel_JuPedSim.h b/src/microsim/transportables/MSPModel_JuPedSim.h
@@ -185,13 +185,13 @@ class MSPModel_JuPedSim : public MSPModel {
         const std::string areaType;
         const std::vector<JPS_Point> areaBoundary;
         const Parameterised::Map params;
+
+        /// @brief The last time a pedestrian was removed in a vanishing area.
+        SUMOTime lastRemovalTime = 0;
     };
 
     /// @brief Array of special areas.
     std::vector<AreaData> myAreas;
-
-    /// @brief The last time a pedestrian was removed in a vanishing area.
-    SUMOTime myLastRemovalTime = 0;
 
     /// @brief Array of stopped trains, used to detect whether to add carriages and ramps to the geometry.
     std::vector<SUMOTrafficObject::NumericalID> myAllStoppedTrainIDs;