Changeset 1267:a93f94dbe3d3 in lemon-0.x for src/lemon/graph_utils.h

Timestamp:

03/26/05 00:31:57 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

First version of iterable maps.

File:

• src/lemon/graph_utils.h (modified) (7 diffs)

src/lemon/graph_utils.h

@@ -22 +22 @@
 #include <lemon/invalid.h>
 #include <lemon/utility.h>
-#include <lemon/map_utils.h>
 
 ///\ingroup gutils
@@ -35 +34 @@
 namespace lemon {
 
-/// \addtogroup gutils
-/// @{
+  /// \addtogroup gutils
+  /// @{
 
   /// \brief Function to count the items in the graph.
@@ -161 +160 @@
   template <typename Graph>
   typename Graph::Edge findEdge(const Graph &g,
-                typename Graph::Node u, typename Graph::Node v,
-                typename Graph::Edge prev = INVALID) 
+                                typename Graph::Node u, typename Graph::Node v,
+                                typename Graph::Edge prev = INVALID) 
   {
     typename Graph::OutEdgeIt e(g,prev);
@@ -226 +225 @@
   }
  
-   template <
+  template <
     typename _DestinationGraph, 
     typename _SourceGraph, 
@@ -232 +231 @@
     =typename _SourceGraph::template NodeMap<typename _DestinationGraph::Node>,
     typename _EdgeBijection 
-    =typename _SourceGraph::template EdgeMap<typename _DestinationGraph::Edge>
-   >
-   class GraphCopy {
-   public:
-
-     typedef _DestinationGraph DestinationGraph;
-     typedef _SourceGraph SourceGraph;
-
-     typedef _NodeBijection NodeBijection;
-     typedef _EdgeBijection EdgeBijection;
-
-   protected:          
-
-     NodeBijection node_bijection;
-     EdgeBijection edge_bijection;     
-
-   public:
+    = typename _SourceGraph::template EdgeMap<typename _DestinationGraph::Edge>
+  >
+  class GraphCopy {
+  public:
+    
+    typedef _DestinationGraph DestinationGraph;
+    typedef _SourceGraph SourceGraph;
+
+    typedef _NodeBijection NodeBijection;
+    typedef _EdgeBijection EdgeBijection;
+    
+  protected:          
+    
+    NodeBijection node_bijection;
+    EdgeBijection edge_bijection;     
+
+  public:
      
-     GraphCopy(DestinationGraph& _d, const SourceGraph& _s) {
-       copyGraph(_d, _s, node_bijection, edge_bijection);
-     }
-
-     const NodeBijection& getNodeBijection() const {
-       return node_bijection;
-     }
-
-     const EdgeBijection& getEdgeBijection() const {
-       return edge_bijection;
-     }
+    GraphCopy(DestinationGraph& _d, const SourceGraph& _s) {
+      copyGraph(_d, _s, node_bijection, edge_bijection);
+    }
+    
+    const NodeBijection& getNodeBijection() const {
+      return node_bijection;
+    }
+
+    const EdgeBijection& getEdgeBijection() const {
+      return edge_bijection;
+    }
      
-   };
+  };
+
+
+  template <typename _Graph, typename _Item>
+  class ItemSetTraits {
+  };
   
   template <typename _Graph>
-  class GraphNodeSet {
+  class ItemSetTraits<_Graph, typename _Graph::Node> {
   public:
     
@@ -284 +288 @@
     };
 
-    typedef IdMap<Graph, Item> IdMap;
-    
-  private:
-    Graph* graph;
   };
 
   template <typename _Graph>
-  class GraphEdgeSet {
+  class ItemSetTraits<_Graph, typename _Graph::Edge> {
   public:
     
@@ -310 +310 @@
     };
 
-    typedef IdMap<Graph, Item> IdMap;
-    
-  private:
-    Graph* graph;
-  };
-
+  };
+
+  template <typename _Graph>
+  class ItemSetTraits<_Graph, typename _Graph::UndirEdge> {
+  public:
+    
+    typedef _Graph Graph;
+
+    typedef typename Graph::UndirEdge Item;
+    typedef typename Graph::UndirEdgeIt ItemIt;
+
+    template <typename _Value>
+    class Map : public Graph::template UndirEdgeMap<_Value> {
+    public:
+      typedef typename Graph::template UndirEdgeMap<_Value> Parent; 
+      typedef typename Parent::Value Value;
+
+      Map(const Graph& _graph) : Parent(_graph) {}
+      Map(const Graph& _graph, const Value& _value) 
+        : Parent(_graph, _value) {}
+    };
+
+  };
 
   /// @}