diff --git a/src/myblockproblem.hh b/src/myblockproblem.hh index 69e14ede21294eca9bf96003ca697ce9725c9a58..560e1d9a08ef6ae6c607a43bedeca68d0d83988e 100644 --- a/src/myblockproblem.hh +++ b/src/myblockproblem.hh @@ -25,7 +25,7 @@ template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem { typedef typename MyConvexProblemType::LocalVectorType LocalVectorType; typedef typename MyConvexProblemType::LocalMatrixType LocalMatrixType; - static const int block_size = MyConvexProblemType::block_size; + static int const block_size = MyConvexProblemType::block_size; /** \brief Solves one local system using a modified gradient method */ class IterateObject; @@ -56,27 +56,25 @@ class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject { * \param problem The problem including quadratic part and nonlinear part */ IterateObject(const Bisection& bisection, MyConvexProblemType& problem) - : problem(problem), bisection(bisection) {}; + : problem(problem), bisection(bisection) {} public: /** \brief Set the current iterate */ void setIterate(VectorType& u) { this->u = u; return; - }; + } /** \brief Update the i-th block of the current iterate */ void updateIterate(const LocalVectorType& ui, int i) { u[i] = ui; return; - }; + } - /** \brief Minimize a local problem using a scalar Gauss-Seidel method + /** \brief Minimise a local problem using a modified gradient method * \param[out] ui The solution * \param m Block number * \param ignore Set of degrees of freedom to leave untouched - * - * \return The minimizer of the local functional in the variable ui */ void solveLocalProblem( LocalVectorType& ui, int m,