Commit 79618843 authored by Ulrich Kemloh's avatar Ulrich Kemloh

cleaning the CMake file

parent c65ee1fe
......@@ -186,12 +186,12 @@ set ( source_files
pedestrian/PedDistributor.cpp
pedestrian/Pedestrian.cpp
pedestrian/AgentsParameters.cpp
pedestrian/Knowledge.cpp
routing/AccessPoint.cpp
routing/DirectionStrategy.cpp
routing/DummyRouter.cpp
routing/GlobalRouter.cpp
routing/GraphRouter.cpp
routing/QuickestPathRouter.cpp
routing/SafestPathRouter.cpp
routing/Router.cpp
......@@ -201,10 +201,6 @@ set ( source_files
routing/MeshRouter.cpp
routing/mesh/Mesh.cpp
routing/graph/NavLineState.cpp
routing/graph/RoutingGraph.cpp
routing/graph/RoutingGraphStorage.cpp
routing/CognitiveMapRouter.cpp
routing/cognitive_map/CognitiveMap.cpp
routing/cognitive_map/NavigationGraph.cpp
......@@ -235,7 +231,6 @@ set ( header_files
routing/DirectionStrategy.h
routing/DummyRouter.h
routing/GlobalRouter.h
routing/GraphRouter.h
routing/QuickestPathRouter.h
routing/SafestPathRouter.h
routing/Router.h
......@@ -244,9 +239,6 @@ set ( header_files
routing/DTriangulation.h
routing/MeshRouter.h
routing/mesh/Mesh.h
routing/graph/RoutingGraphStorage.h
routing/graph/RoutingGraph.h
routing/graph/NavLineState.h
routing/CognitiveMapRouter.h
routing/cognitive_map/CognitiveMap.h
......@@ -269,6 +261,7 @@ set ( header_files
pedestrian/PedDistributor.h
pedestrian/Ellipse.h
pedestrian/AgentsParameters.h
pedestrian/Knowledge.h
mpi/LCGrid.h
......
......@@ -192,7 +192,7 @@ void EventManager::ReadEventsTxt(double time)
bool EventManager::UpdateAgentKnowledge(Building* _b)
{
#pragma omp parallel
//#pragma omp parallel
for(auto&& ped:_b->GetAllPedestrians())
{
for (auto&& door: _b->GetAllTransitions())
......@@ -216,7 +216,7 @@ bool EventManager::UpdateAgentKnowledge(Building* _b)
{
if (ped->GetNewEventFlag())informant.push_back(ped);
}
//TODO: what happen when they all have the new event flag ? reset maybe?
for(auto&& ped1:informant)
{
......@@ -234,6 +234,13 @@ bool EventManager::UpdateAgentKnowledge(Building* _b)
}
}
//TODO: what happen when they all have the new event flag ? reset maybe?
if(informant.size()==_b->GetAllPedestrians().size())
{
for(auto&& ped:_b->GetAllPedestrians())
ped->SetNewEventFlag(false);
}
// information speed to fast
// for(auto&& ped1:_b->GetAllPedestrians())
// {
......@@ -621,7 +628,7 @@ bool EventManager::CreateRoutingEngine(Building* _b, int first_engine)
Router * EventManager::CreateRouter(const RoutingStrategy& strategy)
{
Router * rout=NULL;
Router * rout=nullptr;
switch(strategy)
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment