Changeset 1193:c3585aec8cb3 in lemon-0.x

Timestamp:

03/04/05 18:18:25 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Bug fix, and g++ 3.4 compatibility changes.

File:

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

src/lemon/dijkstra.h

@@ -338 +338 @@
     
     struct DefGraphReachedMapTraits : public Traits {
-      typedef typename Graph::NodeMap<bool> ReachedMap;
+      typedef typename Graph::template NodeMap<bool> ReachedMap;
       static ReachedMap *createReachedMap(const Graph &G) 
       {
@@ -540 +540 @@
     ///Returns \c false if there are nodes to be processed in the priority heap
     ///
-    bool emptyHeap() { return heap.empty(); }
+    bool emptyHeap() { return _heap.empty(); }
     ///Returns the number of the nodes to be processed in the priority heap
 
     ///Returns the number of the nodes to be processed in the priority heap
     ///
-    int heapSize() { return heap.size(); }
+    int heapSize() { return _heap.size(); }
     
     ///Executes the algorithm.
@@ -598 +598 @@
     void start(const NM &nm)
     {
-      while ( !_heap.empty() && !mn[_heap.top()] ) processNextNode();
+      while ( !_heap.empty() && !nm[_heap.top()] ) processNextNode();
       if ( !_heap.empty() ) finalizeNodeData(_heap.top());
     }
@@ -841 +841 @@
     void run()
     {
-      if(_source==0) throw UninitializedParameter();
-      Dijkstra<Graph,LengthMap,TR> Dij(*(Graph*)_g,*(LengthMap*)_length);
-      if(_pred) Dij.predMap(*(PredMap*)_pred);
-      if(_predNode) Dij.predNodeMap(*(PredNodeMap*)_predNode);
-      if(_dist) Dij.distMap(*(DistMap*)_dist);
-      Dij.run(*(Node*)_source);
+      if(Base::_source==0) throw UninitializedParameter();
+      Dijkstra<Graph,LengthMap,TR> 
+        Dij(*(Graph*)Base::_g,*(LengthMap*)Base::_length);
+      if(Base::_pred) Dij.predMap(*(PredMap*)Base::_pred);
+      if(Base::_predNode) Dij.predNodeMap(*(PredNodeMap*)Base::_predNode);
+      if(Base::_dist) Dij.distMap(*(DistMap*)Base::_dist);
+      Dij.run(*(Node*)Base::_source);
     }
 
@@ -855 +856 @@
     void run(Node s)
     {
-      _source=(void *)&s;
+      Base::_source=(void *)&s;
       run();
     }
@@ -875 +876 @@
     DijkstraWizard<DefPredMapBase<T> > predMap(const T &t) 
     {
-      _pred=(void *)&t;
+      Base::_pred=(void *)&t;
       return DijkstraWizard<DefPredMapBase<T> >(*this);
     }
@@ -896 +897 @@
     DijkstraWizard<DefPredNodeMapBase<T> > predNodeMap(const T &t) 
     {
-      _predNode=(void *)&t;
+      Base::_predNode=(void *)&t;
       return DijkstraWizard<DefPredNodeMapBase<T> >(*this);
     }
@@ -916 +917 @@
     DijkstraWizard<DefDistMapBase<T> > distMap(const T &t) 
     {
-      _dist=(void *)&t;
+      Base::_dist=(void *)&t;
       return DijkstraWizard<DefDistMapBase<T> >(*this);
     }
@@ -926 +927 @@
     DijkstraWizard<TR> &source(Node s) 
     {
-      source=(void *)&s;
+      Base::_source=(void *)&s;
       return *this;
     }