From 095fc4ab35ecb299cb15aa5ce2bcb924af517858 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sun, 18 Sep 2011 23:15:57 +0200
Subject: [PATCH] FiniteScalarIncreasingConvexFunction->NiceFunction
---
src/Makefile.am | 2 +-
src/mynonlinearity.hh | 2 +-
...larincreasingconvexfunction.hh => nicefunction.hh} | 11 +++++------
src/samplefunctional.hh | 2 +-
4 files changed, 8 insertions(+), 9 deletions(-)
rename src/{finitescalarincreasingconvexfunction.hh => nicefunction.hh} (67%)
diff --git a/src/Makefile.am b/src/Makefile.am
index f7968c83..db4334ce 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 ec5cb9cb..30185b79 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 9225c0f1..6940ca08 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 afecb5c3..97fad3ed 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>
--
GitLab