sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't increase precision so much when dividing

Browse source 
Slow the increase in internal precision when dividing amounts.

Use "--debug amount.convert" if you wish to see this logic in action, if
a case where incorrect rounding is suspected comes up.

Fixes B68FFB0D-A9A0-479C-A6C0-68853F229333
This commit is contained in:
John Wiegley 2009-06-15 17:40:17 +01:00
parent 981dc41eb7
commit 092bda1435
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/amount.cc
View file

@ -343,8 +343,8 @@ amount_t& amount_t::operator*=(const amount_t& amt)
_dup(); _dup();
mpq_mul(MP(quantity), MP(quantity), MP(amt.quantity)); mpq_mul(MP(quantity), MP(quantity), MP(amt.quantity));
quantity->prec = static_cast<precision_t>(quantity->prec + quantity->prec =
amt.quantity->prec); static_cast<precision_t>(quantity->prec + amt.quantity->prec);
if (! has_commodity()) if (! has_commodity())
commodity_ = amt.commodity_; commodity_ = amt.commodity_;
@ -382,7 +382,7 @@ amount_t& amount_t::operator/=(const amount_t& amt)
mpq_div(MP(quantity), MP(quantity), MP(amt.quantity)); mpq_div(MP(quantity), MP(quantity), MP(amt.quantity));
quantity->prec = quantity->prec =
static_cast<precision_t>(quantity->prec + amt.quantity->prec + static_cast<precision_t>(quantity->prec + amt.quantity->prec +
quantity->prec + extend_by_digits); extend_by_digits);
if (! has_commodity()) if (! has_commodity())
commodity_ = amt.commodity_; commodity_ = amt.commodity_;

40
test/unit/t_amount.cc
View file

