Changeset 1709:a323456bf7c8 in lemon-0.x for lemon/dfs.h

Timestamp:

10/05/05 18:45:37 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Template Named Parameter bugfix

File:

• lemon/dfs.h (modified) (11 diffs)

lemon/dfs.h

@@ -58 +58 @@
       return new PredMap(G);
     }
-//     ///\brief The type of the map that stores the last but one
-//     ///nodes of the %DFS paths.
-//     ///
-//     ///The type of the map that stores the last but one
-//     ///nodes of the %DFS paths.
-//     ///It must meet the \ref concept::WriteMap "WriteMap" concept.
-//     ///
-//     typedef NullMap<typename Graph::Node,typename Graph::Node> PredNodeMap;
-//     ///Instantiates a PredNodeMap.
-    
-//     ///This function instantiates a \ref PredNodeMap. 
-//     ///\param G is the graph, to which
-//     ///we would like to define the \ref PredNodeMap
-//     static PredNodeMap *createPredNodeMap(const GR &G)
-//     {
-//       return new PredNodeMap();
-//     }
 
     ///The type of the map that indicates which nodes are processed.
@@ -180 +163 @@
     ///edges of the %DFS paths.
     typedef typename TR::PredMap PredMap;
-//     ///\brief The type of the map that stores the last but one
-//     ///nodes of the %DFS paths.
-//     typedef typename TR::PredNodeMap PredNodeMap;
     ///The type of the map indicating which nodes are reached.
     typedef typename TR::ReachedMap ReachedMap;
@@ -196 +176 @@
     ///Indicates if \ref _pred is locally allocated (\c true) or not.
     bool local_pred;
-//     ///Pointer to the map of predecessors nodes.
-//     PredNodeMap *_predNode;
-//     ///Indicates if \ref _predNode is locally allocated (\c true) or not.
-//     bool local_predNode;
     ///Pointer to the map of distances.
     DistMap *_dist;
@@ -215 +191 @@
     std::vector<typename Graph::OutEdgeIt> _stack;
     int _stack_head;
-//     ///The source node of the last execution.
-//     Node source;
 
     ///Creates the maps if necessary.
@@ -228 +202 @@
         _pred = Traits::createPredMap(*G);
       }
-//       if(!_predNode) {
-//      local_predNode = true;
-//      _predNode = Traits::createPredNodeMap(*G);
-//       }
       if(!_dist) {
         local_dist = true;
@@ -247 +217 @@
     
   public :
- 
+
+    typedef Dfs Create;
+
     ///\name Named template parameters
 
@@ -265 +237 @@
     ///
     template <class T>
-    class DefPredMap : public Dfs< Graph,
-                                        DefPredMapTraits<T> > { };
-    
-//     template <class T>
-//     struct DefPredNodeMapTraits : public Traits {
-//       typedef T PredNodeMap;
-//       static PredNodeMap *createPredNodeMap(const Graph &G) 
-//       {
-//      throw UninitializedParameter();
-//       }
-//     };
-//     ///\ref named-templ-param "Named parameter" for setting PredNodeMap type
-
-//     ///\ref named-templ-param "Named parameter" for setting PredNodeMap type
-//     ///
-//     template <class T>
-//     class DefPredNodeMap : public Dfs< Graph,
-//                                          LengthMap,
-//                                          DefPredNodeMapTraits<T> > { };
+    struct DefPredMap : public Dfs<Graph, DefPredMapTraits<T> > {
+      typedef Dfs<Graph, DefPredMapTraits<T> > Create;
+    };
+    
     
     template <class T>
@@ -298 +255 @@
     ///
     template <class T>
-    class DefDistMap : public Dfs< Graph,
-                                   DefDistMapTraits<T> > { };
+    struct DefDistMap {
+      typedef Dfs<Graph, DefDistMapTraits<T> > Create;
+    };
     
     template <class T>
@@ -314 +272 @@
     ///
     template <class T>
-    class DefReachedMap : public Dfs< Graph,
-                                      DefReachedMapTraits<T> > { };
-    
-    struct DefGraphReachedMapTraits : public Traits {
-      typedef typename Graph::template NodeMap<bool> ReachedMap;
-      static ReachedMap *createReachedMap(const Graph &G) 
-      {
-        return new ReachedMap(G);
-      }
-    };
+    struct DefReachedMap {
+      typedef Dfs< Graph, DefReachedMapTraits<T> > Create;
+    };
+
     template <class T>
     struct DefProcessedMapTraits : public Traits {
@@ -338 +290 @@
     template <class T>
     struct DefProcessedMap : public Dfs< Graph, DefProcessedMapTraits<T> > { 
-      typedef Dfs< Graph, DefProcessedMapTraits<T> > Dfs;
+      typedef Dfs< Graph, DefProcessedMapTraits<T> > Create;
     };
     
@@ -356 +308 @@
     template <class T>
     class DefProcessedMapToBeDefaultMap :
-      public Dfs< Graph,
-                  DefGraphProcessedMapTraits> { };
+      public Dfs< Graph, DefGraphProcessedMapTraits> { 
+      typedef Dfs< Graph, DefGraphProcessedMapTraits> Create;
+    };
     
     ///@}