Merge branch 'issue/creator_unique_ptr' into 'develop'

changed shared_ptr to unique_ptr for creators

See merge request spraetor/dune-amdis!40

src/amdis/AdaptInfo.hpp

@@ -78,7 +78,7 @@ namespace AMDiS
     explicit AdaptInfo(std::string name);
 
     /// Destructor.
-    virtual ~AdaptInfo() {}
+    virtual ~AdaptInfo() = default;
 
     /// Resets all variables to zero (or something equivalent)
     void reset();

src/amdis/CreatorInterface.hpp

@@ -24,13 +24,13 @@ namespace AMDiS
   class CreatorInterface
   {
   public:
-    virtual ~CreatorInterface() {}
+    virtual ~CreatorInterface() = default;
 
     /** \brief
      * Must be implemented by sub classes of CreatorInterface.
      * Creates a new instance of the sub class of BaseClass.
      */
-    virtual std::shared_ptr<BaseClass> create() = 0;
+    virtual std::unique_ptr<BaseClass> create() = 0;
   };
 
   /**
@@ -45,7 +45,7 @@ namespace AMDiS
   {
   public:
 
-    virtual std::shared_ptr<BaseClass> create() final
+    virtual std::unique_ptr<BaseClass> create() final
     {
       error_exit("Should not be called. Call create(string) instead!");
       return {};
@@ -56,7 +56,7 @@ namespace AMDiS
      * Creates a new instance of the sub class of BaseClass by passing a
      * string to the constructor.
      */
-    virtual std::shared_ptr<BaseClass> create(std::string) = 0;
+    virtual std::unique_ptr<BaseClass> create(std::string) = 0;
   };
 
 

src/amdis/LocalAssemblerBase.hpp

@@ -33,7 +33,7 @@ namespace AMDiS
 
   public:
     /// Virtual destructor
-    virtual ~LocalAssemblerBase() {}
+    virtual ~LocalAssemblerBase() = default;
 
     /// Bind the local-assembler to the grid-element with its corresponding geometry
     virtual void bind(Element const& element, Geometry const& geometry) = 0;

src/amdis/QuadratureFactory.hpp

@@ -17,7 +17,7 @@ namespace AMDiS
     using QuadratureRule = Dune::QuadratureRule<ctype, dimension>;
 
   public:
-    virtual ~QuadratureFactory() {}
+    virtual ~QuadratureFactory() = default;
 
     /// Bind the rule to a localFunction
     virtual void bind(LocalFunction const& localFct)

src/amdis/io/FileWriterInterface.hpp

@@ -24,7 +24,7 @@ namespace AMDiS
       Parameters::get(base + "->name", name_);
     }
 
-    virtual ~FileWriterInterface() {}
+    virtual ~FileWriterInterface() = default;
 
 
     // pure virtual method to be implemented by derived classes

src/amdis/linear_algebra/LinearSolver.hpp

@@ -32,9 +32,9 @@ namespace AMDiS
     /// A creator to be used instead of the constructor.
     struct Creator : CreatorInterfaceName<Super>
     {
-      virtual std::shared_ptr<Super> create(std::string prefix) override
+      virtual std::unique_ptr<Super> create(std::string prefix) override
       {
-        return std::make_shared<Self>(prefix);
+        return std::make_unique<Self>(prefix);
       }
     };
 

src/amdis/linear_algebra/eigen/SolverCreator.hpp

@@ -30,7 +30,7 @@ namespace AMDiS
     using SolverBase = LinearSolverInterface<Matrix, VectorX, VectorB>;
     using Scalar = typename Matrix::Scalar;
 
-    virtual std::shared_ptr<SolverBase> create(std::string prefix) override
+    virtual std::unique_ptr<SolverBase> create(std::string prefix) override
     {
       // get creator string for preconditioner
       std::string precon = "no";
@@ -62,7 +62,7 @@ namespace AMDiS
     using IncompleteCholesky =
       SolverCreator<Eigen::IncompleteCholesky<Scalar, Eigen::Lower|Eigen::Upper, Ordering>>;
 
-    std::shared_ptr<SolverBase> createIncompleteCholesky(std::string const& prefix) const
+    std::unqiue_ptr<SolverBase> createIncompleteCholesky(std::string const& prefix) const
     {
       std::string ordering = "amd";
       Parameters::get(prefix + "->precon->ordering", ordering);

src/amdis/linear_algebra/istl/ISTL_Preconditioner.hpp

@@ -30,9 +30,9 @@ namespace AMDiS
 
     struct Creator : CreatorInterfaceName<Super>
     {
-      virtual std::shared_ptr<Super> create(std::string prefix) override
+      virtual std::unique_ptr<Super> create(std::string prefix) override
       {
-        return std::make_shared<Self>(prefix);
+        return std::make_unique<Self>(prefix);
       }
     };
 

src/amdis/linear_algebra/mtl/Preconditioner.hpp

@@ -20,9 +20,9 @@ namespace AMDiS
     /// A creator to be used instead of the constructor.
     struct Creator : CreatorInterface<Super>
     {
-      virtual std::shared_ptr<Super> create() override
+      virtual std::unique_ptr<Super> create() override
       {
-        return std::make_shared<Self>();
+        return std::make_unique<Self>();
       }
     };