@ -866,7 +866,7 @@ void AmountTestCase::testIntegerDivision()
x1 /= amount_t(456L); x1 /= amount_t(456L);
assertEqual(string("0.269737"), x1.to_string()); assertEqual(string("0.269737"), x1.to_string());
x1 /= 456L; x1 /= 456L;
assertEqual(string("0.000591528162511542"), x1.to_string()); assertEqual(string("0.000591528163"), x1.to_string());
amount_t x4("123456789123456789123456789"); amount_t x4("123456789123456789123456789");
amount_t y4("56"); amount_t y4("56");
@ -889,32 +889,32 @@ void AmountTestCase::testFractionalDivision()
amount_t y1("456.456"); amount_t y1("456.456");
assertThrow(x1 / 0L, amount_error); assertThrow(x1 / 0L, amount_error);
assertEqual(string("0.00812195934"), (amount_t("1.0") / x1).to_string()); assertEqual(string("0.0081219593"), (amount_t("1.0") / x1).to_string());
assertEqual(string("0.00812195934"), (amount_t("1.0") / x1).to_string()); assertEqual(string("0.0081219593"), (amount_t("1.0") / x1).to_string());
assertEqual(x1, x1 / amount_t("1.0")); assertEqual(x1, x1 / amount_t("1.0"));
assertEqual(string("0.00812195934"), (amount_t("1.0") / x1).to_string()); assertEqual(string("0.0081219593"), (amount_t("1.0") / x1).to_string());
assertEqual(string("0.00812195934"), (amount_t("1.0") / x1).to_string()); assertEqual(string("0.0081219593"), (amount_t("1.0") / x1).to_string());
assertEqual(- x1, x1 / amount_t("-1.0")); assertEqual(- x1, x1 / amount_t("-1.0"));
assertEqual(string("-0.00812195934"), (amount_t("-1.0") / x1).to_string()); assertEqual(string("-0.0081219593"), (amount_t("-1.0") / x1).to_string());
assertEqual(string("-0.00812195934"), (amount_t("-1.0") / x1).to_string()); assertEqual(string("-0.0081219593"), (amount_t("-1.0") / x1).to_string());
assertEqual(string("0.269736842105263"), (x1 / y1).to_string()); assertEqual(string("0.269736842105"), (x1 / y1).to_string());
assertEqual(string("3.707317073170732"), (y1 / x1).to_string()); assertEqual(string("3.707317073171"), (y1 / x1).to_string());
assertEqual(string("0.269736842105263"), (x1 / amount_t("456.456")).to_string()); assertEqual(string("0.269736842105"), (x1 / amount_t("456.456")).to_string());
assertEqual(string("3.707317073170732"), (amount_t("456.456") / x1).to_string()); assertEqual(string("3.707317073171"), (amount_t("456.456") / x1).to_string());
assertEqual(string("3.707317073170732"), (amount_t("456.456") / x1).to_string()); assertEqual(string("3.707317073171"), (amount_t("456.456") / x1).to_string());
x1 /= amount_t("456.456"); x1 /= amount_t("456.456");
assertEqual(string("0.269736842105263"), x1.to_string()); assertEqual(string("0.269736842105"), x1.to_string());
x1 /= amount_t("456.456"); x1 /= amount_t("456.456");
assertEqual(string("0.000590937225286255757169884601508201951"), x1.to_string()); assertEqual(string("0.000590937225286255757"), x1.to_string());
x1 /= 456L; x1 /= 456L;
assertEqual(string("0.00000129591496773301701133746621429767819329289006668733529828959526392431755859036"), x1.to_string()); assertEqual(string("0.000001295914967733017011337"), x1.to_string());
amount_t x4("1234567891234567.89123456789"); amount_t x4("1234567891234567.89123456789");
amount_t y4("56.789"); amount_t y4("56.789");
assertEqual(amount_t("1.0"), x4 / x4); assertEqual(amount_t("1.0"), x4 / x4);
assertEqual(string("21739560323910.7554497273748437197344556164046"), (x4 / y4).to_string()); assertEqual(string("21739560323910.75544972737484371973"), (x4 / y4).to_string());
assertValid(x1); assertValid(x1);
assertValid(y1); assertValid(y1);
@ -946,9 +946,9 @@ void AmountTestCase::testCommodityDivision()
// Internal amounts retain their precision, even when being // Internal amounts retain their precision, even when being
// converted to strings // converted to strings
assertEqual(string("$0.99727201"), (x1 / x2).to_fullstring()); assertEqual(string("$0.99727201"), (x1 / x2).to_fullstring());
assertEqual(string("$1.00273545321637426901"), (x2 / x1).to_fullstring()); assertEqual(string("$1.00273545321637"), (x2 / x1).to_fullstring());
assertEqual(string("$1.00"), (x1 / x2).to_string()); assertEqual(string("$1.00"), (x1 / x2).to_string());
assertEqual(string("$1.00273545321637426901"), (x2 / x1).to_string()); assertEqual(string("$1.00273545321637"), (x2 / x1).to_string());
assertThrow(x1 / x0, amount_error); assertThrow(x1 / x0, amount_error);
assertThrow(x0 / x1, amount_error); assertThrow(x0 / x1, amount_error);
@ -970,9 +970,9 @@ void AmountTestCase::testCommodityDivision()
amount_t x7(internalAmount("$123456789123456789.123456789123456789")); amount_t x7(internalAmount("$123456789123456789.123456789123456789"));
assertEqual(amount_t("$1"), x7 / x7); assertEqual(amount_t("$1"), x7 / x7);
assertEqual(string("$0.0019216115121765559608381226612019501046413574469262"), assertEqual(string("$0.0019216115121765559608381226612019501"),
(x6 / x7).to_fullstring()); (x6 / x7).to_fullstring());
assertEqual(string("$520.39654928343335571379527154924040947271699678158689736256"), assertEqual(string("$520.39654928343335571379527154924040947272"),
(x7 / x6).to_fullstring()); (x7 / x6).to_fullstring());
assertValid(x1); assertValid(x1);