From 37be0b3aef97a7f7d163ccde4c8884398b5c5c14 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sun, 29 Jul 2012 16:31:49 +0200
Subject: [PATCH] Rename: CurvedFunction -> CircularConvexFunction
---
.../{curvedfunction.hh => circularconvexfunction.hh} | 12 ++++++------
dune/tectonic/samplefunctional.hh | 5 +++--
2 files changed, 9 insertions(+), 8 deletions(-)
rename dune/tectonic/{curvedfunction.hh => circularconvexfunction.hh} (81%)
diff --git a/dune/tectonic/curvedfunction.hh b/dune/tectonic/circularconvexfunction.hh
similarity index 81%
rename from dune/tectonic/curvedfunction.hh
rename to dune/tectonic/circularconvexfunction.hh
index 6919ee49..8e64cc6d 100644
--- a/dune/tectonic/curvedfunction.hh
+++ b/dune/tectonic/circularconvexfunction.hh
@@ -1,18 +1,18 @@
-#ifndef CURVED_FUNCTION_HH
-#define CURVED_FUNCTION_HH
+#ifndef CIRCULAR_CONVEX_FUNCTION_HH
+#define CIRCULAR_CONVEX_FUNCTION_HH
#include <cmath>
#include <dune/fufem/interval.hh>
namespace Dune {
-template <class NonlinearityType> class CurvedFunction {
+template <class NonlinearityType> class CircularConvexFunction {
typedef typename NonlinearityType::VectorType VectorType;
typedef typename NonlinearityType::MatrixType MatrixType;
public:
- CurvedFunction(MatrixType const &A, VectorType const &b,
- NonlinearityType const &phi, VectorType const &x,
- VectorType const &dir)
+ CircularConvexFunction(MatrixType const &A, VectorType const &b,
+ NonlinearityType const &phi, VectorType const &x,
+ VectorType const &dir)
: A(A), b(b), phi(phi), x(x), dir(dir) {}
double quadraticPart() const { return 0; }
diff --git a/dune/tectonic/samplefunctional.hh b/dune/tectonic/samplefunctional.hh
index b80bde69..04cb2dbd 100644
--- a/dune/tectonic/samplefunctional.hh
+++ b/dune/tectonic/samplefunctional.hh
@@ -10,7 +10,7 @@
#include "mydirectionalconvexfunction.hh"
#include "localnonlinearity.hh"
-#include "curvedfunction.hh"
+#include "circularconvexfunction.hh"
namespace Dune {
template <int dim> class SampleFunctional {
@@ -197,7 +197,8 @@ void minimise(Functional const J, typename Functional::SmallVector &x,
Bisection slowBisection(bisection);
slowBisection.setFastQuadratic(false);
- CurvedFunction<LocalNonlinearityType> JRest(J.A, J.b, *J.phi, x, descDir);
+ CircularConvexFunction<LocalNonlinearityType> JRest(J.A, J.b, *J.phi, x,
+ descDir);
int count;
double const stepsize = slowBisection.minimize(JRest, 0.0, 1.0, count);
--
GitLab