diff -r 40fcfa5bfc32 -r fc549fac0dd0 src/work/jacint/dijkstra.h --- a/src/work/jacint/dijkstra.h Sat Mar 20 16:10:26 2004 +0000 +++ b/src/work/jacint/dijkstra.h Sat Mar 20 16:13:19 2004 +0000 @@ -45,7 +45,9 @@ const LengthMap& length; typename Graph::NodeMap predecessor; typename Graph::NodeMap distance; + //FIXME: typename Graph::NodeMap reach; + //typename Graph::NodeMap reach; public : @@ -65,7 +67,9 @@ reach.set(u,false); } + //FIXME: typename Graph::NodeMap scanned(G,false); + //typename Graph::NodeMap scanned(G,false); typename Graph::NodeMap heap_map(G,-1); Heap heap(heap_map); @@ -76,7 +80,7 @@ while ( !heap.empty() ) { Node v=heap.top(); - T oldvalue=heap.get(v); + T oldvalue=heap[v]; heap.pop(); distance.set(v, oldvalue); scanned.set(v,true); @@ -90,26 +94,23 @@ reach.set(w,true); heap.push(w,oldvalue+length[e]); predecessor.set(w,e); - } else if ( oldvalue+length[e] < heap.get(w) ) { + } else if ( oldvalue+length[e] < heap[w] ) { predecessor.set(w,e); heap.decrease(w, oldvalue+length[e]); } } } } - } + } - T dist(Node v) { return distance[v]; } - Edge pred(Node v) { return predecessor[v]; } - bool reached(Node v) { return reach[v]; }