[poincare] Expand numbers to complex numbers

Change-Id: I2e7cf5240e184da45b656ee4f121ad76aabfd1c7
This commit is contained in:
Émilie Feral
2017-02-02 17:37:01 +01:00
parent 131b364ae9
commit 676bd46f33
66 changed files with 602 additions and 392 deletions

View File

@@ -77,13 +77,13 @@ void Function::setDisplayDerivative(bool display) {
float Function::evaluateAtAbscissa(float x, Context * context, Expression::AngleUnit angleUnit) const {
Symbol xSymbol = Symbol('x');
Float e = Float(x);
Complex e = Complex(x);
context->setExpressionForSymbolName(&e, &xSymbol);
return m_expression->approximate(*context, angleUnit);
}
float Function::approximateDerivative(float x, Context * context, Expression::AngleUnit angleUnit) const {
Float abscissa = Float(x);
Complex abscissa = Complex(x);
Expression * args[2] = {m_expression, &abscissa};
Derivative derivative = Derivative();
derivative.setArgument(args, 2, true);