refactored assemble classes (constructor class printinfo now)

mlmc/src/assemble/DGEllipticAssemble.hpp

@@ -5,6 +5,7 @@
 #include "elements/Elements.hpp"
 #include "IStochasticEllipticAssemble.hpp"
 
+
 class DGEllipticAssemble : public IStochasticEllipticAssemble {
 protected:
     DGDiscretization *disc;
@@ -15,21 +16,23 @@ protected:
 public:
     DGEllipticAssemble(IDiscretization *disc, IStochasticEllipticProblem *problem)
         : IStochasticEllipticAssemble(problem),
-        disc(dynamic_cast<DGDiscretization *> (disc)) {
+          disc(dynamic_cast<DGDiscretization *> (disc)) {
         config.get("penalty", penalty);
         config.get("sign", sign);
+        PrintInfo();
     }
 
-    IDiscretization *GetDisc() override {
+    IDiscretization *GetDisc() const override {
         return disc;
     };
 
     void PrintInfo() const override {
         mout.PrintInfo("Assemble", verbose,
                        PrintInfoEntry("Assemble Name", Name()),
+                       PrintInfoEntry("Discretization", GetDisc()->Name()),
+                       PrintInfoEntry("Problem", GetProblem()->Name()),
                        PrintInfoEntry("penalty", penalty),
-                       PrintInfoEntry("sign", sign),
-                       PrintInfoEntry("Problem", problem->Name()));
+                       PrintInfoEntry("sign", sign));
     }
 
     const char *Name() const override;
@@ -71,7 +74,6 @@ public:
     virtual void SetFlux(const Vector &u, Vector &flux) override;
 
     void AssembleTransfer(TransferMatrix &TM) const override;
-
 };
 
 #endif

mlmc/src/assemble/HybridEllipticAssemble.hpp

@@ -8,9 +8,11 @@
 class HybridEllipticAssemble : public MixedEllipticAssemble {
 public:
     HybridEllipticAssemble(IDiscretization *disc, IStochasticEllipticProblem *problem)
-        : MixedEllipticAssemble(disc, problem) {}
+        : MixedEllipticAssemble(disc, problem) {
+        PrintInfo();
+    }
 
-    virtual IDiscretization *GetDisc() override {
+    virtual IDiscretization *GetDisc() const override {
         return disc;
     }
 

mlmc/src/assemble/IStochasticEllipticAssemble.hpp

@@ -10,26 +10,28 @@ typedef std::pair<double, double> FluxPair;
 
 class IStochasticEllipticAssemble : public IAssemble {
 protected:
-    InfoEntries entries;
-
     IStochasticEllipticProblem *problem;
 
 public:
     explicit IStochasticEllipticAssemble(IStochasticEllipticProblem *problem) :
-        problem(problem) {
-        InfoEntries problemEntries = problem->GetInfoEntries();
-//        entries.insert(entries.end(), problemEntries.begin(), problemEntries.end());
-    };
+        problem(problem) {};
 
     void DrawSample(const SampleID &id) {
         problem->DrawSample(id);
     }
 
-    IStochasticProblem *GetProblem() {
+    IStochasticProblem *GetProblem() const {
         return problem;
     };
 
-    virtual IDiscretization *GetDisc() = 0;
+    virtual IDiscretization *GetDisc() const = 0;
+
+    virtual void PrintInfo() const override {
+        mout.PrintInfo("Assemble", verbose,
+                       PrintInfoEntry("Assemble Name", Name()),
+                       PrintInfoEntry("Discretization", GetDisc()->Name()),
+                       PrintInfoEntry("Problem", GetProblem()->Name()));
+    }
 
     virtual ~IStochasticEllipticAssemble() = default;;
 
@@ -110,14 +112,6 @@ public:
                            PrintInfoEntry("Right Outflow", outflowLeftRight.second));
         }
     }
-
-    InfoEntries GetInfoEntries() const {
-        return entries;
-    }
-
-    void PrintInfo() const override {
-        mout.PrintInfo("Assemble", verbose, GetInfoEntries());
-    }
 };
 
 #endif //ISTOCHASTICELLIPTICASSEMBLE_HPP

mlmc/src/assemble/LagrangeEllipticAssemble.hpp

@@ -12,9 +12,11 @@ protected:
 
 public:
     LagrangeEllipticAssemble(IDiscretization *disc, IStochasticEllipticProblem *problem)
-        : IStochasticEllipticAssemble(problem), disc(disc) {}
+        : IStochasticEllipticAssemble(problem), disc(disc) {
+        PrintInfo();
+    }
 
-    IDiscretization *GetDisc() override {
+    IDiscretization *GetDisc() const override {
         return disc;
     };
 

mlmc/src/assemble/MixedEllipticAssemble.hpp

@@ -13,9 +13,11 @@ protected:
 
 public:
     MixedEllipticAssemble(IDiscretization *disc, IStochasticEllipticProblem *problem) :
-        IStochasticEllipticAssemble(problem), disc(disc) {};
+        IStochasticEllipticAssemble(problem), disc(disc) {
+        PrintInfo();
+    };
 
-    IDiscretization *GetDisc() override {
+    IDiscretization *GetDisc() const override {
         return disc;
     };