Changeset 986:e997802b855c in lemon-0.x for src/work/alpar/bfs-named-param.cc

Timestamp:

11/13/04 13:53:28 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Naming changes:

• head -> target
• tail -> source

File:

• src/work/alpar/bfs-named-param.cc (modified) (10 diffs)

src/work/alpar/bfs-named-param.cc

@@ -11 +11 @@
 struct _BFS_CUSTOM_VIS {};
 
-template<class GT,class VT,class DVT,class PNT,class PET,class PT >
-class _BFS 
+
+class _Bfs_Traits 
+{
+  typedef ListGraph Graph;
+}
+
+template<class T>
+class _Bfs 
 {
  public:
-  typedef GT Graph;
-  typedef VT Visited;
-  typedef PNT PredNode;
-  typedef PET PredEdge;
-  typedef PT Priority;
-  //  typedef QDT QueueData;
+  typedef typename T::Graph Graph;
+  typedef typename T::Reached Reached;
+  typedef typename T::PredNode PredNode;
+  typedef typename T::PredEdge PredEdge;
+  typedef typename T::Priority Priority;
+  
+  typedef typename T::DefaultReachedTag DefaultReachedTag;
   
   typedef typename Graph::Node Node;
   typedef typename Graph::OutEdgeIt OutEdgeIt;
 
-  typedef DVT DefaultVisitedTag;
-  
   const Graph &_graph;
 
   Node _source;
   
-  Visited *_visited;
+  Reached *_visited;
   PredNode _predNode;
   PredEdge _predEdge;
   Priority _priority;
 
-  _BFS(const Graph &g,
+  _Bfs(const Graph &g,
        Node s,
-       Visited *v,
+       Reached *v,
        PredNode &pn,
        PredEdge &pe,
@@ -46 +51 @@
 
   
-  int run(const _BFS_CUSTOM_VIS &) 
+  int run(const _Bfs_CUSTOM_VIS &) 
   {
     using namespace std;
@@ -64 +69 @@
       Node n=Q[Qt++];
       for(OutEdgeIt e(_graph,n);e!=INVALID;++e)
-        if(!(*_visited)[m=_graph.head(e)]) {
+        if(!(*_visited)[m=_graph.target(e)]) {
           Q[Qh++]=m;
           _visited->set(m,true);
@@ -76 +81 @@
   int run(const _BFS_DEFAULT_VIS &) 
   {
-    _visited= new Visited(_graph);
+    _visited= new Reached(_graph);
     int r = run(_BFS_CUSTOM_VIS());
     delete _visited;
     return r;
   }
-  int run() { return run(DefaultVisitedTag());}
-
-  template<class T> _BFS<Graph,T,_BFS_CUSTOM_VIS,PredNode,PredEdge,Priority>
+  int run() { return run(DefaultReachedTag());}
+
+  template<class T> _Bfs<Graph,T,_BFS_CUSTOM_VIS,PredNode,PredEdge,Priority>
   setVisitMap(T &t)
   {
-    return _BFS<Graph,T,_BFS_CUSTOM_VIS,PredNode,PredEdge,Priority>
+    return _Bfs<Graph,T,_BFS_CUSTOM_VIS,PredNode,PredEdge,Priority>
       (_graph,_source,&t,_predNode,_predEdge,_priority);
   }
 
   template<class T>
-  _BFS<Graph,Visited,DefaultVisitedTag,T,PredEdge,Priority>
+  _Bfs<Graph,Reached,DefaultReachedTag,T,PredEdge,Priority>
   setPredNodeMap(T &t)
   {
-    return _BFS<Graph,Visited,DefaultVisitedTag,T,PredEdge,Priority>
+    return _BFS<Graph,Reached,DefaultReachedTag,T,PredEdge,Priority>
       (_graph,_source,
        _visited,
@@ -101 +106 @@
 
   template<class T>
-  _BFS<Graph,Visited,DefaultVisitedTag,PredNode,T,Priority>
+  _BFS<Graph,Reached,DefaultReachedTag,PredNode,T,Priority>
   setPredEdgeMap(T &t)
   {
-    return _BFS<Graph,Visited,DefaultVisitedTag,PredNode,T,Priority>
+    return _BFS<Graph,Reached,DefaultReachedTag,PredNode,T,Priority>
       (_graph,_source,
        _visited,
@@ -110 +115 @@
   }
 
-  _BFS<Graph,Visited,DefaultVisitedTag,PredNode,PredEdge,Priority>
+  _Bfs<Graph,Reached,DefaultReachedTag,PredNode,PredEdge,Priority>
   setNothing()
   {
-    return _BFS<Graph,Visited,DefaultVisitedTag,PredNode,PredEdge,Priority>
+    return _Bfs<Graph,Reached,DefaultReachedTag,PredNode,PredEdge,Priority>
       (_graph,_source,
        _visited,
@@ -122 +127 @@
 
 template<class G>
-_BFS<G,
+_Bfs<G,
      typename G::template NodeMap<bool>,
      _BFS_DEFAULT_VIS,
@@ -132 +137 @@
   //  typename G::template NodeMap<bool> v(g);
 
-  return _BFS < G,
+  return _Bfs < G,
     typename G::template NodeMap<bool>,
     _BFS_DEFAULT_VIS,
@@ -147 +152 @@
 
 
-class MyVisitedMap : public SmartGraph::NodeMap<bool>
+class MyReachedMap : public SmartGraph::NodeMap<bool>
 {
   const SmartGraph &_G;
 public:
-  MyVisitedMap(const SmartGraph &G) : SmartGraph::NodeMap<bool>(G), _G(G) {}
+  MyReachedMap(const SmartGraph &G) : SmartGraph::NodeMap<bool>(G), _G(G) {}
   void set(SmartGraph::Node n,bool b)
   {
@@ -181 +186 @@
   SmartGraph::NodeMap<SmartGraph::Edge> em(G);
 
-  MyVisitedMap vm(G);
+  MyReachedMap vm(G);