diff -r 93ee849e1101 -r 09d6d48815a5 src/include/dijkstra.h --- a/src/include/dijkstra.h Mon Apr 05 13:49:20 2004 +0000 +++ b/src/include/dijkstra.h Mon Apr 05 13:55:55 2004 +0000 @@ -69,9 +69,6 @@ template , template class Heap = BinHeap > -// typename Heap=BinHeap > > #endif class Dijkstra{ public: @@ -89,19 +86,11 @@ const Graph& G; const LengthMap& length; PredMap predecessor; - //In place of reach: PredNodeMap pred_node; DistMap distance; - //I don't like this: - // //FIXME: - // typename Graph::NodeMap reach; - // //typename Graph::NodeMap reach; public : - /* - The distance of the nodes is 0. - */ Dijkstra(Graph& _G, LengthMap& _length) : G(_G), length(_length), predecessor(_G), pred_node(_G), distance(_G) { } @@ -147,8 +136,6 @@ ///\pre \ref run() must be called before using this function. const PredNodeMap &predNodeMap() const { return pred_node;} - // bool reached(Node v) { return reach[v]; } - ///Checks if a node is reachable from the source. ///Returns \c true if \c v is reachable from the source. @@ -186,17 +173,11 @@ // reach.set(u,false); } - //We don't need it at all. - // //FIXME: - // typename Graph::NodeMap scanned(G,false); - // //typename Graph::NodeMap scanned(G,false); typename Graph::NodeMap heap_map(G,-1); - //Heap heap(heap_map); Heap > heap(heap_map); heap.push(s,0); - // reach.set(s, true); while ( !heap.empty() ) { @@ -211,7 +192,6 @@ switch(heap.state(w)) { case heap.PRE_HEAP: - // reach.set(w,true); heap.push(w,oldvalue+length[e]); predecessor.set(w,e); pred_node.set(w,v);