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] Updat BinomialCoefficient

Browse Source
This commit is contained in:
Léa Saviot
2018-08-31 15:13:43 +02:00
parent a7b85798b3
commit 28fdfc7f10
3 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -19,6 +19,7 @@ class Expression : public TreeByReference {
friend class ArcSine;
friend class ArcTangent;
friend class Arithmetic;
friend class BinomialCoefficient;
friend class CosineNode;
friend class SineNode;
friend class ExpressionNode;

48
poincare/src/binomial_coefficient.cpp
View File

@@ -55,39 +55,47 @@ T BinomialCoefficientNode::compute(T k, T n) {
}
Expression BinomialCoefficient::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 Undefined();
}
#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.integerDenominator().isNegative()) {
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.integerDenominator().isNegative()) {
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.signedIntegerNumerator();
Integer k = r1.signedIntegerNumerator();
Integer n = static_cast<Integer>(r0.signedIntegerNumerator().clone());
Integer k = static_cast<Integer>(r1.signedIntegerNumerator().clone());
if (n.isLowerThan(k)) {
return Undefined();
Expression result = Undefined();
replaceWithInPlace(result);
return result;
}
/* If n is too big, we do not reduce in order to avoid too long computation.
* The binomial coefficient will be approximatively evaluated later. */
@@ -104,7 +112,9 @@ Expression BinomialCoefficient::shallowReduce(Context & context, Preferences::An
}
// As we cap the n < k_maxNValue = 300, result < binomial(300, 150) ~2^89
assert(!result.numeratorOrDenominatorIsInfinity());
return Rational(result);
Expression rationalResult = Rational(result);
replaceWithInPlace(rationalResult);
return rationalResult;
}
template double BinomialCoefficientNode::compute(double k, double n);