From d2c8d1b655de454a3c528377c071865116153cf3 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Wed, 17 Jul 2013 18:13:58 +0200
Subject: [PATCH] [Cleanup] Rename: MyConvexProblemType -> ConvexProblemType
---
dune/tectonic/myblockproblem.hh | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh
index 4de7a709..03f6a325 100644
--- a/dune/tectonic/myblockproblem.hh
+++ b/dune/tectonic/myblockproblem.hh
@@ -28,14 +28,14 @@ double computeEnergy(
/** \brief Base class for problems where each block can be solved with a
* modified gradient method */
-template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem {
+template <class ConvexProblemTypeTEMPLATE> class MyBlockProblem {
public:
- using MyConvexProblemType = MyConvexProblemTypeTEMPLATE;
- using VectorType = typename MyConvexProblemType::VectorType;
- using MatrixType = typename MyConvexProblemType::MatrixType;
- using LocalVectorType = typename MyConvexProblemType::LocalVectorType;
- using LocalMatrixType = typename MyConvexProblemType::LocalMatrixType;
- int static const block_size = MyConvexProblemType::block_size;
+ using ConvexProblemType = ConvexProblemTypeTEMPLATE;
+ using VectorType = typename ConvexProblemType::VectorType;
+ using MatrixType = typename ConvexProblemType::MatrixType;
+ using LocalVectorType = typename ConvexProblemType::LocalVectorType;
+ using LocalMatrixType = typename ConvexProblemType::LocalMatrixType;
+ int static const block_size = ConvexProblemType::block_size;
int static const coarse_block_size = block_size;
/** \brief Solves one local system using a modified gradient method */
@@ -45,7 +45,7 @@ template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem {
static const int block_size = coarse_block_size;
using LocalMatrixType =
- typename MyBlockProblem<MyConvexProblemType>::LocalMatrixType;
+ typename MyBlockProblem<ConvexProblemType>::LocalMatrixType;
using MatrixType =
Dune::BCRSMatrix<typename Linearization::LocalMatrixType>;
using VectorType =
@@ -59,7 +59,7 @@ template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem {
};
MyBlockProblem(Dune::ParameterTree const &parset,
- MyConvexProblemType const &problem)
+ ConvexProblemType const &problem)
: parset(parset), problem(problem) {
bisection = Bisection(0.0, // acceptError: Stop if the search interval has
// become smaller than this number
@@ -200,7 +200,7 @@ template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem {
Dune::ParameterTree const &parset;
// problem data
- MyConvexProblemType const &problem;
+ ConvexProblemType const &problem;
// commonly used minimization stuff
Bisection bisection;
@@ -209,8 +209,8 @@ template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem {
};
/** \brief Solves one local system using a scalar Gauss-Seidel method */
-template <class MyConvexProblemTypeTEMPLATE>
-class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject {
+template <class ConvexProblemTypeTEMPLATE>
+class MyBlockProblem<ConvexProblemTypeTEMPLATE>::IterateObject {
friend class MyBlockProblem;
protected:
@@ -219,7 +219,7 @@ class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject {
* \param problem The problem including quadratic part and nonlinear part
*/
IterateObject(Dune::ParameterTree const &parset, Bisection const &bisection,
- MyConvexProblemType const &problem)
+ ConvexProblemType const &problem)
: problem(problem),
bisection(bisection),
localsteps(parset.get<size_t>("localsolver.steps")) {}
@@ -283,7 +283,7 @@ class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject {
private:
// problem data
- MyConvexProblemType const &problem;
+ ConvexProblemType const &problem;
// commonly used minimization stuff
Bisection bisection;
--
GitLab