[Lemon-commits] [lemon_svn] alpar: r414 - hugo/trunk/src/include
Lemon SVN
svn at lemon.cs.elte.hu
Mon Nov 6 20:39:18 CET 2006
Author: alpar
Date: Mon Apr 5 15:55:55 2004
New Revision: 414
Modified:
hugo/trunk/src/include/dijkstra.h
Log:
Swept out some deprecated comments
Modified: hugo/trunk/src/include/dijkstra.h
==============================================================================
--- hugo/trunk/src/include/dijkstra.h (original)
+++ hugo/trunk/src/include/dijkstra.h Mon Apr 5 15:55:55 2004
@@ -69,9 +69,6 @@
template <typename Graph,
typename LengthMap=typename Graph::EdgeMap<int>,
template <class,class,class> class Heap = BinHeap >
-// typename Heap=BinHeap <typename Graph::Node,
-// typename LengthMap::ValueType,
-// typename Graph::NodeMap<int> > >
#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<bool> reach;
- // //typename Graph::NodeMap<int> 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<bool> scanned(G,false);
- // //typename Graph::NodeMap<int> scanned(G,false);
typename Graph::NodeMap<int> heap_map(G,-1);
- //Heap heap(heap_map);
Heap<Node,ValueType,typename Graph::NodeMap<int> > 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);
More information about the Lemon-commits
mailing list