[JuPedSim] Added pedestrian removal in predefined areas, at a predefi…

…ned rate.
eclipse-sumo · Feb 6, 2024 · 95ef08a · 95ef08a
1 parent 4d088d1
commit 95ef08a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 0 deletions.
diff --git a/src/microsim/transportables/MSPModel_JuPedSim.cpp b/src/microsim/transportables/MSPModel_JuPedSim.cpp
@@ -323,6 +323,7 @@ MSPModel_JuPedSim::execute(SUMOTime time) {
             UNUSED_PARAMETER(result);
             assert(result == false); // The person has not arrived yet.
             stage->activateEntryReminders(person);
+            // Adapt speed to lane's speed limit.
             JPS_CollisionFreeSpeedModelState modelState = JPS_Agent_GetCollisionFreeSpeedModelState(agent, nullptr);
             const double newMaxSpeed = MIN2(candidateLane->getSpeedLimit(), person->getMaxSpeed());
             if (newMaxSpeed != JPS_CollisionFreeSpeedModelState_GetV0(modelState)) {
@@ -348,6 +349,32 @@ MSPModel_JuPedSim::execute(SUMOTime time) {
         ++stateIt;
     }
 
+    // Remove pedestrians that are in a predefined area, at a predefined rate.
+    for (const auto& vanishingArea : myVanishingAreas) {
+        std::vector<JPS_Point> vanishingAreaBoundary = vanishingArea.second.vanishingAreaBoundary;
+        JPS_AgentIdIterator agentsInVanishingAreaIterator = JPS_Simulation_AgentsInPolygon(myJPSSimulation, vanishingAreaBoundary.data(), vanishingAreaBoundary.size());
+        SUMOTime elapsedTime = time - myLastRemovalTime;
+        if (elapsedTime >= vanishingArea.second.period) {
+            const JPS_AgentId agentID = JPS_AgentIdIterator_Next(agentsInVanishingAreaIterator);
+            if (agentID != 0) {
+                auto lambda = [agentID](PState* p) { return p->getAgentId() == agentID; };
+                std::vector<PState*>::const_iterator iterator = std::find_if(myPedestrianStates.begin(), myPedestrianStates.end(), lambda);
+                PState* state = *iterator;
+                MSPerson* person = state->getPerson();
+                // Code below only works if the removal happens at the last stage.
+                const bool finalStage = person->getNumRemainingStages() == 1;
+                if (finalStage) {
+                    WRITE_MESSAGEF(TL("Person '%' in vanishing area '%' was removed from the simulation."), person->getID(), vanishingArea.first);
+                    while (!state->getStage()->moveToNextEdge(person, time, 1, nullptr));
+                    registerArrived();
+                    JPS_Simulation_MarkAgentForRemoval(myJPSSimulation, agentID, nullptr);
+                    myPedestrianStates.erase(iterator);
+                    myLastRemovalTime = time;
+                }
+            }
+        }
+    }
+
     JPS_ErrorMessage_Free(message);
 
     return DELTA_T;
@@ -794,6 +821,14 @@ MSPModel_JuPedSim::initialize() {
     preparePolygonForJPS(maxAreaConnectedComponentPolygon);
     preparePolygonForDrawing(maxAreaConnectedComponentPolygon, maxAreaPolygonId);
 
+    for (const auto& polygonWithID : myNetwork->getShapeContainer().getPolygons()) {
+        if (polygonWithID.second->getShapeType() == "jupedsim.vanishing_area") {
+            std::vector<JPS_Point> vanishingAreaBoundary = convertToJPSPoints(polygonWithID.second->getShape());
+            SUMOTime period = (SUMOTime)(1.0 / std::stod(polygonWithID.second->getParameter("frequency", "1.0"))) * 1000; // SUMOTime is in ms.
+            myVanishingAreas.insert(std::make_pair(polygonWithID.second->getID(), VanishingAreaData{vanishingAreaBoundary, period}));
+        }
+    }
+
     JPS_ErrorMessage message = nullptr;
     myJPSGeometry = JPS_GeometryBuilder_Build(myJPSGeometryBuilder, &message);
     if (myJPSGeometry == nullptr) {

diff --git a/src/microsim/transportables/MSPModel_JuPedSim.h b/src/microsim/transportables/MSPModel_JuPedSim.h
@@ -162,6 +162,12 @@ class MSPModel_JuPedSim : public MSPModel {
     JPS_CollisionFreeSpeedModelBuilder myJPSModelBuilder;
     JPS_OperationalModel myJPSModel;
     JPS_Simulation myJPSSimulation;
+    struct VanishingAreaData {
+        std::vector<JPS_Point> vanishingAreaBoundary;
+        SUMOTime period;
+    };
+    std::map<std::string, VanishingAreaData> myVanishingAreas;
+    SUMOTime myLastRemovalTime;
 
     static const int GEOS_QUADRANT_SEGMENTS;
     static const double GEOS_MITRE_LIMIT;