diff --git a/dune/tectonic/samplefunctional.hh b/dune/tectonic/samplefunctional.hh index 780d0d70b36726fa1cbcaa3a2e53785ffa6049ef..d2779321c26a22d62af3efcc3722262109745f4b 100644 --- a/dune/tectonic/samplefunctional.hh +++ b/dune/tectonic/samplefunctional.hh @@ -175,9 +175,8 @@ void minimise(Functional const J, typename Functional::SmallVector &x, J.A.mmv(x, tmp); // b-Au double const JRestb = tmp * descDir; // <b-Au,v> - typedef MyDirectionalConvexFunction<LocalNonlinearityType> - MyDirectionalConvexFunctionType; - MyDirectionalConvexFunctionType JRest(JRestA, JRestb, *J.phi, x, descDir); + MyDirectionalConvexFunction<LocalNonlinearityType> JRest( + JRestA, JRestb, *J.phi, x, descDir); // }}} { // Debug @@ -215,8 +214,7 @@ void minimise(Functional const J, typename Functional::SmallVector &x, Bisection slowBisection(bisection); slowBisection.setFastQuadratic(false); - typedef CurvedFunction<LocalNonlinearityType> MyCurvedFunctionType; - MyCurvedFunctionType JRest(J.A, J.b, *J.phi, x, descDir); + CurvedFunction<LocalNonlinearityType> JRest(J.A, J.b, *J.phi, x, descDir); int count; double const stepsize = slowBisection.minimize(JRest, 0.0, 1.0, count);