diff -r 6a22e0dfd453 -r 5a89cacf17f1 src/hugo/min_cost_flow.h --- a/src/hugo/min_cost_flow.h Sun Sep 26 21:43:38 2004 +0000 +++ b/src/hugo/min_cost_flow.h Mon Sep 27 18:11:27 2004 +0000 @@ -71,26 +71,26 @@ typedef typename Graph::template EdgeMap EdgeIntMap; - typedef ResGraphWrapper ResGraphType; - typedef typename ResGraphType::Edge ResGraphEdge; + typedef ResGraphWrapper ResGW; + typedef typename ResGW::Edge ResGraphEdge; class ModLengthMap { typedef typename Graph::template NodeMap NodeMap; - const ResGraphType& G; + const ResGW& G; const LengthMap &ol; const NodeMap &pot; public : typedef typename LengthMap::KeyType KeyType; typedef typename LengthMap::ValueType ValueType; - ValueType operator[](typename ResGraphType::Edge e) const { + ValueType operator[](typename ResGW::Edge e) const { if (G.forward(e)) return ol[e]-(pot[G.head(e)]-pot[G.tail(e)]); else return -ol[e]-(pot[G.head(e)]-pot[G.tail(e)]); } - ModLengthMap(const ResGraphType& _G, + ModLengthMap(const ResGW& _G, const LengthMap &o, const NodeMap &p) : G(_G), /*rev(_rev),*/ ol(o), pot(p){}; };//ModLengthMap @@ -152,12 +152,12 @@ //We need a residual graph - ResGraphType res_graph(G, capacity, flow); + ResGW res_graph(G, capacity, flow); ModLengthMap mod_length(res_graph, length, potential); - Dijkstra dijkstra(res_graph, mod_length); + Dijkstra dijkstra(res_graph, mod_length); int i; for (i=0; i