Rename: CurvedFunction -> CircularConvexFunction

dune/tectonic/curvedfunction.hh → dune/tectonic/circularconvexfunction.hh

-#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; }

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);