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

*** empty log message ***

Browse source
This commit is contained in:
John Wiegley 2006-03-21 19:11:59 +00:00
parent c8ebf53ed8
commit 964e74e333
3 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
amount.cc
View file

@ -1729,6 +1729,40 @@ annotated_commodity_t::find_or_create(const commodity_t& comm,
return create(comm, price, date, tag, name);
}
bool compare_amount_commodities::operator()(const amount_t * left,
const amount_t * right) const
{
commodity_t& leftcomm(left->commodity());
commodity_t& rightcomm(right->commodity());
int cmp = leftcomm.base_symbol().compare(rightcomm.base_symbol());
if (cmp != 0)
return cmp < 0;
if (! leftcomm.annotated) {
assert(rightcomm.annotated);
return true;
}
else if (! rightcomm.annotated) {
assert(leftcomm.annotated);
return false;
}
else {
annotated_commodity_t& aleftcomm(static_cast<annotated_commodity_t&>(leftcomm));
annotated_commodity_t& arightcomm(static_cast<annotated_commodity_t&>(rightcomm));
amount_t val = aleftcomm.price - arightcomm.price;
if (val)
return val < 0;
int diff = aleftcomm.date - arightcomm.date;
if (diff)
return diff < 0;
return aleftcomm.tag < arightcomm.tag;
}
}
} // namespace ledger
#ifdef USE_BOOST_PYTHON

4
amount.h
View file

@ -606,6 +606,10 @@ class amount_error : public error {
virtual ~amount_error() throw() {}
};
struct compare_amount_commodities {
bool operator()(const amount_t * left, const amount_t * right) const;
};
} // namespace ledger
#endif // _AMOUNT_H

34
balance.cc
View file

@ -88,40 +88,6 @@ balance_t balance_t::strip_annotations(const bool keep_price,
return temp;
}
struct compare_amount_commodities {
bool operator()(const amount_t * left, const amount_t * right) const {
commodity_t& leftcomm(left->commodity());
commodity_t& rightcomm(right->commodity());
int cmp = leftcomm.symbol().compare(rightcomm.symbol());
if (cmp != 0)
return cmp < 0;
if (! leftcomm.annotated) {
assert(rightcomm.annotated);
return true;
}
else if (! rightcomm.annotated) {
assert(leftcomm.annotated);
return false;
}
else {
annotated_commodity_t& aleftcomm(static_cast<annotated_commodity_t&>(leftcomm));
annotated_commodity_t& arightcomm(static_cast<annotated_commodity_t&>(rightcomm));
amount_t val = aleftcomm.price - arightcomm.price;
if (val)
return val < 0;
int diff = aleftcomm.date - arightcomm.date;
if (diff)
return diff < 0;
return aleftcomm.tag < arightcomm.tag;
}
}
};
void balance_t::write(std::ostream& out,
const int first_width,
const int latter_width) const