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

Reorganized some debug code

Browse source
This commit is contained in:
John Wiegley 2010-06-04 02:54:38 -04:00
parent dbac09405f
commit 2ae2dc86c6
1 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/commodity.cc
View file

@ -235,20 +235,20 @@ 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); DEBUG_INDENT("commodity.prices.find", indent + 1);
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); DEBUG_INDENT("commodity.prices.find", indent + 1);
DEBUG("commodity.prices.find", " time index: " << *moment); DEBUG("commodity.prices.find", "time index: " << *moment);
} }
if (oldest) { if (oldest) {
DEBUG_INDENT("commodity.prices.find", indent); DEBUG_INDENT("commodity.prices.find", indent + 1);
DEBUG("commodity.prices.find", " only consider prices younger than: " << *oldest); DEBUG("commodity.prices.find", "only consider prices younger than: " << *oldest);
} }
#endif #endif
@ -266,7 +266,7 @@ commodity_t::varied_history_t::find_price(const commodity_t& source,
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent + 1);
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)
@ -280,7 +280,7 @@ commodity_t::varied_history_t::find_price(const commodity_t& source,
if (commodity && comm != *commodity) { if (commodity && comm != *commodity) {
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent + 1);
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)
@ -289,7 +289,7 @@ commodity_t::varied_history_t::find_price(const commodity_t& source,
); );
if (xlat) { if (xlat) {
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent + 1);
DEBUG("commodity.prices.find", " found translated price " DEBUG("commodity.prices.find", "found translated price "
<< xlat->price << " from " << xlat->when); << xlat->price << " from " << xlat->when);
point->price = xlat->price * point->price; point->price = xlat->price * point->price;
@ -298,35 +298,38 @@ commodity_t::varied_history_t::find_price(const commodity_t& source,
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent + 1);
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 + 1);
DEBUG("commodity.prices.find", " saw no translated price there"); DEBUG("commodity.prices.find", "saw no translated price there");
continue; continue;
} }
} }
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 + 1);
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);
if (! limit || point->when > *limit) { if (! limit || point->when > *limit) {
limit = point->when; limit = point->when;
best = *point; best = *point;
found = true; found = true;
DEBUG_INDENT("commodity.prices.find", indent + 1);
DEBUG("commodity.prices.find",
"search limit adjusted to " << *limit);
} }
} else { } else {
DEBUG_INDENT("commodity.prices.find", indent + 1); DEBUG_INDENT("commodity.prices.find", indent + 1);
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); DEBUG_INDENT("commodity.prices.find", indent + 1);
DEBUG("commodity.prices.find",
" found price " << best.price << " from " << best.when);
DEBUG("commodity.download", DEBUG("commodity.download",
"found price " << best.price << " from " << best.when); "found price " << best.price << " from " << best.when);
return best; return best;