small refactoring and fixing one memory leak #12 #13

eclipse-sumo · Feb 8, 2024 · 159a017 · 159a017
1 parent 142c170
commit 159a017
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/microsim/transportables/MSPModel_JuPedSim.cpp b/src/microsim/transportables/MSPModel_JuPedSim.cpp
@@ -351,10 +351,9 @@ MSPModel_JuPedSim::execute(SUMOTime time) {
 
     // 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;
+        const 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) {
+        if (time - myLastRemovalTime >= vanishingArea.second.period) {
             const JPS_AgentId agentID = JPS_AgentIdIterator_Next(agentsInVanishingAreaIterator);
             if (agentID != 0) {
                 auto lambda = [agentID](PState * p) {
@@ -375,6 +374,7 @@ MSPModel_JuPedSim::execute(SUMOTime time) {
                 }
             }
         }
+        JPS_AgentIdIterator_Free(agentsInVanishingAreaIterator);
     }
 
     JPS_ErrorMessage_Free(message);