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

[poincare] Move maximum/roots solver from CartesianFunction to Poincare::Expression (part I)

Browse Source
This commit is contained in:
Émilie Feral
2018-06-04 14:12:41 +02:00
parent 1f16ccb661
commit fccebdcc06
8 changed files with 379 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/sequence/sequence.cpp
View File

@@ -336,9 +336,7 @@ T Sequence::approximateToNextRank(int n, SequenceContext * sqctx) const {
{
ctx.setValueForSymbol(un, &unSymbol);
ctx.setValueForSymbol(vn, &vnSymbol);
Poincare::Complex<T> e = Poincare::Complex<T>::Float(n);
ctx.setExpressionForSymbolName(&e, &nSymbol, *sqctx);
return expression(sqctx)->template approximateToScalar<T>(ctx);
return expression(sqctx)->approximateWithValueForSymbol(symbol(), (T)n, ctx);
}
case Type::SingleRecurrence:
{
@@ -349,9 +347,7 @@ T Sequence::approximateToNextRank(int n, SequenceContext * sqctx) const {
ctx.setValueForSymbol(unm1, &unSymbol);
ctx.setValueForSymbol(vn, &vn1Symbol);
ctx.setValueForSymbol(vnm1, &vnSymbol);
Poincare::Complex<T> e = Poincare::Complex<T>::Float(n-1);
ctx.setExpressionForSymbolName(&e, &nSymbol, *sqctx);
return expression(sqctx)->template approximateToScalar<T>(ctx);
return expression(sqctx)->approximateWithValueForSymbol(symbol(), (T)(n-1), ctx);
}
default:
{
@@ -365,9 +361,7 @@ T Sequence::approximateToNextRank(int n, SequenceContext * sqctx) const {
ctx.setValueForSymbol(unm2, &unSymbol);
ctx.setValueForSymbol(vnm1, &vn1Symbol);
ctx.setValueForSymbol(vnm2, &vnSymbol);
Poincare::Complex<T> e = Poincare::Complex<T>::Float(n-2);
ctx.setExpressionForSymbolName(&e, &nSymbol, *sqctx);
return expression(sqctx)->template approximateToScalar<T>(ctx);
return expression(sqctx)->approximateWithValueForSymbol(symbol(), (T)(n-2), ctx);
}
}
}