### Remove any reference to the Am member

parent af615743
 ... ... @@ -53,34 +53,7 @@ class ConvexProblem public: /** \brief Constructor with the problem components (old! deprecated?) * * \deprecated This constructor is here for backwards compatibility esp. for the use with ScalarTNNMG. * It sets a rank-1 factor of VectorType and the lowRankFactor is set to be a "zero-reference". * If you want to use the current TNNMG framework and/or low rank terms of rank greater than 1 please use the other constructor below. * * \param a A scalar factor in front of the quadratic part (the quadratic part includes a factor of 1/2 already) * \param A The matrix of the quadratic part * \param am A scalar factor in front of the optional rank-one matrix. Without rank-1 matrix this should be chosen as zero. * \param Am A rank-one matrix given by a single vector. The matrix is AmAm^T. * \param phi The nonlinearity * \param f The linear functional * \param u The solution vector */ ConvexProblem(double a, const MatrixType& A, double am, const VectorType& Am, NonlinearityType& phi, const VectorType& f, VectorType& u) : a(a), A(A), am(am), Am(Am), lowRankFactor_(*(static_cast(NULL))), phi(phi), f(f), u(u) {}; /** \brief Constructor with the problem components * * The (deprecated?!) rank-1 factor Am is set to be a "zero-reference" for compatibility reasons. * * \param a A scalar factor in front of the quadratic part (the quadratic part includes a factor of 1/2 already) * \param A The matrix of the quadratic part ... ... @@ -94,7 +67,6 @@ class ConvexProblem a(a), A(A), am(am), Am(*(static_cast(NULL))), lowRankFactor_(lowRankFactor), phi(phi), f(f), ... ... @@ -118,7 +90,6 @@ class ConvexProblem a(a), A(A), am(0.0), Am(*(static_cast(NULL))), lowRankFactor_(nullOperator_), phi(phi), f(f), ... ... @@ -156,10 +127,6 @@ class ConvexProblem const MatrixType& A; //! a scalar factor in front of the low-rank term double am; /** \brief a vector used to reconstruct a rank-1 matrix. * \deprecated This works only with the old ScalarTNNMG or custom solvers. In order to use with the current class TruncatedNonsmoothNewtonMultigrid please use the lowRankFactor_ */ const VectorType& Am; //! A single line block matrix used to reconstruct a filled in matrix of low rank. The full matrix is lowRankFactor_^T*lowRankFactor_ const LowRankFactorType& lowRankFactor_; //! the nonlinearity ... ...
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!