UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[calculation] Added additional output about second degree polynomials

Browse Source
This commit is contained in:
Laury
2021-09-12 21:28:07 +02:00
parent 1487acbe38
commit 2156ca7e42
16 changed files with 322 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
poincare/src/power.cpp
View File

@@ -1,6 +1,7 @@
#include <poincare/power.h>
#include <poincare/addition.h>
#include <poincare/arithmetic.h>
#include <poincare/based_integer.h>
#include <poincare/binomial_coefficient.h>
#include <poincare/constant.h>
#include <poincare/cosine.h>
@@ -68,18 +69,33 @@ int PowerNode::polynomialDegree(Context * context, const char * symbolName) cons
if (op0Deg < 0) {
return -1;
}
Integer i;
bool foundInteger = false;
if (childAtIndex(1)->type() == ExpressionNode::Type::Rational) {
RationalNode * r = static_cast<RationalNode *>(childAtIndex(1));
if (!r->isInteger() || Number(r).sign() == Sign::Negative) {
return -1;
}
Integer numeratorInt = r->signedNumerator();
if (!numeratorInt.isExtractable()) {
foundInteger = true;
i = r->signedNumerator();
}
else if(childAtIndex(1)->type() == ExpressionNode::Type::BasedInteger) {
BasedIntegerNode * b = static_cast<BasedIntegerNode *>(childAtIndex(1));
if (Number(b).sign() == Sign::Negative) {
return -1;
}
op0Deg *= numeratorInt.extractedInt();
foundInteger = true;
i = b->integer();
}
if (foundInteger) {
if (!i.isExtractable()) {
return -1;
}
op0Deg *= i.extractedInt();
return op0Deg;
}
return -1;
}
@@ -356,10 +372,9 @@ int Power::getPolynomialCoefficients(Context * context, const char * symbolName,
}
/* Here we only consider the case x^4 as privateGetPolynomialCoefficients is
* supposed to be called after reducing the expression. */
if (childAtIndex(0).type() == ExpressionNode::Type::Symbol
&& strcmp(childAtIndex(0).convert<Symbol>().name(), symbolName) == 0
&& childAtIndex(1).type() == ExpressionNode::Type::Rational)
{
int n;
bool foundInteger = false;
if (childAtIndex(1).type() == ExpressionNode::Type::Rational) {
Rational r = childAtIndex(1).convert<Rational>();
if (!r.isInteger() || r.sign() == ExpressionNode::Sign::Negative) {
return -1;
@@ -368,7 +383,26 @@ int Power::getPolynomialCoefficients(Context * context, const char * symbolName,
if (!num.isExtractable()) {
return -1;
}
int n = num.extractedInt();
foundInteger = true;
n = num.extractedInt();
}
else if(childAtIndex(1).type() == ExpressionNode::Type::BasedInteger) {
BasedInteger b = childAtIndex(1).convert<BasedInteger>();
if (Number(b).sign() == ExpressionNode::Sign::Negative) {
return -1;
}
foundInteger = true;
Integer i = b.integer();
if (!i.isExtractable()) {
return -1;
}
n = i.extractedInt();
}
if (childAtIndex(0).type() == ExpressionNode::Type::Symbol
&& strcmp(childAtIndex(0).convert<Symbol>().name(), symbolName) == 0
&& foundInteger)
{
if (n <= k_maxPolynomialDegree) {
for (int i = 0; i < n; i++) {
coefficients[i] = Rational::Builder(0);