diff --git a/src/Makefile.am b/src/Makefile.am index f7968c83df401901d13e12caf4678f44e24ce803..db4334ceb35f93d5663b2d54e0c4d714fd8fdfee 100644 --- a/src/Makefile.am +++ b/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: diff --git a/src/mynonlinearity.hh b/src/mynonlinearity.hh index ec5cb9cb7253d085d4116711ff23d2306ca5d9a8..30185b79e90c37861e328d71c487b04dca5653f6 100644 --- a/src/mynonlinearity.hh +++ b/src/mynonlinearity.hh @@ -10,7 +10,7 @@ #include <limits> -#include "finitescalarincreasingconvexfunction.hh" +#include "nicefunction.hh" namespace Dune { template <int dimension, class OuterFunction = Dune::TrivialFunction> diff --git a/src/finitescalarincreasingconvexfunction.hh b/src/nicefunction.hh similarity index 67% rename from src/finitescalarincreasingconvexfunction.hh rename to src/nicefunction.hh index 9225c0f18d17eb61133fea55ed118e7f4e0fb849..6940ca08b1f0c7177631a986e083f88c7f0457c1 100644 --- a/src/finitescalarincreasingconvexfunction.hh +++ b/src/nicefunction.hh @@ -1,19 +1,18 @@ /* -*- 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; } diff --git a/src/samplefunctional.hh b/src/samplefunctional.hh index afecb5c3d326542d7088940c2c4965c6eb9a93f9..97fad3ed121dbbebee1b12c764ab4c19b643ce0a 100644 --- a/src/samplefunctional.hh +++ b/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>