diff --git a/apps/graph/cartesian_function.cpp b/apps/graph/cartesian_function.cpp index a6993003e..da56be169 100644 --- a/apps/graph/cartesian_function.cpp +++ b/apps/graph/cartesian_function.cpp @@ -60,7 +60,7 @@ CartesianFunction::Point CartesianFunction::nextMinimumOfFunction(double start, double x = start; do { bracketMinimum(x, step, max, bracket, evaluate, context); - result = brentAlgorithm(bracket[0], bracket[2], evaluate, context); + result = brentMinimum(bracket[0], bracket[2], evaluate, context); x = bracket[1]; } while (std::isnan(result.abscissa) && (step > 0.0 ? x <= max : x >= max)); @@ -100,11 +100,11 @@ char CartesianFunction::symbol() const { return 'x'; } -CartesianFunction::Point CartesianFunction::brentAlgorithm(double ax, double bx, Evaluation evaluate, Context * context) const { +CartesianFunction::Point CartesianFunction::brentMinimum(double ax, double bx, Evaluation evaluate, Context * context) const { /* Bibliography: R. P. Brent, Algorithms for finding zeros and extrema of * functions without calculating derivatives */ if (ax > bx) { - return brentAlgorithm(bx, ax, evaluate, context); + return brentMinimum(bx, ax, evaluate, context); } double e = 0.0; double a = ax; diff --git a/apps/graph/cartesian_function.h b/apps/graph/cartesian_function.h index c5f19c707..fb8bf760c 100644 --- a/apps/graph/cartesian_function.h +++ b/apps/graph/cartesian_function.h @@ -26,7 +26,7 @@ private: typedef double (*Evaluation)(const Shared::Function * function, double abscissa, Poincare::Context * context); Point nextMinimumOfFunction(double start, double step, double max, Evaluation evaluation, Poincare::Context * context) const; void bracketMinimum(double start, double step, double max, double result[3], Evaluation evaluation, Poincare::Context * context) const; - Point brentAlgorithm(double ax, double bx, Evaluation evaluation, Poincare::Context * context) const; + Point brentMinimum(double ax, double bx, Evaluation evaluation, Poincare::Context * context) const; bool m_displayDerivative; };