Refactoring simulation and init router

still does not work!!
parent 8326d0f1
Pipeline #20980 passed with stages
in 9 minutes and 18 seconds
This diff is collapsed.
...@@ -49,6 +49,9 @@ ...@@ -49,6 +49,9 @@
#include "events/EventManager.h" #include "events/EventManager.h"
#include "pedestrian/AgentsSourcesManager.h" #include "pedestrian/AgentsSourcesManager.h"
#include "general/Configuration.h" #include "general/Configuration.h"
#include <filesystem>
//Forward declarations //Forward declarations
//class AgentsSourcesManager; //class AgentsSourcesManager;
...@@ -187,8 +190,11 @@ public: ...@@ -187,8 +190,11 @@ public:
*/ */
void UpdateDoorticks() const; void UpdateDoorticks() const;
int GetMaxSimTime() const; int GetMaxSimTime() const;
void incrementCountTraj();
bool correctGeometry(std::shared_ptr<Building> building, std::string trainType, Point TrackStart, Point TrackEnd); bool correctGeometry(std::shared_ptr<Building> building, std::string trainType, Point TrackStart, Point TrackEnd);
bool WriteTrajectories(std::string trajName);
bool TrainTraffic();
int _countTraj=0; // count number of TXT trajectories to produce int _countTraj=0; // count number of TXT trajectories to produce
double _maxFileSize; // in MB double _maxFileSize; // in MB
......
...@@ -94,8 +94,6 @@ bool Crossing::IsClose() const ...@@ -94,8 +94,6 @@ bool Crossing::IsClose() const
bool Crossing::IsTempClose() const bool Crossing::IsTempClose() const
{ {
std::cout << "\n enter istempclose with " << this->GetID() << "\n";
return _state == DoorState::TEMP_CLOSE; return _state == DoorState::TEMP_CLOSE;
} }
......
...@@ -644,4 +644,4 @@ void FFRouter::SetRecalc(double t) { ...@@ -644,4 +644,4 @@ void FFRouter::SetRecalc(double t) {
void FFRouter::Update(){ void FFRouter::Update(){
this->ReInit(); this->ReInit();
} }
\ No newline at end of file
...@@ -941,8 +941,9 @@ void GlobalRouter::GetRelevantRoutesTofinalDestination(Pedestrian *ped, vector<A ...@@ -941,8 +941,9 @@ void GlobalRouter::GetRelevantRoutesTofinalDestination(Pedestrian *ped, vector<A
} }
if(relevant) { if(relevant) {
//only if not closed //only if not closed
if(!ap->IsClosed()) if(ap)
relevantAPS.push_back(ap); if(!ap->IsClosed())
relevantAPS.push_back(ap);
} }
} }
} }
......
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