From 52ffd3f9b5bdb9de8dc226350de485c96df85092 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sat, 10 Sep 2011 23:00:17 +0200
Subject: [PATCH] Whitespace, typedef
---
src/bisection-example-new.cc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/bisection-example-new.cc b/src/bisection-example-new.cc
index 606fde01..f9ae1110 100644
--- a/src/bisection-example-new.cc
+++ b/src/bisection-example-new.cc
@@ -97,10 +97,11 @@ class SampleFunctional {
template <class Functional>
void minimise(const Functional J, const typename Functional::SmallVector x,
typename Functional::SmallVector &corr) {
- typename Functional::SmallVector descDir = J.descentDirection(x);
+ typedef typename Functional::SmallVector SmallVector;
+ SmallVector descDir = J.descentDirection(x);
- if (descDir == typename Functional::SmallVector(0.0)) {
- corr = typename Functional::SmallVector(0.0);
+ if (descDir == SmallVector(0.0)) {
+ corr = SmallVector(0.0);
return;
}
@@ -112,7 +113,7 @@ void minimise(const Functional J, const typename Functional::SmallVector x,
since A is symmetric.
*/
- typename Functional::SmallVector tmp;
+ SmallVector tmp;
J.A.mv(descDir, tmp); // Av
double const JRestA = tmp * descDir; // <Av,v>
@@ -120,7 +121,7 @@ void minimise(const Functional J, const typename Functional::SmallVector x,
J.A.mv(x, tmp); // Au
double const JRestb = (J.b - tmp) * descDir; // <b-Au,v>
- typedef MyNonlinearity<Functional::SmallVector::dimension,
+ typedef MyNonlinearity<SmallVector::dimension,
typename Functional::FunctionType> MyNonlinearityType;
MyNonlinearityType phi;
typedef DirectionalConvexFunction<MyNonlinearityType>
--
GitLab