Changeset 1201:cb26a6250401 in lemon-0.x

Timestamp:

03/06/05 22:20:49 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1613

Message:

Bugfix in DijkstraWizard?

File:

• src/lemon/dijkstra.h (modified) (8 diffs)

src/lemon/dijkstra.h

@@ -730 +730 @@
     typedef DijkstraDefaultTraits<GR,LM> Base;
   protected:
+    /// Type of the nodes in the graph.
+    typedef typename Base::Graph::Node Node;
+
     /// Pointer to the underlying graph.
     void *_g;
@@ -741 +744 @@
     void *_dist;
     ///Pointer to the source node.
-    void *_source;
-
-    /// Type of the nodes in the graph.
-    typedef typename Base::Graph::Node Node;
+    Node _source;
 
     public:
@@ -752 +752 @@
     /// all of the attributes to default values (0, INVALID).
     DijkstraWizardBase() : _g(0), _length(0), _pred(0), _predNode(0),
-                       _dist(0), _source(0) {}
+                       _dist(0), _source(INVALID) {}
 
     /// Constructor.
@@ -764 +764 @@
     DijkstraWizardBase(const GR &g,const LM &l, Node s=INVALID) :
       _g((void *)&g), _length((void *)&l), _pred(0), _predNode(0),
-                  _dist(0), _source((s==INVALID)?0:(void *)&s) {}
+                  _dist(0), _source(s) {}
 
   };
@@ -841 +841 @@
     void run()
     {
-      if(Base::_source==0) throw UninitializedParameter();
+      if(Base::_source==INVALID) throw UninitializedParameter();
       Dijkstra<Graph,LengthMap,TR> 
         Dij(*(Graph*)Base::_g,*(LengthMap*)Base::_length);
@@ -847 +847 @@
       if(Base::_predNode) Dij.predNodeMap(*(PredNodeMap*)Base::_predNode);
       if(Base::_dist) Dij.distMap(*(DistMap*)Base::_dist);
-      Dij.run(*(Node*)Base::_source);
+      Dij.run(Base::_source);
     }
 
@@ -856 +856 @@
     void run(Node s)
     {
-      Base::_source=(void *)&s;
+      Base::_source=s;
       run();
     }
@@ -927 +927 @@
     DijkstraWizard<TR> &source(Node s) 
     {
-      Base::_source=(void *)&s;
+      Base::_source=s;
       return *this;
     }