fixed imports

mlmc/src/MonteCarloLogger.h

 #ifndef MLMC__MULTILEVELMONTECARLO__HPP
 #define MLMC__MULTILEVELMONTECARLO__HPP
 
-#include "m++.h"
-
 
 class IndentedLogger {
     static IndentedLogger *instance;

mlmc/src/assemble/EllipticAssemble.h

 #ifndef _LAPLACE_H_
 #define _LAPLACE_H_
 
-#include "m++.h"
 #include "problem/StochasticEllipticProblem.hpp"
+#include "discretization/Discretization.h"
+#include "Assemble.h"
+#include "elements/Elements.h"
 #include <memory>
 
 

mlmc/src/mc/MonteCarlo.hpp

 #ifndef MLMC_MC_HPP
 #define MLMC_MC_HPP
 
-#include "m++.h"
 #include "stochastics/StochasticField.h"
 #include "utils/IndentedLogger.hpp"
 

mlmc/src/problem/StochasticProblem.hpp

 #ifndef STOCHASTICPROBLEM_HPP
 #define STOCHASTICPROBLEM_HPP
 
-#include "m++.h"
+#include "Algebra.h"
 
 
 class StochasticProblem {

mlmc/src/stochastics/CovarianceFunction.h

 #ifndef M_COVARIANCEFUNCTION_H
 #define M_COVARIANCEFUNCTION_H
 
+#include "Config.hpp"
+
 class CovarianceFunction {
 public:
     double sigma = 1.0;

mlmc/src/stochastics/HybridFluxGenerator.h

@@ -5,6 +5,7 @@
 #include "CirculantEmbedding.h"
 #include "assemble/HybridEllipticAssemble.h"
 #include "problem/StochasticEllipticProblem.hpp"
+#include "Newton.h"
 
 
 class HybridFluxGenerator : public SampleGenerator {

mlmc/src/stochastics/RNManager.h

@@ -2,7 +2,6 @@
 #define MLMC_RNG_UTILITIES_HPP
 
 #include "sprng_cpp.h"
-#include "m++.h"
 #include <math.h>
 
 #define PI 3.14159265358979323846

mlmc/src/stochastics/SampleGenerator.h

@@ -3,7 +3,6 @@
 
 #include <utility>
 
-#include "m++.h"
 #include "utils/IndentedLogger.hpp"
 #include "utils/MultilevelPlotter.hpp"
 

mlmc/src/utils/IndentedLogger.hpp

 #ifndef MLMC__MULTILEVELMONTECARLO__HPP
 #define MLMC__MULTILEVELMONTECARLO__HPP
 
-#include "m++.h"
-
+#include <string>
+#include "TimeDate.h"
+#include <vector>
 
 class IndentedLogger {
 private:
     static IndentedLogger *instance;
 
-    string indent = "";
+    std::string indent = "";
 
-    const string defaultIndent = "   ";
+    const std::string defaultIndent = "   ";
 
-    vector<Date> timestamps;
+    std::vector<Date> timestamps;
 
 public:
     static IndentedLogger *GetInstance() {
@@ -29,25 +30,25 @@ public:
         indent = indent.append(defaultIndent);
     }
 
-    void StartMethod(const string &msg, int verbose) {
+    void StartMethod(const std::string &msg, int verbose) {
         Date start;
         timestamps.push_back(start);
-        vout (1) << indent << "<" << msg << ">" << endl;
+//        vout (1) << indent << "<" << msg << ">" << endl;
         IncreaseIndent();
     }
 
     void EndMethod(int verbose) {
         DecreaseIndent();
-        vout (1) << indent << "<End after " << Date() - timestamps.back() << ">" << endl;
+//        std::cout << indent << "<End after " << Date() - timestamps.back() << ">" << endl;
         timestamps.erase(std::prev(timestamps.end())); // TODO
     }
 
-    void InnerMsg(const string &msg, int verbose) {
-        vout (1) << indent << msg << endl;
+    void InnerMsg(const std::string &msg, int verbose) {
+//        std::cout << indent << msg << endl;
     }
 
-    void LogMsgFlush(const string &msg, int verbose) {
-        vout(1) << "\r" << indent << msg;
+    void LogMsgFlush(const std::string &msg, int verbose) {
+//        std::cout << "\r" << indent << msg;
     }
 };