moved Sample.hpp

mlmc/src/main/MultilevelPlotter.hpp

@@ -3,7 +3,7 @@
 
 #include "Plot.h"
 #include "mesh/Meshes.hpp"
-#include "utility/SampleID.hpp"
+#include "montecarlo/Sample.hpp"
 #include <memory>
 #include <sys/stat.h>
 //#include "plot/VtuPlot.h"

mlmc/src/montecarlo/EmpiricMeasures.hpp

 #ifndef EMPIRICMEASURES_HPP
 #define EMPIRICMEASURES_HPP
 
-#include "utility/SampleID.hpp"
+#include "Sample.hpp"
 
 
 struct SampleCounter {

mlmc/src/montecarlo/MonteCarlo.hpp

@@ -4,7 +4,7 @@
 #include "main/MultilevelPlotter.hpp"
 #include "EmpiricMeasures.hpp"
 #include "PDESolver.hpp"
-#include "utility/SampleID.hpp"
+#include "Sample.hpp"
 #include "assemble/IStochasticAssemble.hpp"
 
 

mlmc/src/montecarlo/PDESolver.hpp

 #ifndef PDESOLVER_HPP
 #define PDESOLVER_HPP
 
-#include "utility/SampleID.hpp"
+#include "Sample.hpp"
 #include "solver/Solver.h"
 #include "solver/Newton.h"
 #include "timestepping/TimeIntegrator.hpp"

mlmc/src/utility/SampleID.hpp → mlmc/src/montecarlo/Sample.hpp

-#ifndef SAMPLEID_HPP
-#define SAMPLEID_HPP
+#ifndef SAMPLE_HPP
+#define SAMPLE_HPP
 
 #include "Algebra.h"
 #include <string>
@@ -7,7 +7,9 @@
 
 struct SampleID {
     int level;
+
     int number;
+
     bool coarse;
 
     std::string Str() const {
@@ -20,16 +22,14 @@ struct SampleID {
 struct SampleSolution {
     SampleID id;
 
-    int mGraphLevel;
-
     double Q;
 
     double Cost;
 
     Vector U;
 
-    SampleSolution(MatrixGraphs &solMGraphs, int mGraphLevel) :
-        U(Vector(solMGraphs[mGraphLevel])) {
+    SampleSolution(MatrixGraphs &solMGraphs, int mGlevel) :
+        U(Vector(solMGraphs[mGlevel])) {
         Init();
     }
 
@@ -40,4 +40,4 @@ struct SampleSolution {
     }
 };
 
-#endif //SAMPLEID_HPP
+#endif //SAMPLE_HPP

mlmc/src/problem/StochasticProblem.hpp

@@ -2,7 +2,7 @@
 #define STOCHASTICPROBLEM_HPP
 
 #include "Algebra.h"
-#include "utility/SampleID.hpp"
+#include "montecarlo/Sample.hpp"
 #include "stochastics/SampleGenerator.hpp"
 #include "main/Utils.hpp"
 

mlmc/src/stochastics/SampleGenerator.hpp

@@ -2,7 +2,7 @@
 #define SAMPLEGENERATOR_HPP
 
 #include "utility/Config.hpp"
-#include "utility/SampleID.hpp"
+#include "montecarlo/Sample.hpp"
 #include "mesh/Meshes.hpp"
 
 class SampleGenerator {