diff --git a/src/samplefunctional.hh b/src/samplefunctional.hh index 63849e74328546e9f311e5dd766d7ff8cb295c49..f4b9509180d87ff20ff0b9ffe4887dfc634f036f 100644 --- a/src/samplefunctional.hh +++ b/src/samplefunctional.hh @@ -165,16 +165,12 @@ void minimise(const Functional J, const typename Functional::SmallVector x, 0); // We should not be minimising in this direction otherwise } - // WARNING: - // Using fastquadratic appears to be a very bad idea if D[1] is exactly zero. - // Huge steps that lead us back to where we came from are the result. - Bisection bisection( - 0.0, // acceptError: Stop if the search interval has - // become smaller than this number - 1.0, // acceptFactor: ? - 1e-12, // requiredResidual: ? - false, // fastQuadratic - 1e-14); // safety: acceptance factor for inexact minimization + Bisection bisection(0.0, // acceptError: Stop if the search interval has + // become smaller than this number + 1.0, // acceptFactor: ? + 1e-12, // requiredResidual: ? + true, // fastQuadratic + 0); // safety: acceptance factor for inexact minimization int count; // 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);