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

dijkstra_shortest_paths should never return a reverse path

Browse source
This commit is contained in:
John Wiegley 2012-03-12 23:04:16 -05:00
parent 098f3d45d7
commit 72fc1824d0
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/history.cc
View file

@ -306,23 +306,34 @@ commodity_history_t::find_price(const commodity_t& source,
const commodity_t * last_target = ⌖ const commodity_t * last_target = ⌖
#if defined(REVERSE_PREDECESSOR_MAP)
typedef tuple<const commodity_t *, const commodity_t *, typedef tuple<const commodity_t *, const commodity_t *,
const price_point_t *> results_tuple; const price_point_t *> results_tuple;
std::vector<results_tuple> results; std::vector<results_tuple> results;
bool results_reversed = false; bool results_reversed = false;
#endif
vertex_descriptor v = tv; vertex_descriptor v = tv;
for (vertex_descriptor u = predecessorMap[v]; for (vertex_descriptor u = predecessorMap[v];
u != v; u != v;
v = u, u = predecessorMap[v]) v = u, u = predecessorMap[v])
{ {
std::pair<Graph::edge_descriptor, bool> edgePair = edge(u, v, fg); std::pair<Graph::edge_descriptor, bool> edgePair_uv = edge(u, v, fg);
Graph::edge_descriptor edge = edgePair.first; std::pair<Graph::edge_descriptor, bool> edgePair_vu = edge(v, u, fg);
Graph::edge_descriptor edge_uv = edgePair_uv.first;
Graph::edge_descriptor edge_vu = edgePair_vu.first;
const price_point_t& point_uv(get(pricemap, edge_uv));
const price_point_t& point_vu(get(pricemap, edge_vu));
const price_point_t& point(point_vu.when > point_uv.when ?
point_vu : point_uv);
const commodity_t * u_comm = get(namemap, u); const commodity_t * u_comm = get(namemap, u);
const commodity_t * v_comm = get(namemap, v); const commodity_t * v_comm = get(namemap, v);
const price_point_t& point(get(pricemap, edge));
#if defined(REVERSE_PREDECESSOR_MAP)
if (v == tv && u_comm != last_target && v_comm != last_target) if (v == tv && u_comm != last_target && v_comm != last_target)
results_reversed = true; results_reversed = true;
@ -336,6 +347,9 @@ commodity_history_t::find_price(const commodity_t& source,
const commodity_t * u_comm = edge.get<0>(); const commodity_t * u_comm = edge.get<0>();
const commodity_t * v_comm = edge.get<1>(); const commodity_t * v_comm = edge.get<1>();
const price_point_t& point(*edge.get<2>()); const price_point_t& point(*edge.get<2>());
#else
assert(u_comm == last_target || v_comm == last_target);
#endif
bool first_run = false; bool first_run = false;
if (price.is_null()) { if (price.is_null()) {