From 2b2fd14647b0898e3f1323824cc9487fd8c2a725 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 16 Sep 2011 23:40:26 +0200
Subject: [PATCH] Hide inner function from the outside world
---
src/samplefunctional.hh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/samplefunctional.hh b/src/samplefunctional.hh
index a44e2e8a..dd7c4b82 100644
--- a/src/samplefunctional.hh
+++ b/src/samplefunctional.hh
@@ -19,7 +19,6 @@ class SampleFunctional {
public:
typedef Dune::FieldVector<double, dimension> SmallVector;
typedef Dune::FieldMatrix<double, dimension, dimension> SmallMatrix;
- typedef Function FunctionType;
typedef MyNonlinearity<dimension, Function> NonlinearityType;
@@ -145,8 +144,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<SmallVector::dimension,
- typename Functional::FunctionType> MyNonlinearityType;
+ typedef typename Functional::NonlinearityType MyNonlinearityType;
MyNonlinearityType phi;
typedef DirectionalConvexFunction<MyNonlinearityType>
MyDirectionalConvexFunctionType;
--
GitLab