UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Decimal: change order definition on Decimal expression

Browse Source 
Now, Decimal node "1.000E3" is not equal to Decimal node "1E3" node anymore.
This prevents from using double comparison (which is sometimes wrong due to
double precision) to implement decimal comparison.
This commit is contained in:
Émilie Feral
2019-10-02 17:58:30 +02:00
committed by Ecco
parent 2f12205dd7
commit d9af0300d4
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
poincare/include/poincare/decimal.h
View File

@@ -53,6 +53,9 @@ public:
}
// Comparison
/* Warning: Decimal(mantissa: 1000, exponent: 3) and Decimal(mantissa: 1, exponent: 3)
* are strictly ordered with the SimplificationOrder although they are equal
* with the usual math order (1.000E3 == 1E3). */
int simplificationOrderSameType(const ExpressionNode * e, bool ascending, bool canBeInterrupted) const override;
// Simplification

4
poincare/src/decimal.cpp
View File

@@ -81,9 +81,7 @@ int DecimalNode::simplificationOrderSameType(const ExpressionNode * e, bool asce
} else {
assert(m_exponent == other->m_exponent);
assert(exponent() == other->exponent());
double approx0 = templatedApproximate<double>();
double approx1 = other->templatedApproximate<double>();
return (approx0 == approx1 ? 0 : (approx0 < approx1 ? -1 : 1));
unsignedComparison = Integer::NaturalOrder(unsignedMantissa(), other->unsignedMantissa());
}
return ((int)Number(this).sign())*unsignedComparison;
}

5
poincare/test/expression.cpp
View File

@@ -48,8 +48,9 @@ QUIZ_CASE(poincare_expression_decimal_constructor) {
assert_pool_size(initialPoolSize+4);
assert_equal(Decimal::Builder("25", 3), Decimal::Builder("25", 3));
assert_equal(Decimal::Builder("1000", -3), Decimal::Builder("1", -3));
assert_equal(Decimal::Builder("1000", 3), Decimal::Builder("1", 3));
assert_equal(Decimal::Builder("25", 3), Decimal::Builder(25, 3));
assert_not_equal(Decimal::Builder("1000", -3), Decimal::Builder("1", -3));
assert_not_equal(Decimal::Builder("1000", 3), Decimal::Builder("1", 3));
assert_not_equal(Decimal::Builder(123,234), Decimal::Builder(42, 108));
assert_not_equal(Decimal::Builder(12,2), Decimal::Builder(123, 2));
assert_not_equal(Decimal::Builder(1234,2), Decimal::Builder(1234,3));