restructured project

CMakeLists.txt

@@ -25,12 +25,11 @@ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/data/vtu)
 #find_package(FFTW3 REQUIRED)   (Can't be found but still seems to link in)
 link_directories(${PROJECT_SOURCE_DIR}/sprng5/lib)
 
-# Include directories
+# Include directories -> Todo move to kernel
 include_directories(${PROJECT_SOURCE_DIR}/sprng5/include)
-include_directories(${PROJECT_SOURCE_DIR}/mlmc/src)
 
 # Subdirectories
-add_subdirectory(mlmc/src)
+add_mpp_subdirectory(${PROJECT_SOURCE_DIR}/mlmc/src/)
 
 # Executables
 add_executable(MLMC-M++ mlmc/src/Main.cpp)

mlmc/src/CMakeLists.txt

-include_directories(basics)
 add_subdirectory(basics)
-
-include_directories(generators)
-include_directories(generators/algorithms)
 add_subdirectory(generators)
-
-include_directories(problems)
 add_subdirectory(problems)
-
-include_directories(pdesolver)
 add_subdirectory(pdesolver)
-
-include_directories(montecarlo)
-add_subdirectory(montecarlo)
+add_subdirectory(estimators)

mlmc/src/Main.hpp

 #ifndef MAIN_HPP
 #define MAIN_HPP
 
-#include "montecarlo/MultilevelMonteCarlo.hpp"
+#include "MultilevelMonteCarlo.hpp"
 
 
 

mlmc/src/basics/CMakeLists.txt

 add_library(BASICS STATIC
-        Level.cpp
         Utilities.cpp
         )
 target_link_libraries(BASICS MPP_LIBRARIES)
\ No newline at end of file

mlmc/src/basics/Level.cpp

-#include "Level.hpp"
-

mlmc/src/basics/Level.hpp

@@ -2,6 +2,7 @@
 #define LEVEL_HPP
 
 #include "Logging.hpp"
+
 #include <vector>
 #include <map>
 

mlmc/src/estimators/IEstimator.hpp

+#ifndef IESTIMATOR_HPP
+#define IESTIMATOR_HPP
+
+#endif //IESTIMATOR_HPP

mlmc/src/montecarlo/MonteCarlo.hpp → mlmc/src/estimators/MonteCarlo.hpp

 #ifndef MLMC_MC_HPP
 #define MLMC_MC_HPP
 
-#include "montecarlo/datastructure/WelfordAggregate.hpp"
-#include "pdesolver/PDESolverCreator.hpp"
+#include "WelfordAggregate.hpp"
+#include "PDESolverCreator.hpp"
 
-#include "mesh/MeshesCreator.hpp"
+#include "MeshesCreator.hpp"
 
 
 class MonteCarlo {

mlmc/src/montecarlo/MultilevelMonteCarlo.hpp → mlmc/src/estimators/MultilevelMonteCarlo.hpp

 #ifndef MULTILEVELMONTECARLO_HPP
 #define MULTILEVELMONTECARLO_HPP
 
-#include "montecarlo/MonteCarlo.hpp"
-#include "montecarlo/datastructure/EmpiricMeasureLevelMaps.hpp"
-#include "montecarlo/datastructure/Exponents.hpp"
-#include "montecarlo/datastructure/Errors.hpp"
-#include "basics/Utilities.hpp"
-
-
-/*
- * Use Typedef for Level
- * Levels ist std::vector<int>
- *
- *
- */
+#include "MonteCarlo.hpp"
+#include "EmpiricMeasureLevelMaps.hpp"
+#include "Exponents.hpp"
+#include "Errors.hpp"
+#include "Utilities.hpp"
 
 
 

mlmc/src/estimators/MultilevelStochasticCollocation.cpp

+//
+// Created by niklas on 11.05.21.
+//
+
+#include "MultilevelStochasticCollocation.hpp"

mlmc/src/estimators/MultilevelStochasticCollocation.hpp

+#ifndef MULTILEVELSTOCHASTICCOLLOCATION_HPP
+#define MULTILEVELSTOCHASTICCOLLOCATION_HPP
+
+class MultilevelStochasticCollocation {
+};
+
+#endif //MULTILEVELSTOCHASTICCOLLOCATION_HPP

mlmc/src/estimators/StochasticCollocation.cpp

+//
+// Created by niklas on 11.05.21.
+//
+
+#include "StochasticCollocation.hpp"

mlmc/src/estimators/StochasticCollocation.hpp

+#ifndef STOCHASTICCOLLOCATION_HPP
+#define STOCHASTICCOLLOCATION_HPP
+
+class StochasticCollocation {
+};
+
+#endif //STOCHASTICCOLLOCATION_HPP

mlmc/src/montecarlo/datastructure/EmpiricMeasureLevelMaps.hpp → mlmc/src/estimators/datastructure/EmpiricMeasureLevelMaps.hpp

@@ -2,8 +2,9 @@
 #define EMPIRICMEASURELEVELMAPS_HPP
 
 #include "WelfordAggregate.hpp"
-#include "basics/Level.hpp"
-#include "montecarlo/MonteCarlo.hpp"
+#include "Level.hpp"
+#include "MonteCarlo.hpp"
+
 #include <math.h>