removed plotting from generator

mlmc/conf/mlmc_elliptic.conf

@@ -29,7 +29,6 @@ lambda = [0.15, 0.15]
 smoothing = 1.0
 
 # ----- Plotting -----
-GeneratorPlotting = 0
 PDESolverPlotting = 0
 
 # ----- Verbose -----

mlmc/conf/mlmc_transport.conf

@@ -48,8 +48,7 @@ lambda = [0.15, 0.15]
 smoothing = 1.0
 
 # ----- Plotting -----
-GeneratorPlotting = 1
-MCPlotting = 1
+PDESolverPlotting = 1
 
 # ----- Verbose -----
 MCVerbose = 1

mlmc/conf/mlmc_vs_sg.conf

@@ -47,8 +47,7 @@ NewtonSteps = 1
 NewtonLineSearchSteps = 0
 
 # ----- Plotting -----
-GeneratorPlotting = 1
-MCPlotting = 1
+PDESolverPlotting = 1
 
 # ----- Verbose -----
 MCVerbose = 1

mlmc/src/generators/SampleGenerator.hpp

@@ -20,16 +20,12 @@ static double abs_compl(const Complex &complex) {
 template<typename T>
 class SampleGenerator {
 protected:
-  int plotting = 0;
-
   int verbose = 0;
 
   int commSplit;
 
   virtual void drawSample(const SampleID &id) = 0;
 
-  virtual void plotSample(const SampleID &id) {};
-
 public:
   Meshes &meshes; // todo make const ref or remove completely
 
@@ -45,7 +41,6 @@ public:
     mout.StartBlock(Name());
     vout(1) << id.IdString() << endl;
     drawSample(id);
-//    if (plotting) plotSample(id);
     mout.EndBlock(verbose == 0);
   }
 

mlmc/src/generators/algorithms/CirculantEmbedding.cpp

@@ -95,13 +95,6 @@ void CirculantEmbedding1D::initVec(const SampleID &id) {
   *sampleVec = 0.0;
 }
 
-void CirculantEmbedding1D::plotSample(const SampleID &id) {
-  if (sampleVec != nullptr)
-    mpp::plot(id.IdString("Kappa")) << *sampleVec << mpp::endp;
-  else
-    Exit("Vector is nullptr")
-}
-
 void CirculantEmbedding1D::drawSample(const SampleID &id) {
   initVec(id);
 
@@ -191,10 +184,6 @@ void CirculantEmbedding2D::initVec(const SampleID &id) {
   *sampleVec = 0.0;
 }
 
-void CirculantEmbedding2D::plotSample(const SampleID &id) {
-  mpp::plot(id.IdString("Kappa")) << *sampleVec << mpp::endp;
-}
-
 void CirculantEmbedding2D::drawSample(const SampleID &id) {
   initVec(id);
 

mlmc/src/generators/algorithms/CirculantEmbedding.hpp

@@ -6,7 +6,6 @@
 #include "basics/Utilities.hpp"
 #include "Algebra.hpp"
 #include "generators/NormalDistribution.hpp"
-#include "Plotting.hpp"
 #include "FFT.hpp"
 
 
@@ -41,8 +40,6 @@ private:
 protected:
   void initVec(const SampleID &id);
 
-  void plotSample(const SampleID &id) override;
-
   void drawSample(const SampleID &id) override;
 
 public:
@@ -99,8 +96,6 @@ private:
 protected:
   void initVec(const SampleID &id);
 
-  void plotSample(const SampleID &id) override;
-
   void drawSample(const SampleID &id) override;
 
 public:

mlmc/tests/TestMain.hpp

@@ -11,8 +11,7 @@ using ConfigMap = std::map<std::string, std::string>;
  *
  * Todo
  * 1D
- * kwargs={"GeneratorPlotting": 1,
-        "PDESolverPlotting": 1,
+ * kwargs={"PDESolverPlotting": 1,
         "Problem": "StochasticLaplace1D",
         "initLevels": [5, 6, 7]}
    mpp.run(4, config="mlmc_elliptic", kwargs=kwargs)
@@ -42,7 +41,6 @@ const ConfigMap DefaultEllipticConfigMap = {
     {"smoothing", "1.8"},
 
     // ----- Plotting -----
-    {"GeneratorPlotting", "1"},
     {"PDESolverPlotting", "1"},
 
     // ----- Verbose -----
@@ -96,7 +94,6 @@ const ConfigMap DefaultTransportConfigMap = {
     {"evtol", "1e-10"},
 
     // ----- Plotting -----
-    {"GeneratorPlotting", "0"},
     {"PDESolverPlotting", "0"},
 
     // ----- Verbose -----

mlmc/tests/generators/TestCirculantEmbedding.cpp

@@ -53,7 +53,6 @@ TEST_F(TestCirculantEmbedding, TestDrawSample) {
 
 int main(int argc, char **argv) {
   return MppTest(MppTestBuilder(argc, argv).
-    WithConfigEntry("GeneratorPlotting", 1).
     WithConfigEntry("GeneratorVerbose", 0).
     WithScreenLogging().
     WithPPM()