UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-19 13:50:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/graph] Move nextRootFrom from the controller to the model

Browse Source 
CartesianFunction and take into account function domain
This commit is contained in:
Émilie Feral
2019-09-09 10:44:30 +02:00
parent aa45adb49a
commit 901cce9e67
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/shared/cartesian_function.cpp
View File

@@ -274,6 +274,10 @@ Coordinate2D<T> CartesianFunction::templatedApproximateAtParameter(T t, Poincare
PoincareHelpers::ApproximateWithValueForSymbol(e.childAtIndex(1), unknown, t, context));
}
Coordinate2D<double> CartesianFunction::nextRootFrom(double start, double step, double max, Context * context) const {
return nextPointOfInterestFrom(start, step, max, context, [](Expression e, char * symbol, double start, double step, double max, Context * context) { return Coordinate2D<double>(PoincareHelpers::NextRoot(e, symbol, start, step, max, context), 0.0); });
}
Coordinate2D<double> CartesianFunction::nextIntersectionFrom(double start, double step, double max, Poincare::Context * context, CartesianFunction * f) const {
assert(plotType() == PlotType::Cartesian);
constexpr int bufferSize = CodePoint::MaxCodePointCharLength + 1;
@@ -291,6 +295,19 @@ Coordinate2D<double> CartesianFunction::nextIntersectionFrom(double start, doubl
return PoincareHelpers::NextIntersection(expressionReduced(context), unknownX, start, step, max, context, f->expressionReduced(context));
}
Coordinate2D<double> CartesianFunction::nextPointOfInterestFrom(double start, double step, double max, Context * context, ComputePointOfInterest compute) const {
constexpr int bufferSize = CodePoint::MaxCodePointCharLength + 1;
char unknownX[bufferSize];
SerializationHelper::CodePoint(unknownX, bufferSize, UCodePointUnknownX);
if (step > 0.0f) {
start = maxDouble(start, tMin());
max = minDouble(max, tMax());
} else {
start = minDouble(start, tMax());
max = maxDouble(max, tMin());
}
return compute(expressionReduced(context), unknownX, start, step, max, context);
}
template Coordinate2D<float> CartesianFunction::templatedApproximateAtParameter<float>(float, Poincare::Context *) const;
template Coordinate2D<double> CartesianFunction::templatedApproximateAtParameter<double>(double, Poincare::Context *) const;