Changeset 340:a2ce3c4780b7 in lemon-0.x for src/work/deba/test_graph.h

Timestamp:

04/16/04 15:42:03 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

 

File:

• src/work/deba/test_graph.h (modified) (4 diffs)

src/work/deba/test_graph.h

@@ -7 +7 @@
 
 #include <invalid.h>
+
+#include "vector_map.h"
+#include "edge_map_registry.h"
+#include "node_map_registry.h"
+#include "edge_map_base.h"
+#include "node_map_base.h"
 
 namespace hugo {
@@ -29 +35 @@
     class SymEdgeIt;
     
-    template <typename T> class NodeMap;
-    template <typename T> class EdgeMap;
+//    template <typename T> class NodeMap;
+//    template <typename T> class EdgeMap;
   private:
-    template <typename T> friend class NodeMap;
-    template <typename T> friend class EdgeMap;
+//    template <typename T> friend class NodeMap;
+ //   template <typename T> friend class EdgeMap;
  
+                NodeMapRegistry<ListGraph, Node> node_maps;
+
     template <typename T>
-    class NodeMap {
-      const ListGraph& G; 
-      std::vector<T> container;
-    public:
-      typedef T ValueType;
-      typedef Node KeyType;
-      NodeMap(const ListGraph& _G) : G(_G), container(G.node_id) { }
-      NodeMap(const ListGraph& _G, T a) : 
-        G(_G), container(G.node_id, a) { }
-      void set(Node n, T a) { container[/*G.id(n)*/n.node->id]=a; }
-      T get(Node n) const { return container[/*G.id(n)*/n.node->id]; }
-      typename std::vector<T>::reference operator[](Node n) { 
-        return container[/*G.id(n)*/n.node->id]; }
-      typename std::vector<T>::const_reference operator[](Node n) const { 
-        return container[/*G.id(n)*/n.node->id]; 
-      }
-      void update() { container.resize(G.node_id); }
-      void update(T a) { container.resize(G.node_id, a); }
-    };
+    class NodeMap : public VectorMap<ListGraph, Edge, T, EdgeMapBase> {};
+                
+                EdgeMapRegistry<ListGraph, Edge> edge_maps;
 
     template <typename T>
-    class EdgeMap {
-      const ListGraph& G; 
-      std::vector<T> container;
-    public:
-      typedef T ValueType;
-      typedef Edge KeyType;
-      EdgeMap(const ListGraph& _G) : G(_G), container(G.edge_id) { }
-      EdgeMap(const ListGraph& _G, T a) : 
-        G(_G), container(G.edge_id, a) { }
-      void set(Edge e, T a) { container[/*G.id(e)*/e.edge->id]=a; }
-      T get(Edge e) const { return container[/*G.id(e)*/e.edge->id]; }
-      typename std::vector<T>::reference operator[](Edge e) { 
-        return container[/*G.id(e)*/e.edge->id]; } 
-      typename std::vector<T>::const_reference operator[](Edge e) const { 
-        return container[/*G.id(e)*/e.edge->id]; 
-      } 
-      void update() { container.resize(G.edge_id); }
-      void update(T a) { container.resize(G.edge_id, a); }
-    };
+    class EdgeMap : public VectorMap<Graph, Node, T, NodeMapBase> {};
+
 
     int node_id;
@@ -324 +299 @@
     /* adding nodes and edges */
 
-    Node addNode() { return Node(_add_node()); }
+    Node addNode() { 
+                        Node n = _add_node();
+                        node_maps.add(n);
+                        return n; 
+                }
     Edge addEdge(Node u, Node v) {
-      return Edge(_add_edge(u.node, v.node)); 
+                        Edge e = _add_edge(u.node, v.node);
+                        edge_maps.add(e);
+      return e; 
     }
 
     void erase(Node i) { 
+                        node_map.erase(i);
       while (first<OutEdgeIt>(i).valid()) erase(first<OutEdgeIt>(i));
       while (first<InEdgeIt>(i).valid()) erase(first<InEdgeIt>(i));
@@ -335 +317 @@
     }
   
-    void erase(Edge e) { _delete_edge(e.edge); }
+    void erase(Edge e) { 
+                        edge_maps.erase(e);
+                        _delete_edge(e.edge); 
+                }
 
     void clear() {