From 17630d03cbb86c7ed9addc41f8dbe58d2cc99f97 Mon Sep 17 00:00:00 2001
From: Mohcine Chraibi <m.chraibi@fz-juelich.de>
Date: Mon, 17 Jun 2019 22:00:15 +0200
Subject: [PATCH] write out all files with abs path

- Changes to  ProjectRootDir: probable side effects.
--> needs testing
---
 IO/GeoFileParser.cpp |  4 +++-
 IO/IODispatcher.cpp  | 21 +++++++++++++++------
 IO/IODispatcher.h    |  2 +-
 IO/IniFileParser.cpp | 12 +++---------
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/IO/GeoFileParser.cpp b/IO/GeoFileParser.cpp
index 9594cb38..5bb9ac10 100644
--- a/IO/GeoFileParser.cpp
+++ b/IO/GeoFileParser.cpp
@@ -60,7 +60,9 @@ void GeoFileParser::LoadBuilding(Building* building)
 bool GeoFileParser::LoadGeometry(Building* building)
 {
 
-     std::string geoFilenameWithPath = _configuration->GetProjectRootDir()+_configuration->GetGeometryFile();
+     fs::path rootDir(_configuration->GetProjectRootDir());
+
+     std::string geoFilenameWithPath = (rootDir/fs::path(_configuration->GetGeometryFile())).string();
      std::cout << "\nLoadGeometry: file: " << geoFilenameWithPath << "\n";
 
      TiXmlDocument docGeo(geoFilenameWithPath);
diff --git a/IO/IODispatcher.cpp b/IO/IODispatcher.cpp
index 377c9873..72da2fdc 100644
--- a/IO/IODispatcher.cpp
+++ b/IO/IODispatcher.cpp
@@ -35,6 +35,7 @@
 #define _USE_MATH_DEFINES
 
 using namespace std;
+namespace fs = std::filesystem;
 
 
 IODispatcher::IODispatcher()
@@ -466,6 +467,8 @@ void TrajectoriesFLAT::WriteHeader(long nPeds, double fps, Building* building, i
      std::string eventFileName = getEventFileName(building->GetProjectFilename());
      std::string trainTimeTableFileName = getTrainTimeTableFileName(building->GetProjectFilename());
      std::string trainTypeFileName = getTrainTypeFileName(building->GetProjectFilename());
+     fs::path projRoot(building->GetProjectRootDir());
+
      (void) seed; (void) nPeds;
      char tmp[100] = "";
      sprintf(tmp, "#description: jpscore (%s)", JPSCORE_VERSION);
@@ -474,31 +477,37 @@ void TrajectoriesFLAT::WriteHeader(long nPeds, double fps, Building* building, i
      Write(tmp);
      sprintf(tmp, "#framerate: %0.2f",fps);
      Write(tmp);
-     sprintf(tmp,"#geometry: %s",building->GetGeometryFilename().c_str());
+     std::string tmpGeo= (projRoot/fs::path(building->GetGeometryFilename())).string();
+     sprintf(tmp,"#geometry: %s",  tmpGeo.c_str());
      Write(tmp);
      if(sourceFileName != "")
      {
-          sprintf(tmp,"#sources: %s", sourceFileName.c_str());
+          std::string tmpSource= (projRoot/fs::path(sourceFileName)).string();
+          sprintf(tmp,"#sources: %s", tmpSource.c_str());
           Write(tmp);
      }
      if(goalFileName != "")
      {
-          sprintf(tmp,"#goals: %s", goalFileName.c_str());
+          std::string tmpGoal= (projRoot/fs::path(goalFileName)).string();
+          sprintf(tmp,"#goals: %s", tmpGoal.c_str());
           Write(tmp);
      }
      if( eventFileName != "")
      {
-          sprintf(tmp,"#events: %s", eventFileName.c_str());
+          std::string tmpEvent= (projRoot/fs::path(eventFileName)).string();
+          sprintf(tmp,"#events: %s", tmpEvent.c_str());
           Write(tmp);
      }
      if( trainTimeTableFileName  != "")
      {
-          sprintf(tmp,"#trainTimeTable: %s", trainTimeTableFileName.c_str());
+          std::string tmpTTT= (projRoot/fs::path(trainTimeTableFileName)).string();
+          sprintf(tmp,"#trainTimeTable: %s", tmpTTT.c_str());
           Write(tmp);
      }
      if( trainTypeFileName  != "")
      {
-          sprintf(tmp,"#trainType: %s", trainTypeFileName.c_str());
+          std::string tmpTT= (projRoot/fs::path(trainTypeFileName)).string();
+          sprintf(tmp,"#trainType: %s", tmpTT.c_str());
           Write(tmp);
      }
      Write("#ID: the agent ID");
diff --git a/IO/IODispatcher.h b/IO/IODispatcher.h
index 9bd950bf..891dd8cb 100644
--- a/IO/IODispatcher.h
+++ b/IO/IODispatcher.h
@@ -33,7 +33,7 @@
 
 #include <cstring>
 #include <vector>
-
+#include <filesystem>
 extern OutputHandler* Log;
 
 class Trajectories;
diff --git a/IO/IniFileParser.cpp b/IO/IniFileParser.cpp
index 5fe23092..5dcb084a 100644
--- a/IO/IniFileParser.cpp
+++ b/IO/IniFileParser.cpp
@@ -98,15 +98,9 @@ bool IniFileParser::Parse(std::string iniFile)
      // and as I just realized, I called it configuration. We should be consistent here anything else
      // is confusing [gl march '16]
 
-
-
-     //extract and set the project root dir
-     size_t found = iniFile.find_last_of("/\\");
-     if (found!=std::string::npos) {
-          _config->SetProjectRootDir(iniFile.substr(0, found)+"/");
-     } else {
-          _config->SetProjectRootDir("./");
-     }
+     fs::path root(iniFile);
+     fs::path q(iniFile);
+     _config->SetProjectRootDir(fs::absolute(q.parent_path()).string());
 
      TiXmlDocument doc(iniFile);
      if (!doc.LoadFile()) {
-- 
GitLab