Skip to content
Snippets Groups Projects
Commit 8f71e42d authored by Elias Pipping's avatar Elias Pipping Committed by Elias Pipping
Browse files

Rename: evaluate -> cartesian

parent 9636177e
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,7 @@ template <class NonlinearityType> class CurvedFunction { ...@@ -20,7 +20,7 @@ template <class NonlinearityType> class CurvedFunction {
void subDiff(double m, Interval<double> &D) const { void subDiff(double m, Interval<double> &D) const {
VectorType x; VectorType x;
evaluate(m, x); cartesian(m, x);
VectorType tangent; VectorType tangent;
tangentialDirection(m, tangent); tangentialDirection(m, tangent);
...@@ -40,7 +40,7 @@ template <class NonlinearityType> class CurvedFunction { ...@@ -40,7 +40,7 @@ template <class NonlinearityType> class CurvedFunction {
domain[1] = 1; domain[1] = 1;
} }
void evaluate(double m, VectorType &y) const { void cartesian(double m, VectorType &y) const {
y = 0; y = 0;
y.axpy(1 - m, x); y.axpy(1 - m, x);
y.axpy(m, dir); y.axpy(m, dir);
......
...@@ -208,7 +208,7 @@ void minimise(Functional const J, typename Functional::SmallVector &x, ...@@ -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 // Since x is used in the computation of the rhs, do not write to it
// directly // directly
SmallVector tmp; SmallVector tmp;
JRest.evaluate(stepsize, tmp); JRest.cartesian(stepsize, tmp);
x = tmp; x = tmp;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment