ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small cleanups.

Browse Source
This commit is contained in:
JoelKatz
2012-04-24 18:03:12 -07:00
parent 5f31b13e8d
commit 275d509d31
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Amount.cpp
View File

@@ -9,14 +9,13 @@
// amount = value * [10 ^ offset] // amount = value * [10 ^ offset]
// representation range is 10^80 - 10^(-80) // representation range is 10^80 - 10^(-80)
// on the wire, high 8 bits are (offset+142), low 56 bits are value // on the wire, high 8 bits are (offset+142), low 56 bits are value
// value is zero if amount is zero, otherwise value is 10^15 - (10^16 - 1) inclusive // value is zero if amount is zero, otherwise value is 10^15 to (10^16 - 1) inclusive
void STAmount::canonicalize() void STAmount::canonicalize()
{ {
if (value == 0) if (value == 0)
{ {
offset = -100; offset = -100;
value = 0;
return; return;
} }
while (value < cMinValue) while (value < cMinValue)
@@ -66,7 +65,7 @@ std::string STAmount::getRaw() const
} }
std::string STAmount::getText() const std::string STAmount::getText() const
{ { // keep full internal accuracy, but make more human friendly if posible
if (isZero()) return "0"; if (isZero()) return "0";
if ( (offset < -25) || (offset > -5) ) if ( (offset < -25) || (offset > -5) )
return boost::lexical_cast<std::string>(value) + "e" + boost::lexical_cast<std::string>(offset); return boost::lexical_cast<std::string>(value) + "e" + boost::lexical_cast<std::string>(offset);
@@ -164,7 +163,7 @@ STAmount& STAmount::operator=(const STAmount& a)
} }
STAmount& STAmount::operator=(uint64 v) STAmount& STAmount::operator=(uint64 v)
{ { // does not copy name
return *this = STAmount(v, 0); return *this = STAmount(v, 0);
} }
@@ -179,7 +178,7 @@ STAmount& STAmount::operator-=(uint64 v)
} }
STAmount::operator double() const STAmount::operator double() const
{ { // Does not keep the precise value. Not recommended
if (!value) if (!value)
return 0.0; return 0.0;
return static_cast<double>(value) * pow(10.0, offset); return static_cast<double>(value) * pow(10.0, offset);
@@ -222,7 +221,7 @@ STAmount operator-(STAmount v1, STAmount v2)
STAmount operator/(const STAmount& num, const STAmount& den) STAmount operator/(const STAmount& num, const STAmount& den)
{ {
if (den.isZero()) throw std::runtime_error("illegal offer"); if (den.isZero()) throw std::runtime_error("division by zero");
if (num.isZero()) return STAmount(); if (num.isZero()) return STAmount();
// Compute (numerator * 10^16) / denominator // Compute (numerator * 10^16) / denominator
@@ -270,9 +269,6 @@ STAmount getRate(const STAmount& offerOut, const STAmount& offerIn)
STAmount getClaimed(STAmount& offerOut, STAmount& offerIn, STAmount& paid) STAmount getClaimed(STAmount& offerOut, STAmount& offerIn, STAmount& paid)
{ // if someone is offering (offerOut) for (offerIn), and I pay (paid), how much do I get? { // if someone is offering (offerOut) for (offerIn), and I pay (paid), how much do I get?
// If you pay nothing, you get nothing. Offer is untouched
if (paid.isZero()) return STAmount();
if (offerIn.isZero() || offerOut.isZero()) if (offerIn.isZero() || offerOut.isZero())
{ // If the offer is invalid or empty, you pay nothing and get nothing and the offer is dead { // If the offer is invalid or empty, you pay nothing and get nothing and the offer is dead
offerIn.zero(); offerIn.zero();
@@ -281,6 +277,9 @@ STAmount getClaimed(STAmount& offerOut, STAmount& offerIn, STAmount& paid)
return STAmount(); return STAmount();
} }
// If you pay nothing, you get nothing. Offer is untouched
if (paid.isZero()) return STAmount();
if (paid >= offerIn) if (paid >= offerIn)
{ // If you pay equal to or more than the offer amount, you get the whole offer and pay its input { // If you pay equal to or more than the offer amount, you get the whole offer and pay its input
STAmount ret(offerOut); STAmount ret(offerOut);
@@ -381,4 +380,9 @@ void STAmount::unitTest()
if (!(hundred != zero)) throw std::runtime_error("STAmount fail"); if (!(hundred != zero)) throw std::runtime_error("STAmount fail");
if (!(hundred != one)) throw std::runtime_error("STAmount fail"); if (!(hundred != one)) throw std::runtime_error("STAmount fail");
if ((hundred != hundred)) throw std::runtime_error("STAmount fail"); if ((hundred != hundred)) throw std::runtime_error("STAmount fail");
if (STAmount().getText() != "0") throw std::runtime_error("STAmount fail");
if (STAmount(31).getText() != "31") throw std::runtime_error("STAmount fail");
if (STAmount(31,1).getText() != "310") throw std::runtime_error("STAmount fail");
if (STAmount(31,-1).getText() != "3.1") throw std::runtime_error("STAmount fail");
if (STAmount(31,-2).getText() != "0.31") throw std::runtime_error("STAmount fail");
} }

13
src/SerializedTypes.h
View File

@@ -181,12 +181,11 @@ protected:
static const uint64 cMinValue=1000000000000000ull, cMaxValue=9999999999999999ull; static const uint64 cMinValue=1000000000000000ull, cMaxValue=9999999999999999ull;
public: public:
STAmount(uint64 v=0, int off=0) : offset(off), value(v) STAmount(uint64 v = 0, int off = 0) : offset(off), value(v)
{ canonicalize(); } // (1,0)=$1 (1,-2)=$.01 (100,0)=(10000,-2)=$.01 { canonicalize(); } // (1,0)=$1 (1,-2)=$.01 (100,0)=(10000,-2)=$.01
STAmount(const char *n, uint64 v=0, int off=1) : SerializedType(n), offset(off), value(v) STAmount(const char *n, uint64 v = 0, int off = 0) : SerializedType(n), offset(off), value(v)
{ canonicalize(); } { canonicalize(); }
STAmount(const STAmount& a) : SerializedType(a), offset(a.offset), value(a.value) { ; } static STAmount* construct(SerializerIterator&, const char *name = NULL);
static STAmount* construct(SerializerIterator&, const char *name=NULL);
int getLength() const { return 8; } int getLength() const { return 8; }
SerializedTypeID getSType() const { return STI_AMOUNT; } SerializedTypeID getSType() const { return STI_AMOUNT; }
@@ -197,8 +196,8 @@ public:
int getOffset() const { return offset; } int getOffset() const { return offset; }
uint64 getValue() const { return value; } uint64 getValue() const { return value; }
void zero() { offset=0; value=-100; } void zero() { offset = -100; value = 0; }
bool isZero() const { return value==0; } bool isZero() const { return value == 0; }
virtual bool isEquivalent(const SerializedType& t) const; virtual bool isEquivalent(const SerializedType& t) const;