From eabd5c6a0c6796547a91cf6e642090cdb298f4da Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 5 Mar 2012 05:02:45 -0600 Subject: Create a FGraph each time a lookup is done --- src/history.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/history.h') diff --git a/src/history.h b/src/history.h index 6430202b..fc984c1b 100644 --- a/src/history.h +++ b/src/history.h @@ -98,11 +98,13 @@ public: if (*last_oldest) DEBUG("history.find", " last_oldest = " << **last_oldest); +#if 0 if (*last_reftime && *reftime == **last_reftime && *oldest == *last_oldest) { DEBUG("history.find", " using previous reftime"); return get(weight, e) != std::numeric_limits::max(); } +#endif const price_map_t& prices(get(ratios, e)); if (prices.empty()) { @@ -189,9 +191,6 @@ public: PriceRatioMap> > FGraph; typedef property_map::type FNameMap; - FGraph fg; - FNameMap namemap; - // jww (2012-03-05): Prevents threading mutable datetime_t reftime; mutable optional last_reftime; @@ -201,12 +200,7 @@ public: commodity_history_t() : indexmap(get(vertex_index, price_graph)), pricemap(get(edge_price_point, price_graph)), - ratiomap(get(edge_price_ratio, price_graph)), - fg(price_graph, - recent_edge_weight - (get(edge_weight, price_graph), pricemap, ratiomap, - &reftime, &last_reftime, &oldest, &last_oldest)), - namemap(get(vertex_name, fg)) {} + ratiomap(get(edge_price_ratio, price_graph)) {} void add_commodity(commodity_t& comm); -- cgit v1.2.3