# HG changeset patch # User athos # Date 1081166101 0 # Node ID 65460cbf9e90d6addcaa3b2318b3d2a813d7dbb0 # Parent e37a05270e805d2f3e7a5e43994eea453e8c714d Mukodik a Suurballe diff -r e37a05270e80 -r 65460cbf9e90 src/work/athos/suurballe.h --- a/src/work/athos/suurballe.h Sun Apr 04 11:38:07 2004 +0000 +++ b/src/work/athos/suurballe.h Mon Apr 05 11:55:01 2004 +0000 @@ -27,6 +27,8 @@ class ConstMap { public : typedef int ValueType; + typedef typename Graph::Edge KeyType; + int operator[](typename Graph::Edge e) const { return 1; } @@ -58,7 +60,9 @@ typedef typename Graph::NodeIt NodeIt; typedef typename Graph::Edge Edge; typedef typename Graph::OutEdgeIt OutEdgeIt; - typedef ResGraphWrapper< Graph,T,typename Graph::EdgeMap, ConstMap > ResGraphType; + typedef TrivGraphWrapper TrivGraphType; + typedef ResGraphWrapper, + ConstMap> ResGraphType; const Graph& G; const LengthMap& length; @@ -82,7 +86,8 @@ LengthMap mod_length_c = length; ConstMap const1map; //ResGraphWrapper< Graph,T,typename Graph::EdgeMap, ConstMap> - ResGraphType res_graph(G, reversed, const1map); + TrivGraphType ize(G); + ResGraphType res_graph(ize, reversed, const1map); //ModLengthMap modified_length(length, dijkstra_dist); //Dijkstra dijkstra(res_graph, modified_length); //ResGraphWrapper< Graph,T,typename Graph::EdgeMap, ConstMap> @@ -109,8 +114,8 @@ Node n=t; Edge e; while (n!=s){ - e=dijkstra.pred(n); - n=dijkstra.predNode(n); + e = dijkstra.pred(n); + n = dijkstra.predNode(n); reversed[e] = 1-reversed[e]; }