ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-26 14:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use less funky rounding. Tiny optimization.

Browse Source
This commit is contained in:
JoelKatz
2012-12-10 17:36:48 -08:00
parent 88904e3345
commit dd00d886a0
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpp/ripple/Amount.cpp
View File

@@ -949,7 +949,6 @@ STAmount STAmount::multiply(const STAmount& v1, const STAmount& v2, const uint16
else else
{ // round { // round
value1 *= 10; value1 *= 10;
value1 += 3;
--offset1; --offset1;
} }
@@ -964,7 +963,6 @@ STAmount STAmount::multiply(const STAmount& v1, const STAmount& v2, const uint16
else else
{ // round { // round
value2 *= 10; value2 *= 10;
value2 += 3;
--offset2; --offset2;
} }
@@ -972,6 +970,7 @@ STAmount STAmount::multiply(const STAmount& v1, const STAmount& v2, const uint16
CBigNum v; CBigNum v;
if ((BN_add_word(&v, value1) != 1) || if ((BN_add_word(&v, value1) != 1) ||
(BN_mul_word(&v, value2) != 1) || (BN_mul_word(&v, value2) != 1) ||
(BN_add_word(&v, 5) != 1) ||
(BN_div_word(&v, 100000000000000ul) == ((BN_ULONG) -1))) (BN_div_word(&v, 100000000000000ul) == ((BN_ULONG) -1)))
{ {
throw std::runtime_error("internal bn error"); throw std::runtime_error("internal bn error");
@@ -980,9 +979,7 @@ STAmount STAmount::multiply(const STAmount& v1, const STAmount& v2, const uint16
// 10^16 <= product <= 10^18 // 10^16 <= product <= 10^18
assert(BN_num_bytes(&v) <= 64); assert(BN_num_bytes(&v) <= 64);
if (v1.mIsNegative != v2.mIsNegative) return STAmount(uCurrencyID, uIssuerID, v.getulong(), offset1 + offset2 + 14, v1.mIsNegative != v2.mIsNegative);
return -STAmount(uCurrencyID, uIssuerID, v.getulong(), offset1 + offset2 + 14);
else return STAmount(uCurrencyID, uIssuerID, v.getulong(), offset1 + offset2 + 14);
} }
// Convert an offer into an index amount so they sort by rate. // Convert an offer into an index amount so they sort by rate.
@@ -1135,8 +1132,11 @@ uint64 STAmount::muldiv(uint64 a, uint64 b, uint64 c)
if ((a == 0) || (b == 0)) return 0; if ((a == 0) || (b == 0)) return 0;
CBigNum v; CBigNum v;
if ((BN_add_word(&v, a * 10 + 3) != 1) || (BN_mul_word(&v, b * 10 + 3) != 1) || if ((BN_add_word(&v, a * 10) != 1) ||
(BN_div_word(&v, c) == ((BN_ULONG) -1)) || (BN_div_word(&v, 100) == ((BN_ULONG) -1))) (BN_mul_word(&v, b * 10) != 1) ||
(BN_add_word(&v, 5) != 1) ||
(BN_div_word(&v, c) == ((BN_ULONG) -1)) ||
(BN_div_word(&v, 100) == ((BN_ULONG) -1)))
throw std::runtime_error("muldiv error"); throw std::runtime_error("muldiv error");
return v.getulong(); return v.getulong();