From 8f71e42d819b09801f9b245e5589fc51d1537c86 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 27 Jul 2012 16:06:32 +0200
Subject: [PATCH] Rename: evaluate -> cartesian
---
dune/tectonic/curvedfunction.hh | 4 ++--
dune/tectonic/samplefunctional.hh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dune/tectonic/curvedfunction.hh b/dune/tectonic/curvedfunction.hh
index 34ce4924..4c8a0350 100644
--- a/dune/tectonic/curvedfunction.hh
+++ b/dune/tectonic/curvedfunction.hh
@@ -20,7 +20,7 @@ template <class NonlinearityType> class CurvedFunction {
void subDiff(double m, Interval<double> &D) const {
VectorType x;
- evaluate(m, x);
+ cartesian(m, x);
VectorType tangent;
tangentialDirection(m, tangent);
@@ -40,7 +40,7 @@ template <class NonlinearityType> class CurvedFunction {
domain[1] = 1;
}
- void evaluate(double m, VectorType &y) const {
+ void cartesian(double m, VectorType &y) const {
y = 0;
y.axpy(1 - m, x);
y.axpy(m, dir);
diff --git a/dune/tectonic/samplefunctional.hh b/dune/tectonic/samplefunctional.hh
index 4197cf6c..b80bde69 100644
--- a/dune/tectonic/samplefunctional.hh
+++ b/dune/tectonic/samplefunctional.hh
@@ -208,7 +208,7 @@ void minimise(Functional const J, typename Functional::SmallVector &x,
// Since x is used in the computation of the rhs, do not write to it
// directly
SmallVector tmp;
- JRest.evaluate(stepsize, tmp);
+ JRest.cartesian(stepsize, tmp);
x = tmp;
}
}
--
GitLab