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

[poincare] Update NthRoot and PermuteCoefficient

Browse Source
This commit is contained in:
Léa Saviot
2018-09-03 11:39:16 +02:00
parent 3269f29dd9
commit 697e5cfbe0
4 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
poincare/include/poincare/expression.h
View File

@@ -47,6 +47,8 @@ class Expression : public TreeByReference {
friend class MatrixTranspose;
friend class Multiplication;
friend class NaperianLogarithm;
friend class NthRoot;
friend class PermuteCoefficient;
friend class Sine;
friend class Store;

1
poincare/include/poincare/permute_coefficient.h
View File

@@ -59,4 +59,3 @@ private:
}
#endif

12
poincare/src/nth_root.cpp
View File

@@ -40,17 +40,21 @@ Evaluation<T> NthRootNode::templatedApproximate(Context& context, Preferences::A
}
Expression NthRoot::shallowReduce(Context & context, Preferences::AngleUnit angleUnit) {
Expression e = Expression::defaultShallowReduce(context, angleUnit);
if (e.isUndefinedOrAllocationFailure()) {
return e;
{
Expression e = Expression::defaultShallowReduce(context, angleUnit);
if (e.isUndefinedOrAllocationFailure()) {
return e;
}
}
#if MATRIX_EXACT_REDUCING
if (childAtIndex(0).type() == ExpressionNode::Type::Matrix || childAtIndex(1).type() == ExpressionNode:Type::Matrix) {
return Undefined();
}
#endif
Expression invIndex = Power(childAtIndex(1), Rational(-1)).shallowReduce(context, angleUnit);
Expression invIndex = Power(childAtIndex(1), Rational(-1));
Power p = Power(childAtIndex(0), invIndex);
invIndex.shallowReduce(context, angleUnit);
replaceWithInPlace(p);
return p.shallowReduce(context, angleUnit);
}

46
poincare/src/permute_coefficient.cpp
View File

@@ -46,39 +46,47 @@ Evaluation<T> PermuteCoefficientNode::templatedApproximate(Context& context, Pre
}
Expression PermuteCoefficient::shallowReduce(Context & context, Preferences::AngleUnit angleUnit) {
Expression e = Expression::defaultShallowReduce(context, angleUnit);
if (e.isUndefinedOrAllocationFailure()) {
return e;
{
Expression e = Expression::defaultShallowReduce(context, angleUnit);
if (e.isUndefinedOrAllocationFailure()) {
return e;
}
}
Expression op0 = childAtIndex(0);
Expression op1 = childAtIndex(1);
Expression c0 = childAtIndex(0);
Expression c1 = childAtIndex(1);
#if MATRIX_EXACT_REDUCING
if (op0.type() == ExpressionNode::Type::Matrix || op1.type() == ExpressionNode::Type::Matrix) {
if (c0.type() == ExpressionNode::Type::Matrix || c1.type() == ExpressionNode::Type::Matrix) {
return replaceWith(new Undefined(), true);
}
#endif
if (op0.type() == ExpressionNode::Type::Rational) {
Rational r0 = static_cast<Rational &>(op0);
if (c0.type() == ExpressionNode::Type::Rational) {
Rational r0 = static_cast<Rational>(c0);
if (!r0.integerDenominator().isOne() || r0.sign() == ExpressionNode::Sign::Negative) {
return Undefined();
Expression result = Undefined();
replaceWithInPlace(result);
return result;
}
}
if (op1.type() == ExpressionNode::Type::Rational) {
Rational r1 = static_cast<Rational &>(op1);
if (c1.type() == ExpressionNode::Type::Rational) {
Rational r1 = static_cast<Rational>(c1);
if (!r1.integerDenominator().isOne() || r1.sign() == ExpressionNode::Sign::Negative) {
return Undefined();
Expression result = Undefined();
replaceWithInPlace(result);
return result;
}
}
if (op0.type() != ExpressionNode::Type::Rational || op1.type() != ExpressionNode::Type::Rational) {
if (c0.type() != ExpressionNode::Type::Rational || c1.type() != ExpressionNode::Type::Rational) {
return *this;
}
Rational r0 = static_cast<Rational &>(op0);
Rational r1 = static_cast<Rational &>(op1);
Rational r0 = static_cast<Rational &>(c0);
Rational r1 = static_cast<Rational &>(c1);
Integer n = r0.unsignedIntegerNumerator();
Integer k = r1.unsignedIntegerNumerator();
if (n.isLowerThan(k)) {
return Rational(0);
Expression result = Rational(0);
replaceWithInPlace(result);
return result;
}
/* if n is too big, we do not reduce to avoid too long computation.
* The permute coefficient will be evaluate approximatively later */
@@ -92,8 +100,10 @@ Expression PermuteCoefficient::shallowReduce(Context & context, Preferences::Ang
result = Integer::Multiplication(result, factor);
}
assert(!result.isInfinity()); // < permute(k_maxNValue, k_maxNValue-1)~10^158
return Rational(result);
}
Expression rationalResult = Rational(result);
replaceWithInPlace(rationalResult);
return rationalResult;
}
}