Verified Commit 4147ed63 authored by Mohcine Chraibi's avatar Mohcine Chraibi

Merge branch 'develop' into trajectories

parents daa95675 e8bd8ffe
...@@ -58,7 +58,7 @@ Simulation::Simulation(Configuration* args) ...@@ -58,7 +58,7 @@ Simulation::Simulation(Configuration* args)
:_config(args) :_config(args)
{ {
_countTraj = 0; _countTraj = 0;
_maxFileSize = 1; // MB _maxFileSize = 10; // MB
_nPeds = 0; _nPeds = 0;
_seed = 8091983; _seed = 8091983;
_deltaT = 0; _deltaT = 0;
...@@ -724,7 +724,6 @@ bool Simulation::WriteTrajectories(std::string trajectoryName) ...@@ -724,7 +724,6 @@ bool Simulation::WriteTrajectories(std::string trajectoryName)
{ {
fs::path p = _config->GetTrajectoriesFile(); fs::path p = _config->GetTrajectoriesFile();
fs::path parent = p.parent_path(); fs::path parent = p.parent_path();
int sf = fs::file_size(p); int sf = fs::file_size(p);
if(sf>_maxFileSize*1024*1024) if(sf>_maxFileSize*1024*1024)
{ {
...@@ -788,7 +787,6 @@ bool Simulation::correctGeometry(std::shared_ptr<Building> building, std::shared ...@@ -788,7 +787,6 @@ bool Simulation::correctGeometry(std::shared_ptr<Building> building, std::shared
std::cout<< KBLU << "Enter correctGeometry: Building Has " << building->GetAllTransitions().size() << " Transitions\n" << RESET; std::cout<< KBLU << "Enter correctGeometry: Building Has " << building->GetAllTransitions().size() << " Transitions\n" << RESET;
std::cout << "room: " << room_id << " subroom_id " << subroom_id << "\n" ; std::cout << "room: " << room_id << " subroom_id " << subroom_id << "\n" ;
if(mytrack.empty() || subroom == nullptr) if(mytrack.empty() || subroom == nullptr)
return false; return false;
...@@ -1003,7 +1001,6 @@ bool Simulation::correctGeometry(std::shared_ptr<Building> building, std::shared ...@@ -1003,7 +1001,6 @@ bool Simulation::correctGeometry(std::shared_ptr<Building> building, std::shared
} }
_routingEngine->setNeedUpdate(true); _routingEngine->setNeedUpdate(true);
return true; return true;
} }
void Simulation::RunFooter() void Simulation::RunFooter()
{ {
......
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