Rearranged code in src across subdirectories

New includes appearance (with paths) may help when working on #4 and/or #13
physarumAdv · Oct 24, 2020 · e381bc9 · e381bc9
1 parent 688150d
commit e381bc9
Show file tree

Hide file tree

Showing 22 changed files with 44 additions and 42 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,19 +8,21 @@ set(CMAKE_CXX_COMPILER g++)
 set(CMAKE_CXX_STANDARD 14)
 
 
-set(SOURCES src/simulation_logic.cu src/random_generator.cu src/SimulationMap.cu src/Polyhedron.cu src/Particle.cu
-        src/MapNode.cu src/SpacePoint.cu src/Face.cu  src/visualization_integration.cu)
+set(SOURCES src/main_logic/simulation_logic.cu src/external/random_generator.cu src/simulation_objects/SimulationMap.cu
+        src/simulation_objects/geometric/Polyhedron.cu src/simulation_objects/Particle.cu
+        src/simulation_objects/MapNode.cu src/simulation_objects/geometric/SpacePoint.cu
+        src/simulation_objects/geometric/Face.cu src/external/visualization_integration.cu)
 
 option(COMPILE_FOR_CPU "Make produced executable run on CPU instead of GPU" OFF)
 
 if(COMPILE_FOR_CPU)
-    list(APPEND SOURCES src/main.cpp)
+    list(APPEND SOURCES src/main_logic/main.cpp)
 
     set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
     add_definitions(-x c++)
     add_definitions(-DCOMPILE_FOR_CPU -D__host__= -D__device__= -D__global__=)
 else()
-    list(APPEND SOURCES src/main.cu)
+    list(APPEND SOURCES src/main_logic/main.cu)
 endif()
 
 add_executable(minds_crawl ${SOURCES})

diff --git a/src/random_generator.cu → src/external/random_generator.cu b/src/random_generator.cu → src/external/random_generator.cu
@@ -10,7 +10,7 @@ std::uniform_real_distribution<double> distribution(0., 1.);
 
 
 #include "curand_kernel.h"
-#include "common.cuh"
+#include "../common.cuh"
 
 #include "random_generator.cuh"
 

diff --git a/src/random_generator.cuh → src/external/random_generator.cuh b/src/random_generator.cuh → src/external/random_generator.cuh
diff --git a/src/visualization_integration.cu → src/external/visualization_integration.cu b/src/visualization_integration.cu → src/external/visualization_integration.cu
@@ -3,7 +3,7 @@
 #include <string>
 
 #include "visualization_integration.cuh"
-#include "Particle.cuh"
+#include "../simulation_objects/Particle.cuh"
 
 
 __host__ std::string get_visualization_endpoint()

diff --git a/src/visualization_integration.cuh → src/external/visualization_integration.cuh b/src/visualization_integration.cuh → src/external/visualization_integration.cuh
@@ -2,9 +2,9 @@
 #define MINDS_CRAWL_VISUALIZATION_INTEGRATION_CUH
 
 
-#include "../lib/HTTPRequest/include/HTTPRequest.hpp"
+#include "../../lib/HTTPRequest/include/HTTPRequest.hpp"
 
-#include "MapNode.cuh"
+#include "../simulation_objects/MapNode.cuh"
 #include <string>
 
 

diff --git a/src/iterations_wrapper.cuh → src/main_logic/iterations_wrapper.cuh b/src/iterations_wrapper.cuh → src/main_logic/iterations_wrapper.cuh
@@ -9,14 +9,14 @@
 
 #include <cstdio>
 
-#include "SimulationMap.cuh"
-#include "Polyhedron.cuh"
-#include "MapNode.cuh"
-#include "Particle.cuh"
+#include "../simulation_objects/SimulationMap.cuh"
+#include "../simulation_objects/geometric/Polyhedron.cuh"
+#include "../simulation_objects/MapNode.cuh"
+#include "../simulation_objects/Particle.cuh"
 #include "simulation_logic.cuh"
-#include "random_generator.cuh"
-#include "jones_constants.hpp"
-#include "common.cuh"
+#include "../external/random_generator.cuh"
+#include "../jones_constants.hpp"
+#include "../common.cuh"
 
 namespace jc = jones_constants;
 

diff --git a/src/main.cpp → src/main_logic/main.cpp b/src/main.cpp → src/main_logic/main.cpp
@@ -3,7 +3,7 @@
 
 #include "simulation_logic.cuh"
 #include "iterations_wrapper.cuh"
-#include "visualization_integration.cuh"
+#include "../external/visualization_integration.cuh"
 
 
 void wrapped_run_iteration_project_nutrients(SimulationMap *const simulation_map, const int *const iteration_number)

diff --git a/src/main.cu → src/main_logic/main.cu b/src/main.cu → src/main_logic/main.cu
@@ -3,8 +3,8 @@
 
 #include "simulation_logic.cuh"
 #include "iterations_wrapper.cuh"
-#include "visualization_integration.cuh"
-#include "random_generator.cuh"
+#include "../external/visualization_integration.cuh"
+#include "../external/random_generator.cuh"
 
 
 const int cuda_block_size = 256;

diff --git a/src/simulation_logic.cu → src/main_logic/simulation_logic.cu b/src/simulation_logic.cu → src/main_logic/simulation_logic.cu
@@ -5,9 +5,9 @@
 #include <cstdio>
 
 #include "simulation_logic.cuh"
-#include "random_generator.cuh"
-#include "Particle.cuh"
-#include "jones_constants.hpp"
+#include "../external/random_generator.cuh"
+#include "../simulation_objects/Particle.cuh"
+#include "../jones_constants.hpp"
 
 namespace jc = jones_constants;
 

