Also removes an agent from the neighborhood search if it is removed e…

…xplicitly
PedestrianDynamics · Jul 26, 2023 · c4dcae8 · c4dcae8
1 parent e3cbe08
commit c4dcae8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/libsimulator/src/NeighborhoodSearch.hpp b/libsimulator/src/NeighborhoodSearch.hpp
@@ -82,6 +82,21 @@ class NeighborhoodSearch
         vec.push_back(item);
     }
 
+    void RemoveAgent(const Value& item)
+    {
+        for(auto& [_, agents] : _grid) {
+            const auto iter =
+                std::find_if(std::begin(agents), std::end(agents), [item](auto& agent) {
+                    return agent.id == item.id;
+                });
+            if(iter != std::end(agents)) {
+                agents.erase(iter);
+                return;
+            }
+        }
+        throw SimulationError("Unknown agent id {}", item.id);
+    }
+
     void Update(const std::vector<Value>& items)
     {
         _grid.clear();

diff --git a/libsimulator/src/Simulation.hpp b/libsimulator/src/Simulation.hpp
@@ -212,6 +212,7 @@ void TypedSimulation<T>::RemoveAgent(GenericAgent::ID id)
         throw SimulationError("Unknown agent id {}", id);
     }
     _agents.erase(iter);
+    _neighborhoodSearch.RemoveAgent(*iter);
 }
 
 template <typename T>