Changeset 378:c3f93631cd24 in lemon-0.x for src/work/deba/test_graph.h

Timestamp:

04/22/04 22:36:21 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

 

File:

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

src/work/deba/test_graph.h

@@ -8 +8 @@
 #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"
 
@@ -43 +39 @@
   private:
 
-                NodeMapRegistry<ListGraph, Node> node_maps(*this);
-                EdgeMapRegistry<ListGraph, Edge> edge_maps(*this);
+                typedef MapRegistry<ListGraph, Node, NodeIt> NodeMapRegistry;
+                NodeMapRegistry node_maps;
+                
+                typedef MapRegistry<ListGraph, Edge, EdgeIt> EdgeMapRegistry;
+                EdgeMapRegistry edge_maps;
  
         public:
@@ -50 +49 @@
 
     template <typename T>
-    class NodeMap : public VectorMap<ListGraph, Node, T, NodeMapBase> {
+    class NodeMap : public VectorMap<ListGraph, Node, NodeIt, T> {
                 public:
-                        NodeMap(ListGraph& g) : VectorMap<ListGraph, Node, T, NodeMapBase>(g) {}
+                        NodeMap(ListGraph& g) : VectorMap<ListGraph, Node, NodeIt, T>(g.node_maps) {}
                 };
                 
-                EdgeMapRegistry<ListGraph, Edge> edge_maps;
-
     template <typename T>
-    class EdgeMap : public VectorMap<ListGraph, Edge, T, EdgeMapBase> {};
+    class EdgeMap : public VectorMap<ListGraph, Edge, EdgeIt, T> {
+                public:
+                        EdgeMap(ListGraph& g) : VectorMap<ListGraph, Edge, EdgeIt, T>(g.edge_maps) {}
+                };
 
 
@@ -216 +216 @@
     /* default constructor */
 
-    ListGraph() : node_id(0), edge_id(0), _node_num(0), _edge_num(0), _first_node(0), _last_node(0) { }
+    ListGraph() : node_id(0), edge_id(0), _node_num(0), _edge_num(0), _first_node(0), _last_node(0),
+                        edge_maps(*this), node_maps(*this) { }
     
     ~ListGraph() {