Changeset 1022:567f392d1d2e in lemon-0.x for src/lemon/default_map.h

Timestamp:

11/28/04 17:30:10 (19 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

UndirGraph? implementation nearly complete

File:

• src/lemon/default_map.h (modified) (2 diffs)

src/lemon/default_map.h

@@ -173 +173 @@
     class NodeMap : public DefaultMap<Graph, Node, NodeIt, _Value> {
     public:
-      typedef DefaultMappableGraphExtender<_Base> Graph;
-
-      typedef typename Graph::Node Node;
-      typedef typename Graph::NodeIt NodeIt;
-
+      typedef DefaultMappableGraphExtender Graph;
       typedef DefaultMap<Graph, Node, NodeIt, _Value> Parent;
-
-      //typedef typename Parent::Graph Graph;
-      typedef typename Parent::Value Value;
 
       NodeMap(const Graph& _g) 
         : Parent(_g) {}
-      NodeMap(const Graph& _g, const Value& _v) 
+      NodeMap(const Graph& _g, const _Value& _v) 
         : Parent(_g, _v) {}
-
     };
 
@@ -193 +185 @@
     class EdgeMap : public DefaultMap<Graph, Edge, EdgeIt, _Value> {
     public:
-      typedef DefaultMappableGraphExtender<_Base> Graph;
-
-      typedef typename Graph::Edge Edge;
-      typedef typename Graph::EdgeIt EdgeIt;
-
+      typedef DefaultMappableGraphExtender Graph;
       typedef DefaultMap<Graph, Edge, EdgeIt, _Value> Parent;
-
-      //typedef typename Parent::Graph Graph;
-      typedef typename Parent::Value Value;
 
       EdgeMap(const Graph& _g) 
         : Parent(_g) {}
-      EdgeMap(const Graph& _g, const Value& _v) 
+      EdgeMap(const Graph& _g, const _Value& _v) 
         : Parent(_g, _v) {}
-
     };
     
   };
 
+  template <typename _Base> 
+  class MappableUndirGraphExtender : 
+    public DefaultMappableGraphExtender<_Base> {
+  public:
+
+    typedef MappableUndirGraphExtender Graph;
+    typedef DefaultMappableGraphExtender<_Base> Parent;
+
+    typedef typename Parent::UndirEdge UndirEdge;
+    typedef typename Parent::UndirEdgeIt UndirEdgeIt;
+
+    template <typename _Value>
+    class UndirEdgeMap :
+      public DefaultMap<Graph, UndirEdge, UndirEdgeIt, _Value> {
+    public:
+      typedef MappableUndirGraphExtender Graph;
+      typedef DefaultMap<Graph, UndirEdge, UndirEdgeIt, _Value> Parent;
+
+      UndirEdgeMap(const Graph& _g) 
+        : Parent(_g) {}
+      UndirEdgeMap(const Graph& _g, const _Value& _v) 
+        : Parent(_g, _v) {}
+    };
+
+
+  };
 
 }