Skip to content
Snippets Groups Projects
Commit 947dba5d authored by oliver.sander_at_tu-dresden.de's avatar oliver.sander_at_tu-dresden.de
Browse files

Move more classes into the Dune::Solvers namespace

LinearIterationStep
IterativeSolver
QuadraticIPOptSolver

Import them back into the global namespace, too, for backward
compatibility.
parent 08ee6440
No related branches found
No related tags found
No related merge requests found
...@@ -14,6 +14,10 @@ ...@@ -14,6 +14,10 @@
#include "iterationstep.hh" #include "iterationstep.hh"
namespace Dune {
namespace Solvers {
//! Base class for iteration steps being called by an iterative linear solver //! Base class for iteration steps being called by an iterative linear solver
template<class MatrixType, class VectorType, class BitVectorType = Dune::Solvers::DefaultBitVector_t<VectorType> > template<class MatrixType, class VectorType, class BitVectorType = Dune::Solvers::DefaultBitVector_t<VectorType> >
class LinearIterationStep : public IterationStep<VectorType, BitVectorType>, class LinearIterationStep : public IterationStep<VectorType, BitVectorType>,
...@@ -89,4 +93,10 @@ private: ...@@ -89,4 +93,10 @@ private:
using Base::setProblem; using Base::setProblem;
}; };
} // namespace Solvers
} // namespace Dune
// For backward compatibility: will be removed eventually
using Dune::Solvers::LinearIterationStep;
#endif #endif
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
#include <dune/solvers/iterationsteps/iterationstep.hh> #include <dune/solvers/iterationsteps/iterationstep.hh>
#include <dune/solvers/norms/norm.hh> #include <dune/solvers/norms/norm.hh>
namespace Dune {
namespace Solvers {
/** \brief Abstract base class for iterative solvers */ /** \brief Abstract base class for iterative solvers */
template <class VectorType, class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension> > template <class VectorType, class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension> >
class IterativeSolver : public Solver class IterativeSolver : public Solver
...@@ -73,6 +77,13 @@ ...@@ -73,6 +77,13 @@
}; };
} // namespace Solvers
} // namespace Dune
// For backward compatibility: will be removed eventually
using Dune::Solvers::IterativeSolver;
#include "iterativesolver.cc" #include "iterativesolver.cc"
#endif #endif
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
#include "IpIpoptApplication.hpp" #include "IpIpoptApplication.hpp"
#include "IpSolveStatistics.hpp" #include "IpSolveStatistics.hpp"
namespace Dune {
namespace Solvers {
/** \brief Implementation class used to pipe quadratic problems to /** \brief Implementation class used to pipe quadratic problems to
the IPOpt interior-point solver the IPOpt interior-point solver
...@@ -777,4 +781,11 @@ void QuadraticIPOptSolver<MatrixType,VectorType,JacobianType>::solve() ...@@ -777,4 +781,11 @@ void QuadraticIPOptSolver<MatrixType,VectorType,JacobianType>::solve()
DUNE_THROW(Dune::Exception, "IPOpt: Error during optimization!"); DUNE_THROW(Dune::Exception, "IPOpt: Error during optimization!");
} }
} // namespace Solvers
} // namespace Dune
// For backward compatibility: will be removed eventually
using Dune::Solvers::QuadraticIPOptSolver;
#endif #endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment