FiniteScalarIncreasingConvexFunction->NiceFunction

src/Makefile.am

@@ -7,7 +7,7 @@ noinst_PROGRAMS = \
 test_gradient_method_SOURCES = \
 	test-gradient-method.cc \
 	mynonlinearity.hh \
-	finitescalarincreasingconvexfunction.hh \
+	nicefunction.hh \
 	samplefunctional.hh
 
 check-am:

src/mynonlinearity.hh

@@ -10,7 +10,7 @@
 
 #include <limits>
 
-#include "finitescalarincreasingconvexfunction.hh"
+#include "nicefunction.hh"
 
 namespace Dune {
 template <int dimension, class OuterFunction = Dune::TrivialFunction>

src/finitescalarincreasingconvexfunction.hh → src/nicefunction.hh

 /* -*- mode:c++; mode:semantic -*- */
 
-#ifndef FINITE_SCALAR_INCREASING_CONVEX_FUNCTION_HH
-#define FINITE_SCALAR_INCREASING_CONVEX_FUNCTION_HH
+#ifndef NICE_FUNCTION_HH
+#define NICE_FUNCTION_HH
 
 #include <dune/common/function.hh>
 
 namespace Dune {
-class FiniteScalarIncreasingConvexFunction
-    : public VirtualFunction<double, double> {
+class NiceFunction : public VirtualFunction<double, double> {
 public:
   virtual double leftDifferential(const double s) const = 0;
   virtual double rightDifferential(const double s) const = 0;
 };
 
-class SampleFunction : public FiniteScalarIncreasingConvexFunction {
+class SampleFunction : public NiceFunction {
 public:
   void evaluate(const double& x, double& y) const {
     y = (x < 1) ? x : (2 * x - 1);
@@ -24,7 +23,7 @@ class SampleFunction : public FiniteScalarIncreasingConvexFunction {
   double rightDifferential(const double s) const { return (s < 1) ? 1 : 2; }
 };
 
-class TrivialFunction : public FiniteScalarIncreasingConvexFunction {
+class TrivialFunction : public NiceFunction {
 public:
   void evaluate(const double& x, double& y) const { y = 0; }
 

src/samplefunctional.hh

@@ -11,7 +11,7 @@
 #include <dune/tnnmg/problem-classes/directionalconvexfunction.hh>
 
 #include "mynonlinearity.hh"
-#include "finitescalarincreasingconvexfunction.hh"
+#include "nicefunction.hh"
 
 namespace Dune {
 template <int dimension, class Function = TrivialFunction>