From 947dba5d2d5abbcc538e686b837a3aca80cd66bf Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Wed, 11 Jan 2017 22:31:22 +0100
Subject: [PATCH] Move more classes into the Dune::Solvers namespace
LinearIterationStep
IterativeSolver
QuadraticIPOptSolver
Import them back into the global namespace, too, for backward
compatibility.
---
dune/solvers/iterationsteps/lineariterationstep.hh | 10 ++++++++++
dune/solvers/solvers/iterativesolver.hh | 11 +++++++++++
dune/solvers/solvers/quadraticipopt.hh | 11 +++++++++++
3 files changed, 32 insertions(+)
diff --git a/dune/solvers/iterationsteps/lineariterationstep.hh b/dune/solvers/iterationsteps/lineariterationstep.hh
index 7836a2b9..f24443a4 100644
--- a/dune/solvers/iterationsteps/lineariterationstep.hh
+++ b/dune/solvers/iterationsteps/lineariterationstep.hh
@@ -14,6 +14,10 @@
#include "iterationstep.hh"
+namespace Dune {
+
+namespace Solvers {
+
//! Base class for iteration steps being called by an iterative linear solver
template<class MatrixType, class VectorType, class BitVectorType = Dune::Solvers::DefaultBitVector_t<VectorType> >
class LinearIterationStep : public IterationStep<VectorType, BitVectorType>,
@@ -89,4 +93,10 @@ private:
using Base::setProblem;
};
+} // namespace Solvers
+} // namespace Dune
+
+// For backward compatibility: will be removed eventually
+using Dune::Solvers::LinearIterationStep;
+
#endif
diff --git a/dune/solvers/solvers/iterativesolver.hh b/dune/solvers/solvers/iterativesolver.hh
index f6b746e6..b0fc0d15 100644
--- a/dune/solvers/solvers/iterativesolver.hh
+++ b/dune/solvers/solvers/iterativesolver.hh
@@ -9,6 +9,10 @@
#include <dune/solvers/iterationsteps/iterationstep.hh>
#include <dune/solvers/norms/norm.hh>
+namespace Dune {
+
+ namespace Solvers {
+
/** \brief Abstract base class for iterative solvers */
template <class VectorType, class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension> >
class IterativeSolver : public Solver
@@ -73,6 +77,13 @@
};
+ } // namespace Solvers
+
+} // namespace Dune
+
+// For backward compatibility: will be removed eventually
+using Dune::Solvers::IterativeSolver;
+
#include "iterativesolver.cc"
#endif
diff --git a/dune/solvers/solvers/quadraticipopt.hh b/dune/solvers/solvers/quadraticipopt.hh
index 9b87f8b8..3b9395cd 100644
--- a/dune/solvers/solvers/quadraticipopt.hh
+++ b/dune/solvers/solvers/quadraticipopt.hh
@@ -27,6 +27,10 @@
#include "IpIpoptApplication.hpp"
#include "IpSolveStatistics.hpp"
+namespace Dune {
+
+namespace Solvers {
+
/** \brief Implementation class used to pipe quadratic problems to
the IPOpt interior-point solver
@@ -777,4 +781,11 @@ void QuadraticIPOptSolver<MatrixType,VectorType,JacobianType>::solve()
DUNE_THROW(Dune::Exception, "IPOpt: Error during optimization!");
}
+} // namespace Solvers
+
+} // namespace Dune
+
+// For backward compatibility: will be removed eventually
+using Dune::Solvers::QuadraticIPOptSolver;
+
#endif
--
GitLab