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

More debug code cleanup

Browse source
This commit is contained in:
John Wiegley 2010-06-04 03:23:31 -04:00
parent 7f7243ff93
commit b7e8cb9d54
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/commodity.cc
View file

@ -140,13 +140,13 @@ commodity_t::history_t::find_price(const optional<datetime_t>& moment,
if (oldest) { if (oldest) {
DEBUG_INDENT("commodity.prices.find", indent); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", " but no older than: " << *oldest); DEBUG("commodity.prices.find", "but no older than: " << *oldest);
} }
#endif #endif
if (prices.size() == 0) { if (prices.size() == 0) {
DEBUG_INDENT("commodity.prices.find", indent); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", " there are no prices in this history"); DEBUG("commodity.prices.find", "there are no prices in this history");
return none; return none;
} }
@ -157,9 +157,9 @@ commodity_t::history_t::find_price(const optional<datetime_t>& moment,
found = true; found = true;
DEBUG_INDENT("commodity.prices.find", indent); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", " using most recent price"); DEBUG("commodity.prices.find", "using most recent price");
} else { } else {
history_map::const_iterator i = prices.lower_bound(*moment); history_map::const_iterator i = prices.upper_bound(*moment);
if (i == prices.end()) { if (i == prices.end()) {
history_map::const_reverse_iterator r = prices.rbegin(); history_map::const_reverse_iterator r = prices.rbegin();
point.when = (*r).first; point.when = (*r).first;
@ -167,7 +167,7 @@ commodity_t::history_t::find_price(const optional<datetime_t>& moment,
found = true; found = true;
DEBUG_INDENT("commodity.prices.find", indent); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", " using last price"); DEBUG("commodity.prices.find", "using last price");
} else { } else {
point.when = (*i).first; point.when = (*i).first;
if (*moment < point.when) { if (*moment < point.when) {
@ -183,29 +183,29 @@ commodity_t::history_t::find_price(const optional<datetime_t>& moment,
} }
DEBUG_INDENT("commodity.prices.find", indent); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", " using found price"); DEBUG("commodity.prices.find", "using found price");
} }
} }
if (! found) { if (! found) {
DEBUG_INDENT("commodity.prices.find", indent); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", " could not find a price"); DEBUG("commodity.prices.find", "could not find a price");
return none; return none;
} }
else if (moment && point.when > *moment) { else if (moment && point.when > *moment) {
DEBUG_INDENT("commodity.prices.find", indent); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", " price is too young "); DEBUG("commodity.prices.find", "price is too young ");
return none; return none;
} }
else if (oldest && point.when < *oldest) { else if (oldest && point.when < *oldest) {
DEBUG_INDENT("commodity.prices.find", indent); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", " price is too old "); DEBUG("commodity.prices.find", "price is too old ");
return none; return none;
} }
else { else {
DEBUG_INDENT("commodity.prices.find", indent); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", DEBUG("commodity.prices.find",
" returning price: " << point.when << ", " << point.price); "returning price: " << point.when << ", " << point.price);
return point; return point;
} }
} }
@ -235,19 +235,19 @@ commodity_t::varied_history_t::find_price(const commodity_t& source,
DEBUG_INDENT("commodity.prices.find", indent); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", "varied_find_price for: " << source); DEBUG("commodity.prices.find", "varied_find_price for: " << source);
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent);
if (commodity) if (commodity)
DEBUG("commodity.prices.find", "looking for: commodity '" << *commodity << "'"); DEBUG("commodity.prices.find", "looking for: commodity '" << *commodity << "'");
else else
DEBUG("commodity.prices.find", "looking for: any commodity"); DEBUG("commodity.prices.find", "looking for: any commodity");
if (moment) { if (moment) {
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", "time index: " << *moment); DEBUG("commodity.prices.find", "time index: " << *moment);
} }
if (oldest) { if (oldest) {
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", "only consider prices younger than: " << *oldest); DEBUG("commodity.prices.find", "only consider prices younger than: " << *oldest);
} }
#endif #endif
@ -268,13 +268,13 @@ commodity_t::varied_history_t::find_price(const commodity_t& source,
if (! commodity && ! comm.has_flags(COMMODITY_PRIMARY)) if (! commodity && ! comm.has_flags(COMMODITY_PRIMARY))
continue; continue;
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", DEBUG("commodity.prices.find",
"searching for price via commodity '" << comm << "'"); "searching for price via commodity '" << comm << "'");
point = hist.second.find_price(moment, limit point = hist.second.find_price(moment, limit
#if defined(DEBUG_ON) #if defined(DEBUG_ON)
, indent + 2 , indent + 1
#endif #endif
); );
assert(! point || point->price.commodity() == comm); assert(! point || point->price.commodity() == comm);
@ -283,16 +283,16 @@ commodity_t::varied_history_t::find_price(const commodity_t& source,
optional<price_point_t> xlat; optional<price_point_t> xlat;
if (commodity && comm != *commodity) { if (commodity && comm != *commodity) {
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", "looking for translation price"); DEBUG("commodity.prices.find", "looking for translation price");
xlat = comm.find_price(commodity, moment, limit xlat = comm.find_price(commodity, moment, limit
#if defined(DEBUG_ON) #if defined(DEBUG_ON)
, indent + 2 , indent + 1
#endif #endif
); );
if (xlat) { if (xlat) {
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", "found translated price " DEBUG("commodity.prices.find", "found translated price "
<< xlat->price << " from " << xlat->when); << xlat->price << " from " << xlat->when);
@ -300,12 +300,12 @@ commodity_t::varied_history_t::find_price(const commodity_t& source,
if (xlat->when < point->when) { if (xlat->when < point->when) {
point->when = xlat->when; point->when = xlat->when;
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", DEBUG("commodity.prices.find",
"adjusting date of result back to " << point->when); "adjusting date of result back to " << point->when);
} }
} else { } else {
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", "saw no translated price there"); DEBUG("commodity.prices.find", "saw no translated price there");
continue; continue;
} }
@ -313,7 +313,7 @@ commodity_t::varied_history_t::find_price(const commodity_t& source,
assert(! commodity || point->price.commodity() == *commodity); assert(! commodity || point->price.commodity() == *commodity);
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", DEBUG("commodity.prices.find",
"saw a price there: " << point->price << " from " << point->when); "saw a price there: " << point->price << " from " << point->when);
@ -322,18 +322,18 @@ commodity_t::varied_history_t::find_price(const commodity_t& source,
best = *point; best = *point;
found = true; found = true;
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", DEBUG("commodity.prices.find",
"search limit adjusted to " << *limit); "search limit adjusted to " << *limit);
} }
} else { } else {
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.prices.find", "saw no price there"); DEBUG("commodity.prices.find", "saw no price there");
} }
} }
if (found) { if (found) {
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent);
DEBUG("commodity.download", DEBUG("commodity.download",
"found price " << best.price << " from " << best.when); "found price " << best.price << " from " << best.when);
return best; return best;