From 36cbc7f7777776842ffe04e28e34989098493b77 Mon Sep 17 00:00:00 2001 From: Oliver Sander <sander@igpm.rwth-aachen.de> Date: Fri, 12 Jul 2013 13:45:32 +0000 Subject: [PATCH] remove trailing whitespace [[Imported from SVN: r9303]] --- dune/gfe/targetspacertrsolver.cc | 42 ++++++++++++++++---------------- dune/gfe/targetspacertrsolver.hh | 10 ++++---- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dune/gfe/targetspacertrsolver.cc b/dune/gfe/targetspacertrsolver.cc index e05bcbf5..bd50c876 100644 --- a/dune/gfe/targetspacertrsolver.cc +++ b/dune/gfe/targetspacertrsolver.cc @@ -55,10 +55,10 @@ void TargetSpaceRiemannianTRSolver<TargetSpace>::solve() // Trust-Region Solver // ///////////////////////////////////////////////////// for (int i=0; i<maxTrustRegionSteps_; i++) { - + if (this->verbosity_ == Solver::FULL) { std::cout << "----------------------------------------------------" << std::endl; - std::cout << " Trust-Region Step Number: " << i + std::cout << " Trust-Region Step Number: " << i << ", radius: " << trustRegion.radius() << ", energy: " << assembler_->value(x_) << std::endl; std::cout << "----------------------------------------------------" << std::endl; @@ -77,19 +77,19 @@ void TargetSpaceRiemannianTRSolver<TargetSpace>::solve() rhs *= -1; dynamic_cast<LinearIterationStep<MatrixType,CorrectionType>*>(innerSolver_->iterationStep_)->setProblem(hesseMatrix, corr, rhs); - + dynamic_cast<TrustRegionGSStep<MatrixType,CorrectionType>*>(innerSolver_->iterationStep_)->obstacles_ = &trustRegion.obstacles(); - + innerSolver_->preprocess(); - + // ///////////////////////////// // Solve ! // ///////////////////////////// - + innerSolver_->solve(); - + corr = innerSolver_->iterationStep_->getSol(); - + if (this->verbosity_ == NumProc::FULL) std::cout << "Infinity norm of the correction: " << corr.infinity_norm() << std::endl; @@ -101,18 +101,18 @@ void TargetSpaceRiemannianTRSolver<TargetSpace>::solve() std::cout << i+1 << " trust-region steps were taken." << std::endl; break; } - + // //////////////////////////////////////////////////// // Check whether trust-region step can be accepted // //////////////////////////////////////////////////// - + TargetSpace newIterate = x_; newIterate = TargetSpace::exp(newIterate, corr[0]); - + /** \todo Don't always recompute oldEnergy */ double oldEnergy = assembler_->value(x_); - double energy = assembler_->value(newIterate); - + double energy = assembler_->value(newIterate); + // compute the model decrease // It is $ m(x) - m(x+s) = -<g,s> - 0.5 <s, Hs> // Note that rhs = -g @@ -120,16 +120,16 @@ void TargetSpaceRiemannianTRSolver<TargetSpace>::solve() tmp = 0; hesseMatrix.umv(corr, tmp); double modelDecrease = (rhs*corr) - 0.5 * (corr*tmp); - + if (this->verbosity_ == NumProc::FULL) { - std::cout << "Absolute model decrease: " << modelDecrease + std::cout << "Absolute model decrease: " << modelDecrease << ", functional decrease: " << oldEnergy - energy << std::endl; std::cout << "Relative model decrease: " << modelDecrease / energy << ", functional decrease: " << (oldEnergy - energy)/energy << std::endl; - } + } assert(modelDecrease >= 0); - + if (energy >= oldEnergy) { if (this->verbosity_ == NumProc::FULL) printf("Richtung ist keine Abstiegsrichtung!\n"); @@ -152,22 +152,22 @@ void TargetSpaceRiemannianTRSolver<TargetSpace>::solve() // ////////////////////////////////////////////// if ( (oldEnergy-energy) / modelDecrease > 0.9) { // very successful iteration - + x_ = newIterate; trustRegion.scale(2); - + } else if ( (oldEnergy-energy) / modelDecrease > 0.01 || std::abs(oldEnergy-energy) < 1e-12) { // successful iteration x_ = newIterate; - + } else { // unsuccessful iteration trustRegion.scale(0.5); if (this->verbosity_ == NumProc::FULL) std::cout << "Unsuccessful iteration!" << std::endl; } - + // Write current energy if (this->verbosity_ == NumProc::FULL) std::cout << "--- Current energy: " << energy << " ---" << std::endl; diff --git a/dune/gfe/targetspacertrsolver.hh b/dune/gfe/targetspacertrsolver.hh index 16e776a8..435b4035 100644 --- a/dune/gfe/targetspacertrsolver.hh +++ b/dune/gfe/targetspacertrsolver.hh @@ -8,13 +8,13 @@ #include <dune/solvers/iterationsteps/trustregiongsstep.hh> #include <dune/solvers/norms/energynorm.hh> -/** \brief Riemannian trust-region solver for geodesic finite-element problems +/** \brief Riemannian trust-region solver for geodesic finite-element problems \tparam TargetSpace The manifold that our functions take values in */ template <class TargetSpace> -class TargetSpaceRiemannianTRSolver +class TargetSpaceRiemannianTRSolver : public NumProc -{ +{ const static int blocksize = TargetSpace::TangentVector::dimension; // Centralize the field type here @@ -77,10 +77,10 @@ protected: /** \brief The iteration step for the quadratic inner problems */ std::auto_ptr<TrustRegionGSStep<MatrixType, CorrectionType> > innerSolverStep_; - + /** \brief Norm for the quadratic inner problems */ std::auto_ptr<EnergyNorm<MatrixType, CorrectionType> > energyNorm_; - + }; #include "targetspacertrsolver.cc" -- GitLab