From 5d8cb30774cf630cddd26407202c1cad8568bbef Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sun, 4 Mar 2012 05:22:30 -0600
Subject: Implemented first cut at price conversion logic

---
 src/history.h | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'src/history.h')

diff --git a/src/history.h b/src/history.h
index f94d12c3..70831445 100644
--- a/src/history.h
+++ b/src/history.h
@@ -83,18 +83,20 @@ public:
       reftime(_reftime), oldest(_oldest) { }
 
   template <typename Edge>
-  bool operator()(const Edge& e) const {
+  bool operator()(const Edge& e) const
+  {
     const price_map_t& prices(get(ratios, e));
+    if (prices.empty())
+      return false;
+
     price_map_t::const_iterator low = prices.upper_bound(reftime);
-    if (prices.empty() ||
-        (low != prices.end() && low == prices.begin())) {
+    if (low != prices.end() && low == prices.begin()) {
       return false;
     } else {
-      if (low == prices.end())
-        --low;
+      --low;
       assert(((*low).first <= reftime));
 
-      if (oldest && (*low).first <= *oldest)
+      if (oldest && (*low).first < *oldest)
         return false;
 
       long secs = (reftime - (*low).first).total_seconds();
@@ -175,8 +177,16 @@ public:
   optional<price_point_t>
   find_price(const commodity_t&            source,
              const datetime_t&             moment,
-             const optional<datetime_t>&   oldest    = none,
-             const optional<commodity_t&>& commodity = none);
+             const optional<datetime_t>&   oldest = none);
+
+  optional<price_point_t>
+  find_price(const commodity_t&            source,
+             const commodity_t&            target,
+             const datetime_t&             moment,
+             const optional<datetime_t>&   oldest = none);
+
+  void print_map(std::ostream& out,
+                 const optional<datetime_t>& moment = none);
 };
 
 } // namespace ledger
-- 
cgit v1.2.3