From e391a7b210844a7e8a32fe4d7ef4495ae0132394 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 28 Jun 2013 12:17:19 +0200
Subject: [PATCH] rename: descDir -> v
---
dune/tectonic/minimisation.hh | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/dune/tectonic/minimisation.hh b/dune/tectonic/minimisation.hh
index 7d26a015..37475bd9 100644
--- a/dune/tectonic/minimisation.hh
+++ b/dune/tectonic/minimisation.hh
@@ -14,7 +14,7 @@ namespace Dune {
template <class Functional>
void descentMinimisation(Functional const &J,
typename Functional::SmallVector &x,
- typename Functional::SmallVector const &descDir,
+ typename Functional::SmallVector const &v,
Bisection const &bisection) {
using SmallVector = typename Functional::SmallVector;
using LocalNonlinearityType = typename Functional::NonlinearityType;
@@ -27,15 +27,15 @@ void descentMinimisation(Functional const &J,
since A is symmetric.
*/
- SmallVector tmp = J.b; // b
- J.A.mmv(x, tmp); // b-Au
- double const JRestb = tmp * descDir; // <b-Au,v>
+ SmallVector tmp = J.b; // b
+ J.A.mmv(x, tmp); // b-Au
+ double const JRestb = tmp * v; // <b-Au,v>
- J.A.mv(descDir, tmp); // Av
- double const JRestA = tmp * descDir; // <Av,v>
+ J.A.mv(v, tmp); // Av
+ double const JRestA = tmp * v; // <Av,v>
- MyDirectionalConvexFunction<LocalNonlinearityType> const JRest(
- JRestA, JRestb, *J.phi, x, descDir);
+ MyDirectionalConvexFunction<LocalNonlinearityType> const JRest(JRestA, JRestb,
+ *J.phi, x, v);
// }}}
{ // Debug
@@ -66,7 +66,7 @@ void descentMinimisation(Functional const &J,
<< std::endl;
;
- x.axpy(stepsize, descDir);
+ x.axpy(stepsize, v);
}
template <class Functional>
@@ -75,14 +75,14 @@ void minimise(Functional const &J, typename Functional::SmallVector &x,
using SmallVector = typename Functional::SmallVector;
for (size_t step = 0; step < steps; ++step) {
- SmallVector descDir;
- J.gradient(x, descDir);
- descDir *= -1;
+ SmallVector v;
+ J.gradient(x, v);
+ v *= -1;
- if (descDir.two_norm() < 1e-14) // TODO: Make controllable
+ if (v.two_norm() < 1e-14) // TODO: Make controllable
return;
- descentMinimisation(J, x, descDir, bisection);
+ descentMinimisation(J, x, v, bisection);
}
}
}
--
GitLab