Merge branch 'issue/copyable_standarditeration' into 'master'

make StandardProblemIteration copyable

See merge request !65

src/amdis/ProblemStat.hpp

@@ -49,7 +49,7 @@ namespace AMDiS
   template <class Traits>
   class ProblemStat
       : public ProblemStatBase
-      , public StandardProblemIteration
+      , public StandardProblemIterationAdaptor<ProblemStat<Traits>>
   {
     using Self = ProblemStat;
 
@@ -81,8 +81,7 @@ namespace AMDiS
      * access values corresponding to this problem in the parameter file.
      **/
     explicit ProblemStat(std::string const& name)
-      : StandardProblemIteration(dynamic_cast<ProblemStatBase&>(*this))
-      , name_(name)
+      : name_(name)
     {}
 
     /// Constructor taking additionally a reference to a grid that is used

src/amdis/StandardProblemIteration.hpp

@@ -53,4 +53,44 @@ namespace AMDiS
     ProblemStatBase& problem_;
   };
 
+
+  /// \brief StandardProblemIteration when derived from ProblemStat
+  /**
+   * Use this adaptor when multiple inheritance is used:
+   * ```
+   * class Problem
+   *     : public ProblemStatBase
+   *     : StandardProblemIterationAdaptor<Problem>
+   * {};
+   * ```
+   *
+   * **Requirements:**
+   * - Model must be derived from ProblemStatBase and from StandardProblemIterationAdaptor
+   **/
+  template <class Model>
+  class StandardProblemIterationAdaptor
+      : public StandardProblemIteration
+  {
+    template <class Self>
+    static ProblemStatBase& asProblemStatBase(Self& self)
+    {
+      Model& model = static_cast<Model&>(self);
+      return dynamic_cast<ProblemStatBase&>(model);
+    }
+
+  public:
+    StandardProblemIterationAdaptor()
+      : StandardProblemIteration(asProblemStatBase(*this))
+    {}
+
+    StandardProblemIterationAdaptor(StandardProblemIterationAdaptor const&)
+      : StandardProblemIteration(asProblemStatBase(*this))
+    {}
+
+    StandardProblemIterationAdaptor(StandardProblemIterationAdaptor&&)
+      : StandardProblemIteration(asProblemStatBase(*this))
+    {}
+  };
+
+
 } // end namespace AMDiS

test/ProblemStatTest.cpp

 #include <amdis/AMDiS.hpp>
+#include <amdis/AdaptStationary.hpp>
 #include <amdis/LocalOperators.hpp>
 #include <amdis/ProblemStat.hpp>
 
@@ -21,6 +22,19 @@ void test()
   prob.addMatrixOperator(sot(T(1)), 0, 0);
   prob.addVectorOperator(zot(T(1)), 0);
   prob.addDirichletBC(BoundaryType{1}, 0,0, T(0));
+
+
+  AdaptInfo adaptInfo("adapt");
+
+  // test copy constructor of problem
+  auto prob2(prob);
+  AdaptStationary adaptStat2("adapt", prob2, adaptInfo);
+  adaptStat2.adapt();
+
+  // test move constructor of problem
+  auto prob3(std::move(prob2));
+  AdaptStationary adaptStat3("adapt", prob3, adaptInfo);
+  adaptStat3.adapt();
 }
 
 int main(int argc, char** argv)