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

Re-enable fastQuadratic with safety=0

The problem was that our local coordinate system became very small
parent deaac5da
No related branches found
No related tags found
No related merge requests found
...@@ -165,16 +165,12 @@ void minimise(const Functional J, const typename Functional::SmallVector x, ...@@ -165,16 +165,12 @@ void minimise(const Functional J, const typename Functional::SmallVector x,
0); // We should not be minimising in this direction otherwise 0); // We should not be minimising in this direction otherwise
} }
// WARNING: Bisection bisection(0.0, // acceptError: Stop if the search interval has
// Using fastquadratic appears to be a very bad idea if D[1] is exactly zero. // become smaller than this number
// Huge steps that lead us back to where we came from are the result. 1.0, // acceptFactor: ?
Bisection bisection( 1e-12, // requiredResidual: ?
0.0, // acceptError: Stop if the search interval has true, // fastQuadratic
// become smaller than this number 0); // safety: acceptance factor for inexact minimization
1.0, // acceptFactor: ?
1e-12, // requiredResidual: ?
false, // fastQuadratic
1e-14); // safety: acceptance factor for inexact minimization
int count; int count;
// FIXME: The value of x_old should not matter if the factor is 1.0, correct? // FIXME: The value of x_old should not matter if the factor is 1.0, correct?
double const stepsize = bisection.minimize(JRest, 0.0, 1.0, count); double const stepsize = bisection.minimize(JRest, 0.0, 1.0, count);
......
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