[Lemon-commits] [lemon_svn] athos: r409 - hugo/trunk/src/work/athos

[Lemon SVN]

Author: athos
Date: Mon Apr  5 13:55:01 2004
New Revision: 409

Modified:
   hugo/trunk/src/work/athos/suurballe.h

Log:
Mukodik a Suurballe

Modified: hugo/trunk/src/work/athos/suurballe.h
==============================================================================
--- hugo/trunk/src/work/athos/suurballe.h	(original)
+++ hugo/trunk/src/work/athos/suurballe.h	Mon Apr  5 13:55:01 2004
@@ -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<int>, ConstMap > ResGraphType;
+    typedef TrivGraphWrapper<const Graph> TrivGraphType;
+    typedef ResGraphWrapper<TrivGraphType,int,typename Graph::EdgeMap<int>,
+      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<int>, ConstMap> 
-      ResGraphType res_graph(G, reversed, const1map);
+      TrivGraphType ize(G);
+      ResGraphType res_graph(ize, reversed, const1map);
       //ModLengthMap modified_length(length, dijkstra_dist);
       //Dijkstra<ResGraphType, ModLengthMap> dijkstra(res_graph, modified_length);
       //ResGraphWrapper< Graph,T,typename Graph::EdgeMap<int>, 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];
 	}