Changeset 377:33fe0ee01dc5 in lemon-0.x for src/work/deba/test_graph.h

Timestamp:

04/22/04 18:36:57 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

 

File:

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

src/work/deba/test_graph.h

@@ -6 +6 @@
 #include <vector>
 
-#include <invalid.h>
-
-#include "vector_map.h"
+#include "invalid.h"
+
 #include "edge_map_registry.h"
 #include "node_map_registry.h"
 #include "edge_map_base.h"
 #include "node_map_base.h"
+#include "vector_map.h"
 
 namespace hugo {
@@ -41 +41 @@
  //   template <typename T> friend class EdgeMap;
  
-                NodeMapRegistry<ListGraph, Node> node_maps;
+  private:
+
+                NodeMapRegistry<ListGraph, Node> node_maps(*this);
+                EdgeMapRegistry<ListGraph, Edge> edge_maps(*this);
+ 
+        public:
+ 
 
     template <typename T>
-    class NodeMap : public VectorMap<ListGraph, Edge, T, EdgeMapBase> {};
+    class NodeMap : public VectorMap<ListGraph, Node, T, NodeMapBase> {
+                public:
+                        NodeMap(ListGraph& g) : VectorMap<ListGraph, Node, T, NodeMapBase>(g) {}
+                };
                 
                 EdgeMapRegistry<ListGraph, Edge> edge_maps;
 
     template <typename T>
-    class EdgeMap : public VectorMap<Graph, Node, T, NodeMapBase> {};
+    class EdgeMap : public VectorMap<ListGraph, Edge, T, EdgeMapBase> {};
 
 
@@ -311 +320 @@
 
     void erase(Node i) { 
-                        node_map.erase(i);
+                        node_maps.erase(i);
       while (first<OutEdgeIt>(i).valid()) erase(first<OutEdgeIt>(i));
       while (first<InEdgeIt>(i).valid()) erase(first<InEdgeIt>(i));