From dc4dc3530134c97225deedfb72ac8233b2b9df92 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 13 Sep 2011 11:44:38 +0200
Subject: [PATCH] properscalar[..] -> finitescalar[..]
---
src/Makefile.am | 2 +-
...tion.hh => finitescalarincreasingconvexfunction.hh} | 10 +++++-----
src/mynonlinearity.cc | 2 +-
src/samplefunctional.hh | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
rename src/{properscalarincreasingconvexfunction.hh => finitescalarincreasingconvexfunction.hh} (71%)
diff --git a/src/Makefile.am b/src/Makefile.am
index 35aa6186..67f7cb31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ noinst_PROGRAMS = \
test_gradient_method_SOURCES = \
test-gradient-method.cc \
mynonlinearity.cc \
- properscalarincreasingconvexfunction.hh \
+ finitescalarincreasingconvexfunction.hh \
samplefunctional.hh
check-am:
diff --git a/src/properscalarincreasingconvexfunction.hh b/src/finitescalarincreasingconvexfunction.hh
similarity index 71%
rename from src/properscalarincreasingconvexfunction.hh
rename to src/finitescalarincreasingconvexfunction.hh
index 6499f7b2..a90cc0ac 100644
--- a/src/properscalarincreasingconvexfunction.hh
+++ b/src/finitescalarincreasingconvexfunction.hh
@@ -1,17 +1,17 @@
/* -*- mode:c++; mode:semantic -*- */
-#ifndef PROPER_SCALAR_INCREASING_CONVEX_FUNCTION_HH
-#define PROPER_SCALAR_INCREASING_CONVEX_FUNCTION_HH
+#ifndef FINITE_SCALAR_INCREASING_CONVEX_FUNCTION_HH
+#define FINITE_SCALAR_INCREASING_CONVEX_FUNCTION_HH
namespace Dune {
-class ProperScalarIncreasingConvexFunction {
+class FiniteScalarIncreasingConvexFunction {
public:
virtual double operator()(const double s) const = 0;
virtual double leftDifferential(const double s) const = 0;
virtual double rightDifferential(const double s) const = 0;
};
-class SampleFunction : public ProperScalarIncreasingConvexFunction {
+class SampleFunction : public FiniteScalarIncreasingConvexFunction {
public:
double operator()(const double s) const { return (s < 1) ? s : (2 * s - 1); }
@@ -20,7 +20,7 @@ class SampleFunction : public ProperScalarIncreasingConvexFunction {
double rightDifferential(const double s) const { return (s < 1) ? 1 : 2; }
};
-class TrivialFunction : public ProperScalarIncreasingConvexFunction {
+class TrivialFunction : public FiniteScalarIncreasingConvexFunction {
public:
double operator()(const double) const { return 0; }
diff --git a/src/mynonlinearity.cc b/src/mynonlinearity.cc
index 0b6489ba..b114da2d 100644
--- a/src/mynonlinearity.cc
+++ b/src/mynonlinearity.cc
@@ -11,7 +11,7 @@
#include <limits>
-#include "properscalarincreasingconvexfunction.hh"
+#include "finitescalarincreasingconvexfunction.hh"
namespace Dune {
template <int dimension, class OuterFunction = Dune::TrivialFunction>
diff --git a/src/samplefunctional.hh b/src/samplefunctional.hh
index 211ebf71..6f7033f9 100644
--- a/src/samplefunctional.hh
+++ b/src/samplefunctional.hh
@@ -11,7 +11,7 @@
#include <dune/tnnmg/problem-classes/directionalconvexfunction.hh>
#include "mynonlinearity.cc"
-#include "properscalarincreasingconvexfunction.hh"
+#include "finitescalarincreasingconvexfunction.hh"
namespace Dune {
template <int dimension, class Function = TrivialFunction>
--
GitLab