change structure of directory routing

CMakeLists.txt

@@ -284,16 +284,6 @@ set(source_files
         voronoi/VoronoiDiagramGenerator.cpp
         voronoi-boost/VoronoiPositionGenerator.cpp
 
-        routing/ffRouter.cpp
-        routing/LocalFloorfieldViaFM.cpp
-        routing/FloorfieldViaFM.cpp
-        routing/AccessPoint.cpp
-        routing/DirectionStrategy.cpp
-        routing/GlobalRouter.cpp
-        routing/QuickestPathRouter.cpp
-        routing/Router.cpp
-        routing/RoutingEngine.cpp
-        routing/DTriangulation.cpp
 
         #header files with scr code need to be added here, in order to be
         #included in generated project files (codeblocks)
@@ -301,40 +291,55 @@ set(source_files
         general/Configuration.h
         general/Macros.h
 
-  routing/CognitiveMapRouter.cpp
-  routing/cognitive_map/GraphNetwork.cpp
-  routing/cognitive_map/NavigationGraph.cpp
-  routing/cognitive_map/BrainStorage.cpp
-  routing/cognitive_map/navigation_graph/GraphEdge.cpp
-  routing/cognitive_map/navigation_graph/GraphVertex.cpp
-  routing/cognitive_map/sensor/RoomToFloorSensor.cpp
-  routing/cognitive_map/sensor/SensorManager.cpp
-  routing/cognitive_map/sensor/AbstractSensor.cpp
-  routing/cognitive_map/sensor/DiscoverDoorsSensor.cpp
-  routing/cognitive_map/sensor/JamSensor.cpp
-  routing/cognitive_map/sensor/LastDestinationsSensor.cpp
-  routing/cognitive_map/sensor/SmokeSensor.cpp
-  routing/cognitive_map/sensor/locater.cpp
-  routing/cognitive_map/fire_mesh/FireMesh.cpp
-  routing/cognitive_map/fire_mesh/Knot.cpp
-  routing/cognitive_map/fire_mesh/FireMeshStorage.cpp
-  routing/cognitive_map/cognitiveMap/associations.cpp
-  routing/cognitive_map/cognitiveMap/connection.cpp
-  routing/cognitive_map/cognitiveMap/cognitivemap.cpp
-  routing/cognitive_map/cognitiveMap/landmark.cpp
-  routing/cognitive_map/cognitiveMap/region.cpp
-  routing/cognitive_map/cognitiveMap/youareherepointer.cpp
-  routing/cognitive_map/cognitiveMap/cogmapoutputhandler.cpp
-  routing/cognitive_map/cognitiveMap/landmarknetwork.cpp
-
-  routing/cognitive_map/perception/perception.cpp
-  routing/cognitive_map/perception/visibleenvironment.cpp
-  routing/cognitive_map/Brain.cpp
-
-  routing/cognitive_map/cognitiveMap/internnavigationnetwork.cpp
-
-
-  visiLibity/source_code/visilibity.cpp
+        #floorfield
+        routing/ff_router/ffRouter.cpp
+        routing/ff_router/LocalFloorfieldViaFM.cpp
+        routing/ff_router/FloorfieldViaFM.cpp
+
+        #global_shortest
+        routing/global_shortest/AccessPoint.cpp
+        routing/global_shortest/GlobalRouter.cpp
+        routing/global_shortest/DTriangulation.cpp
+
+        #general
+        routing/DirectionStrategy.cpp
+        routing/Router.cpp
+        routing/RoutingEngine.cpp
+
+        #quickest
+        routing/quickest/QuickestPathRouter.cpp
+
+        #AI router
+        routing/AI_router/CognitiveMapRouter.cpp
+        routing/AI_router/GraphNetwork.cpp
+        routing/AI_router/NavigationGraph.cpp
+        routing/AI_router/BrainStorage.cpp
+        routing/AI_router/navigation_graph/GraphEdge.cpp
+        routing/AI_router/navigation_graph/GraphVertex.cpp
+        routing/AI_router/sensor/RoomToFloorSensor.cpp
+        routing/AI_router/sensor/SensorManager.cpp
+        routing/AI_router/sensor/AbstractSensor.cpp
+        routing/AI_router/sensor/DiscoverDoorsSensor.cpp
+        routing/AI_router/sensor/JamSensor.cpp
+        routing/AI_router/sensor/LastDestinationsSensor.cpp
+        routing/AI_router/sensor/SmokeSensor.cpp
+        routing/AI_router/sensor/locater.cpp
+        routing/AI_router/fire_mesh/FireMesh.cpp
+        routing/AI_router/fire_mesh/Knot.cpp
+        routing/AI_router/fire_mesh/FireMeshStorage.cpp
+        routing/AI_router/cognitiveMap/associations.cpp
+        routing/AI_router/cognitiveMap/connection.cpp
+        routing/AI_router/cognitiveMap/cognitivemap.cpp
+        routing/AI_router/cognitiveMap/landmark.cpp
+        routing/AI_router/cognitiveMap/region.cpp
+        routing/AI_router/cognitiveMap/youareherepointer.cpp
+        routing/AI_router/cognitiveMap/cogmapoutputhandler.cpp
+        routing/AI_router/cognitiveMap/landmarknetwork.cpp
+        routing/AI_router/perception/perception.cpp
+        routing/AI_router/perception/visibleenvironment.cpp
+        routing/AI_router/Brain.cpp
+        routing/AI_router/cognitiveMap/internnavigationnetwork.cpp
+        visiLibity/source_code/visilibity.cpp
 
 
         poly2tri/common/shapes.cpp
@@ -347,53 +352,59 @@ set(source_files
         math/KrauszModel.cpp)
 
 set(header_files
-        routing/ffRouter.h
-        routing/LocalFloorfieldViaFM.h
-        routing/FloorfieldViaFM.h
+
+        #floorfield
+        routing/ff_router/ffRouter.h
+        routing/ff_router/RectGrid.h
+        routing/ff_router/Trial.h
+        routing/ff_router/LocalFloorfieldViaFM.h
+        routing/ff_router/FloorfieldViaFM.h
+
+        #general
         routing/DirectionStrategy.h
-        routing/GlobalRouter.h
-        routing/QuickestPathRouter.h
         routing/Router.h
         routing/RoutingEngine.h
-        routing/AccessPoint.h
-        routing/DTriangulation.h
-        routing/mesh/RectGrid.h
-        routing/mesh/Trial.h
-
-
-  routing/CognitiveMapRouter.h
-  routing/cognitive_map/GraphNetwork.h
-  routing/cognitive_map/NavigationGraph.h
-  routing/cognitive_map/BrainStorage.h
-  routing/cognitive_map/navigation_graph/GraphEdge.h
-  routing/cognitive_map/navigation_graph/GraphVertex.h
-  routing/cognitive_map/sensor/AbstractSensor.h
-  routing/cognitive_map/sensor/RoomToFloorSensor.h
-  routing/cognitive_map/sensor/SensorManager.h
-  routing/cognitive_map/sensor/DiscoverDoorsSensor.h
-  routing/cognitive_map/sensor/JamSensor.h
-  routing/cognitive_map/sensor/LastDestinationsSensor.h
-  routing/cognitive_map/sensor/SmokeSensor.h
-  routing/cognitive_map/sensor/locater.h
-  routing/cognitive_map/fire_mesh/FireMesh.h
-  routing/cognitive_map/fire_mesh/Knot.h
-  routing/cognitive_map/fire_mesh/FireMeshStorage.h
-  routing/cognitive_map/cognitiveMap/associations.h
-  routing/cognitive_map/cognitiveMap/connection.cpp
-  routing/cognitive_map/cognitiveMap/cognitivemap.h
-  routing/cognitive_map/cognitiveMap/landmark.h
-  routing/cognitive_map/cognitiveMap/region.h
-  routing/cognitive_map/cognitiveMap/youareherepointer.h
-  routing/cognitive_map/cognitiveMap/cogmapoutputhandler.h
-  routing/cognitive_map/cognitiveMap/landmarknetwork.h
-
-  routing/cognitive_map/perception/perception.h
-  routing/cognitive_map/perception/visibleenvironment.h
-  routing/cognitive_map/Brain.h
-
-  routing/cognitive_map/cognitiveMap/internnavigationnetwork.h
-
-  visiLibity/source_code/visilibity.hpp
+
+
+        #global_shortest
+        routing/global_shortest/GlobalRouter.h
+        routing/global_shortest/AccessPoint.h
+        routing/global_shortest/DTriangulation.h
+
+        #quickest
+        routing/quickest/QuickestPathRouter.h
+
+        #AI router
+        routing/AI_router/CognitiveMapRouter.h
+        routing/AI_router/GraphNetwork.h
+        routing/AI_router/NavigationGraph.h
+        routing/AI_router/BrainStorage.h
+        routing/AI_router/navigation_graph/GraphEdge.h
+        routing/AI_router/navigation_graph/GraphVertex.h
+        routing/AI_router/sensor/AbstractSensor.h
+        routing/AI_router/sensor/RoomToFloorSensor.h
+        routing/AI_router/sensor/SensorManager.h
+        routing/AI_router/sensor/DiscoverDoorsSensor.h
+        routing/AI_router/sensor/JamSensor.h
+        routing/AI_router/sensor/LastDestinationsSensor.h
+        routing/AI_router/sensor/SmokeSensor.h
+        routing/AI_router/sensor/locater.h
+        routing/AI_router/fire_mesh/FireMesh.h
+        routing/AI_router/fire_mesh/Knot.h
+        routing/AI_router/fire_mesh/FireMeshStorage.h
+        routing/AI_router/cognitiveMap/associations.h
+        routing/AI_router/cognitiveMap/connection.cpp
+        routing/AI_router/cognitiveMap/cognitivemap.h
+        routing/AI_router/cognitiveMap/landmark.h
+        routing/AI_router/cognitiveMap/region.h
+        routing/AI_router/cognitiveMap/youareherepointer.h
+        routing/AI_router/cognitiveMap/cogmapoutputhandler.h
+        routing/AI_router/cognitiveMap/landmarknetwork.h
+        routing/AI_router/perception/perception.h
+        routing/AI_router/perception/visibleenvironment.h
+        routing/AI_router/Brain.h
+        routing/AI_router/cognitiveMap/internnavigationnetwork.h
+        visiLibity/source_code/visilibity.hpp
 
         pedestrian/Pedestrian.h
         pedestrian/PedDistributor.h

IO/IniFileParser.cpp

@@ -38,10 +38,10 @@
 #include "../math/GompertzModel.h"
 #include "../math/GradientModel.h"
 #include "../math/VelocityModel.h"
-#include "../routing/GlobalRouter.h"
-#include "../routing/QuickestPathRouter.h"
-#include "../routing/CognitiveMapRouter.h"
-#include "../routing/ffRouter.h"
+#include "../routing/global_shortest/GlobalRouter.h"
+#include "../routing/quickest/QuickestPathRouter.h"
+#include "../routing/AI_router/CognitiveMapRouter.h"
+#include "../routing/ff_router/ffRouter.h"
 
 IniFileParser::IniFileParser(Configuration* config)
 {

Simulation.cpp

@@ -30,7 +30,7 @@
 
 #include "Simulation.h"
 
-#include "routing/ffRouter.h"
+#include "routing/ff_router/ffRouter.h"
 #include "math/GCFMModel.h"
 #include "math/GompertzModel.h"
 #include "math/GradientModel.h"

Simulation.h

@@ -40,12 +40,12 @@
 #include "IO/IODispatcher.h"
 #include "math/OperationalModel.h"
 #include "math/ODESolver.h"
-#include "routing/GlobalRouter.h"
-#include "routing/QuickestPathRouter.h"
+#include "routing/global_shortest/GlobalRouter.h"
+#include "routing/quickest/QuickestPathRouter.h"
 #include "routing/DirectionStrategy.h"
 #include "routing/RoutingEngine.h"
 #include "pedestrian/PedDistributor.h"
-#include "routing/CognitiveMapRouter.h"
+#include "routing/AI_router/CognitiveMapRouter.h"
 #include "events/EventManager.h"
 #include "pedestrian/AgentsSourcesManager.h"
 #include "general/Configuration.h"

events/EventManager.cpp

@@ -46,9 +46,9 @@
 #include "../IO/OutputHandler.h"
 #include "../IO/IODispatcher.h"
 #include "../routing/RoutingEngine.h"
-#include "../routing/GlobalRouter.h"
-#include "../routing/QuickestPathRouter.h"
-#include "../routing/CognitiveMapRouter.h"
+#include "../routing/global_shortest/GlobalRouter.h"
+#include "../routing/quickest/QuickestPathRouter.h"
+#include "../routing/AI_router/CognitiveMapRouter.h"
 #include "EventManager.h"
 #include "Event.h"
 

general/ArgumentParser.cpp

@@ -45,9 +45,9 @@
 #include "ArgumentParser.h"
 #include "Macros.h"
 #include "../pedestrian/AgentsParameters.h"
-#include "../routing/GlobalRouter.h"
-#include "../routing/QuickestPathRouter.h"
-#include "../routing/CognitiveMapRouter.h"
+#include "../routing/global_shortest/GlobalRouter.h"
+#include "../routing/quickest/QuickestPathRouter.h"
+#include "../routing/AI_router/CognitiveMapRouter.h"
 #include "../IO/IniFileParser.h"
 #include <sys/stat.h>
 

geometry/SubRoom.h

@@ -31,7 +31,7 @@
 
 
 #include "Wall.h"
-#include "../routing/DTriangulation.h"
+#include "../routing/global_shortest/DTriangulation.h"
 
 #include <vector>
 #include <string>

routing/CognitiveMapRouter.cpp → routing/AI_router/CognitiveMapRouter.cpp

@@ -27,19 +27,19 @@
 
 
 #include "CognitiveMapRouter.h"
-#include "Router.h"
+#include "../Router.h"
 
-#include "cognitive_map/BrainStorage.h"
-#include "cognitive_map/cognitiveMap/cognitivemap.h"
-#include "cognitive_map/NavigationGraph.h"
-#include "cognitive_map/sensor/SensorManager.h"
+#include "BrainStorage.h"
+#include "./cognitiveMap/cognitivemap.h"
+#include "NavigationGraph.h"
+#include "./sensor/SensorManager.h"
 
-#include "../geometry/SubRoom.h"
-#include "../geometry/NavLine.h"
-#include "../geometry/Building.h"
+#include "../../geometry/SubRoom.h"
+#include "../../geometry/NavLine.h"
+#include "../../geometry/Building.h"
 
-#include "../pedestrian/Pedestrian.h"
-#include "../tinyxml/tinyxml.h"
+#include "../../pedestrian/Pedestrian.h"
+#include "../../tinyxml/tinyxml.h"
 
 CognitiveMapRouter::CognitiveMapRouter()
 {

routing/CognitiveMapRouter.h → routing/AI_router/CognitiveMapRouter.h

@@ -30,7 +30,7 @@
 #ifndef COGNITIVEMAPROUTER_H_
 #define COGNITIVEMAPROUTER_H_
 
-#include "Router.h"
+#include "../Router.h"
 #include <string>
 #include <unordered_map>
 #include <memory>

routing/DirectionStrategy.cpp

@@ -33,8 +33,8 @@
 #include "../pedestrian/Pedestrian.h"
 #include "../geometry/SubRoom.h"
 //#include "../geometry/Wall.h"
-#include "../routing/FloorfieldViaFM.h"
-#include "../routing/LocalFloorfieldViaFM.h"
+#include "../routing/ff_router/FloorfieldViaFM.h"
+#include "../routing/ff_router/LocalFloorfieldViaFM.h"
 //#include "DirectionStrategy.h"
 //#include <fstream>
 #include <chrono>

routing/FloorfieldViaFM.h → routing/ff_router/FloorfieldViaFM.h

@@ -39,12 +39,12 @@
 #include <cmath>
 #include <functional>
 #include "mesh/RectGrid.h"
-#include "../geometry/Wall.h"
-#include "../geometry/Point.h"
-#include "../geometry/Building.h"
-#include "../geometry/SubRoom.h" //check: should Room.h include SubRoom.h??
-#include "../routing/mesh/Trial.h"
-#include "../pedestrian/Pedestrian.h"
+#include "../../geometry/Wall.h"
+#include "../../geometry/Point.h"
+#include "../../geometry/Building.h"
+#include "../../geometry/SubRoom.h" //check: should Room.h include SubRoom.h??
+#include "./mesh/Trial.h"
+#include "../../pedestrian/Pedestrian.h"
 
 //maybe put following in macros.h
 #define LOWSPEED 0.001

routing/ffRouter.h → routing/ff_router/ffRouter.h

@@ -60,10 +60,10 @@
 #define FFROUTER_H_
 
 
-#include "Router.h"
-#include "../general/Macros.h"
-#include "../geometry/Building.h"
-#include "../routing/LocalFloorfieldViaFM.h"
+#include "../Router.h"
+#include "../../general/Macros.h"
+#include "../../geometry/Building.h"
+#include "LocalFloorfieldViaFM.h"
 
 class Building;
 class Pedestrian;
@@ -215,4 +215,4 @@ protected:
      bool _targetWithinSubroom;
 };
 
-#endif /* FFROUTER_H_ */
\ No newline at end of file
+#endif /* FFROUTER_H_ */

routing/mesh/RectGrid.h → routing/ff_router/mesh/RectGrid.h

@@ -29,7 +29,7 @@
 #ifndef RECTGRID_H
 #define RECTGRID_H
 
-#include "../../geometry/Point.h"
+#include "../../../geometry/Point.h"
 
 // geometric interpretation of index in "directNeighbor"
 //          x (1)              ^ y

routing/mesh/Trial.h → routing/ff_router/mesh/Trial.h

@@ -33,7 +33,7 @@
 #ifndef TRIAL_H
 #define TRIAL_H
 
-#include "../../geometry/Point.h"
+#include "../../../geometry/Point.h"
 
 class Trial // father := smaller; child := bigger (in terms of cost); cost/speed := ptr to its cost/speed
 {

routing/DTriangulation.h → routing/global_shortest/DTriangulation.h

@@ -40,8 +40,8 @@
 #include <iostream>
 #include <vector>
 
-#include "../geometry/Point.h"
-#include "../poly2tri/poly2tri.h"
+#include "../../geometry/Point.h"
+#include "../../poly2tri/poly2tri.h"
 
 
 class DTriangulation {

routing/GlobalRouter.cpp → routing/global_shortest/GlobalRouter.cpp

@@ -35,8 +35,8 @@
 
 //#include "../geometry/Building.h"
 //#include "../pedestrian/Pedestrian.h"
-#include "../tinyxml/tinyxml.h"
-#include "../geometry/SubRoom.h"
+#include "../../tinyxml/tinyxml.h"
+#include "../../geometry/SubRoom.h"
 //#include "../geometry/Wall.h"
 //#include "../IO/OutputHandler.h"
 

routing/GlobalRouter.h → routing/global_shortest/GlobalRouter.h

@@ -35,8 +35,8 @@
 #include <cfloat>
 #include <fstream>
 #include <vector>
-#include "Router.h"
-#include "../geometry/Building.h"
+#include "../Router.h"
+#include "../../geometry/Building.h"
 
 // forwarded classes
 class Pedestrian;

routing/QuickestPathRouter.h → routing/quickest/QuickestPathRouter.h

@@ -30,11 +30,11 @@
 #define QUICKESTPATHROUTER_H_
 
 
-#include "GlobalRouter.h"
-#include "AccessPoint.h"
-#include "Router.h"
-#include "../geometry/Building.h"
-#include "../pedestrian/Pedestrian.h"
+#include "../global_shortest/GlobalRouter.h"
+#include "../global_shortest/AccessPoint.h"
+#include "../Router.h"
+#include "../../geometry/Building.h"
+#include "../../pedestrian/Pedestrian.h"
 
 #include <cfloat>