diff --git a/src/simulation_logic.cuh → src/main_logic/simulation_logic.cuh b/src/simulation_logic.cuh → src/main_logic/simulation_logic.cuh
@@ -2,9 +2,9 @@
 #define MINDS_CRAWL_SIMULATION_LOGIC_CUH
 
 
-#include "MapNode.cuh"
-#include "SimulationMap.cuh"
-#include "common.cuh"
+#include "../simulation_objects/MapNode.cuh"
+#include "../simulation_objects/SimulationMap.cuh"
+#include "../common.cuh"
 
 
 /**

diff --git a/src/MapNode.cu → src/simulation_objects/MapNode.cu b/src/MapNode.cu → src/simulation_objects/MapNode.cu
@@ -2,7 +2,7 @@
 
 #include "MapNode.cuh"
 #include "Particle.cuh"
-#include "Polyhedron.cuh"
+#include "geometric/Polyhedron.cuh"
 
 
 __host__ __device__ MapNode::MapNode(Polyhedron *polyhedron, Face *polyhedron_face, SpacePoint coordinates) :

diff --git a/src/MapNode.cuh → src/simulation_objects/MapNode.cuh b/src/MapNode.cuh → src/simulation_objects/MapNode.cuh
@@ -2,9 +2,9 @@
 #define MINDS_CRAWL_MAPNODE_CUH
 
 
-#include "common.cuh"
-#include "SpacePoint.cuh"
-#include "Face.cuh"
+#include "../common.cuh"
+#include "geometric/SpacePoint.cuh"
+#include "geometric/Face.cuh"
 
 class Particle;
 

diff --git a/src/Particle.cu → src/simulation_objects/Particle.cu b/src/Particle.cu → src/simulation_objects/Particle.cu
@@ -1,7 +1,7 @@
 #include "Particle.cuh"
 #include "MapNode.cuh"
-#include "random_generator.cuh"
-#include "jones_constants.hpp"
+#include "../external/random_generator.cuh"
+#include "../jones_constants.hpp"
 
 namespace jc = jones_constants;
 

diff --git a/src/Particle.cuh → src/simulation_objects/Particle.cuh b/src/Particle.cuh → src/simulation_objects/Particle.cuh
@@ -2,9 +2,9 @@
 #define MINDS_CRAWL_PARTICLE_CUH
 
 
-#include "Face.cuh"
-#include "Polyhedron.cuh"
-#include "SpacePoint.cuh"
+#include "geometric/Face.cuh"
+#include "geometric/Polyhedron.cuh"
+#include "geometric/SpacePoint.cuh"
 
 class MapNode;
 

diff --git a/src/SimulationMap.cu → src/simulation_objects/SimulationMap.cu b/src/SimulationMap.cu → src/simulation_objects/SimulationMap.cu
@@ -2,10 +2,10 @@
 #include <utility>
 
 #include "SimulationMap.cuh"
-#include "Polyhedron.cuh"
-#include "Face.cuh"
-#include "jones_constants.hpp"
-#include "random_generator.cuh"
+#include "geometric/Polyhedron.cuh"
+#include "geometric/Face.cuh"
+#include "../jones_constants.hpp"
+#include "../external/random_generator.cuh"
 
 
 typedef bool(MapNode::*SetNodeMethod)(MapNode *);

diff --git a/src/SimulationMap.cuh → src/simulation_objects/SimulationMap.cuh b/src/SimulationMap.cuh → src/simulation_objects/SimulationMap.cuh
@@ -3,8 +3,8 @@
 
 
 #include "MapNode.cuh"
-#include "simulation_logic.cuh"
-#include "common.cuh"
+#include "../main_logic/simulation_logic.cuh"
+#include "../common.cuh"
 
 
 /// Object describing a simulation's map

diff --git a/src/Face.cu → src/simulation_objects/geometric/Face.cu b/src/Face.cu → src/simulation_objects/geometric/Face.cu
@@ -1,9 +1,9 @@
 #include <utility>
 
 #include "Face.cuh"
-#include "MapNode.cuh"
+#include "../MapNode.cuh"
 #include "Polyhedron.cuh"
-#include "common.cuh"
+#include "../../common.cuh"
 
 
 __host__ __device__ SpacePoint calculate_normal(const SpacePoint *vertices)

diff --git a/src/Face.cuh → src/simulation_objects/geometric/Face.cuh b/src/Face.cuh → src/simulation_objects/geometric/Face.cuh
diff --git a/src/Polyhedron.cu → ...imulation_objects/geometric/Polyhedron.cu b/src/Polyhedron.cu → ...imulation_objects/geometric/Polyhedron.cu
@@ -6,7 +6,7 @@
 #include <utility>
 
 #include "Polyhedron.cuh"
-#include "common.cuh"
+#include "../../common.cuh"
 
 
 __host__ __device__ Polyhedron::Polyhedron(Face *faces, int n_of_faces) :

diff --git a/src/Polyhedron.cuh → ...mulation_objects/geometric/Polyhedron.cuh b/src/Polyhedron.cuh → ...mulation_objects/geometric/Polyhedron.cuh
diff --git a/src/SpacePoint.cu → ...imulation_objects/geometric/SpacePoint.cu b/src/SpacePoint.cu → ...imulation_objects/geometric/SpacePoint.cu
diff --git a/src/SpacePoint.cuh → ...mulation_objects/geometric/SpacePoint.cuh b/src/SpacePoint.cuh → ...mulation_objects/geometric/SpacePoint.cuh