UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-26 09:10:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Move maximum/roots solver from CartesianFunction to

Browse Source 
Poincare::Expression
This commit is contained in:
Émilie Feral
2018-06-04 15:07:44 +02:00
parent fccebdcc06
commit bc33b10368
12 changed files with 43 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/graph/graph/intersection_graph_controller.cpp
View File

@@ -36,12 +36,12 @@ void IntersectionGraphController::reloadBannerView() {
bannerView()->setLegendAtIndex(buffer, 1);
}
CartesianFunction::Point IntersectionGraphController::computeNewPointOfInterest(double start, double step, double max, Context * context) {
CartesianFunction::Point result = {.abscissa = NAN, .value = NAN};
Expression::Coordinate2D IntersectionGraphController::computeNewPointOfInterest(double start, double step, double max, Context * context) {
Expression::Coordinate2D result = {.abscissa = NAN, .value = NAN};
for (int i = 0; i < m_functionStore->numberOfActiveFunctions(); i++) {
Function * f = m_functionStore->activeFunctionAtIndex(i);
if (f != m_function) {
CartesianFunction::Point intersection = m_function->nextIntersectionFrom(start, step, max, context, f);
Expression::Coordinate2D intersection = m_function->nextIntersectionFrom(start, step, max, context, f);
if ((std::isnan(result.abscissa) || std::fabs(intersection.abscissa-start) < std::fabs(result.abscissa-start)) && !std::isnan(intersection.abscissa)) {
m_intersectedFunction = f;
result = (std::isnan(result.abscissa) || std::fabs(intersection.abscissa-start) < std::fabs(result.abscissa-start)) ? intersection : result;