properscalar[..] -> finitescalar[..]

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:

src/properscalarincreasingconvexfunction.hh → src/finitescalarincreasingconvexfunction.hh

 /* -*- 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; }
 

src/mynonlinearity.cc

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

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>