From a64d71d7821e27f4355b2db25f7c145e1b1e3251 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Thu, 3 Nov 2011 01:52:12 +0100
Subject: [PATCH] MyNonlinearity -> LocalNonlinearity
---
dune/tectonic/globalnonlinearity.hh | 2 +-
...mynonlinearity.hh => localnonlinearity.hh} | 8 +++----
dune/tectonic/myblockproblem.hh | 4 ++--
dune/tectonic/samplefunctional.hh | 10 ++++-----
src/octave/duneevaluate.cc | 2 +-
src/octave/duneminimise.cc | 2 +-
src/test-gradient-method.cc | 22 +++++++++----------
7 files changed, 25 insertions(+), 25 deletions(-)
rename dune/tectonic/{mynonlinearity.hh => localnonlinearity.hh} (90%)
diff --git a/dune/tectonic/globalnonlinearity.hh b/dune/tectonic/globalnonlinearity.hh
index 2dc0a29b..3d118ce0 100644
--- a/dune/tectonic/globalnonlinearity.hh
+++ b/dune/tectonic/globalnonlinearity.hh
@@ -5,7 +5,7 @@
//#include <dune/common/bitsetvector.hh>
#include <dune/common/fvector.hh>
-#include <dune/tectonic/mynonlinearity.hh>
+#include <dune/tectonic/localnonlinearity.hh>
namespace Dune {
template <int dim, class OuterFunctionType> class GlobalNonlinearity {
diff --git a/dune/tectonic/mynonlinearity.hh b/dune/tectonic/localnonlinearity.hh
similarity index 90%
rename from dune/tectonic/mynonlinearity.hh
rename to dune/tectonic/localnonlinearity.hh
index d68bb829..6a1554d1 100644
--- a/dune/tectonic/mynonlinearity.hh
+++ b/dune/tectonic/localnonlinearity.hh
@@ -1,7 +1,7 @@
/* -*- mode:c++; mode:semantic -*- */
-#ifndef MYNONLINEARITY_HH
-#define MYNONLINEARITY_HH
+#ifndef LOCAL_NONLINEARITY_HH
+#define LOCAL_NONLINEARITY_HH
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
@@ -13,12 +13,12 @@
#include "nicefunction.hh"
namespace Dune {
-template <int dimension> class MyNonlinearity {
+template <int dimension> class LocalNonlinearity {
public:
typedef FieldVector<double, dimension> VectorType;
typedef FieldMatrix<double, dimension, dimension> MatrixType;
- MyNonlinearity(NiceFunction const &func) : func_(func) {}
+ LocalNonlinearity(NiceFunction const &func) : func_(func) {}
double operator()(VectorType const x) const {
double ret;
diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh
index 54f7f66c..7c3a9882 100644
--- a/dune/tectonic/myblockproblem.hh
+++ b/dune/tectonic/myblockproblem.hh
@@ -9,7 +9,7 @@
#include <dune/tnnmg/problem-classes/bisection.hh>
#include <dune/tnnmg/problem-classes/onedconvexfunction.hh>
-#include "mynonlinearity.hh"
+#include "localnonlinearity.hh"
#include "nicefunction.hh"
#include "samplefunctional.hh"
@@ -99,7 +99,7 @@ class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject {
FunctionType f;
problem.newphi.restriction(m, f);
- Dune::MyNonlinearity<block_size> const phi(f);
+ Dune::LocalNonlinearity<block_size> const phi(f);
Dune::SampleFunctional<block_size> localJ(*localA, localb, phi);
LocalVectorType correction;
diff --git a/dune/tectonic/samplefunctional.hh b/dune/tectonic/samplefunctional.hh
index 5e0b2525..1d510f54 100644
--- a/dune/tectonic/samplefunctional.hh
+++ b/dune/tectonic/samplefunctional.hh
@@ -12,7 +12,7 @@
#include <dune/tnnmg/problem-classes/bisection.hh>
#include <dune/tnnmg/problem-classes/directionalconvexfunction.hh>
-#include "mynonlinearity.hh"
+#include "localnonlinearity.hh"
namespace Dune {
template <int dim> class SampleFunctional {
@@ -20,7 +20,7 @@ template <int dim> class SampleFunctional {
typedef FieldVector<double, dim> SmallVector;
typedef FieldMatrix<double, dim, dim> SmallMatrix;
- typedef MyNonlinearity<dim> NonlinearityType;
+ typedef LocalNonlinearity<dim> NonlinearityType;
SampleFunctional(SmallMatrix const &A, SmallVector const &b,
NonlinearityType const &phi)
@@ -159,9 +159,9 @@ void minimise(Functional const J, typename Functional::SmallVector &x,
J.A.mmv(x, tmp); // b-Au
double const JRestb = tmp * descDir; // <b-Au,v>
- typedef typename Functional::NonlinearityType MyNonlinearityType;
- MyNonlinearityType phi = J.phi;
- typedef DirectionalConvexFunction<MyNonlinearityType>
+ typedef typename Functional::NonlinearityType LocalNonlinearityType;
+ LocalNonlinearityType phi = J.phi;
+ typedef DirectionalConvexFunction<LocalNonlinearityType>
MyDirectionalConvexFunctionType;
// FIXME: We cannot pass J.phi directly because the constructor
// does not allow for constant arguments
diff --git a/src/octave/duneevaluate.cc b/src/octave/duneevaluate.cc
index 0fee6e52..ad06d46a 100644
--- a/src/octave/duneevaluate.cc
+++ b/src/octave/duneevaluate.cc
@@ -42,7 +42,7 @@ Evaluate x -> 1/2<Ax,x> - <b,x> + H(|x|) at each point y that is a column vector
default:
assert(false);
}
- Dune::MyNonlinearity<dim> phi(*foo);
+ Dune::LocalNonlinearity<dim> phi(*foo);
Functional J(A, b, phi);
Matrix points(args(3).matrix_value());
diff --git a/src/octave/duneminimise.cc b/src/octave/duneminimise.cc
index 4238fa2b..e86b326d 100644
--- a/src/octave/duneminimise.cc
+++ b/src/octave/duneminimise.cc
@@ -42,7 +42,7 @@ Make a minimisation step of x -> 1/2<Ax,x> - <b,x> + H(|x|) using DUNE starting
default:
assert(false);
}
- Dune::MyNonlinearity<dim> phi(*foo);
+ Dune::LocalNonlinearity<dim> phi(*foo);
Functional J(A, b, phi);
ColumnVector start_octave(args(3).vector_value());
diff --git a/src/test-gradient-method.cc b/src/test-gradient-method.cc
index 33597685..d0608474 100644
--- a/src/test-gradient-method.cc
+++ b/src/test-gradient-method.cc
@@ -36,7 +36,7 @@ void testIdentity() {
b[1] = 2;
Dune::LinearFunction f(1);
- Functional J(A, b, Dune::MyNonlinearity<dim>(f));
+ Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
start *= 17;
@@ -71,7 +71,7 @@ void testSampleFunction() {
b[1] = 2;
Dune::SampleFunction<2> f;
- Functional J(A, b, Dune::MyNonlinearity<dim>(f));
+ Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
start *= 17;
@@ -120,7 +120,7 @@ void testSampleFunctionNonsmooth() {
b[1] = 2;
Dune::SampleFunction<2> f;
- Functional J(A, b, Dune::MyNonlinearity<dim>(f));
+ Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start;
Functional::SmallVector error;
@@ -182,7 +182,7 @@ void testTrivialFunction() {
b[1] = 2;
Dune::TrivialFunction f;
- Functional J(A, b, Dune::MyNonlinearity<dim>(f));
+ Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
start *= 17;
@@ -226,7 +226,7 @@ void testHorribleFunction() {
b[1] = 2;
Dune::HorribleFunction f;
- Functional J(A, b, Dune::MyNonlinearity<dim>(f));
+ Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
start *= 17;
@@ -261,7 +261,7 @@ void testHorribleFunctionLogarithmic() {
b[1] = 2;
Dune::HorribleFunctionLogarithmic f;
- Functional J(A, b, Dune::MyNonlinearity<dim>(f));
+ Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
start *= 17;
@@ -300,7 +300,7 @@ void testSampleFunction3D() {
b[2] = 3;
Dune::SampleFunction<2> f;
- Functional J(A, b, Dune::MyNonlinearity<dim>(f));
+ Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
start *= 17;
@@ -338,7 +338,7 @@ void testSampleFunction2() {
b[1] = 1;
Dune::SampleFunction<2> f;
- Functional J(A, b, Dune::MyNonlinearity<dim>(f));
+ Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start = b;
@@ -372,7 +372,7 @@ void testSampleFunctionSteep1() {
b[1] = 2;
Dune::SampleFunction<2> f;
- Functional J(A, b, Dune::MyNonlinearity<dim>(f));
+ Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start;
@@ -409,7 +409,7 @@ void testSampleFunctionSteep2() {
b[1] = 2.5;
Dune::SampleFunction<2> f;
- Functional J(A, b, Dune::MyNonlinearity<dim>(f));
+ Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start;
@@ -446,7 +446,7 @@ void testSteepFunction() {
b[1] = 2.5;
Dune::SampleFunction<100> f;
- Functional J(A, b, Dune::MyNonlinearity<dim>(f));
+ Functional J(A, b, Dune::LocalNonlinearity<dim>(f));
Functional::SmallVector start;
--
GitLab