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

[poincare] Fix Rational::NaturalOrder

Browse Source
This commit is contained in:
Émilie Feral
2018-08-03 11:38:21 +02:00
parent 9ddf1d2c33
commit ae1aa5ee14
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
poincare/src/rational.cpp
View File

@@ -109,13 +109,19 @@ template<typename T> T RationalNode::templatedApproximate() const {
// Comparison
int RationalNode::NaturalOrder(const RationalNode i, const RationalNode j) {
if (i.sign() == Sign::Negative && j.sign() == Sign::Positive) {
return -1;
}
if (i.sign() == Sign::Positive && j.sign() == Sign::Negative) {
return 1;
}
NaturalIntegerPointer in = i.numerator();
NaturalIntegerPointer id = i.denominator();
NaturalIntegerPointer jn = j.numerator();
NaturalIntegerPointer jd = j.denominator();
IntegerReference i1 = NaturalIntegerAbstract::umult(&in, &jd);
IntegerReference i2 = NaturalIntegerAbstract::umult(&id, &jn);
return IntegerReference::NaturalOrder(i1, i2);
return ((int)i.sign())*IntegerReference::NaturalOrder(i1, i2);
}
int RationalNode::simplificationOrderSameType(const ExpressionNode * e, bool canBeInterrupted) const {