Changeset 377:33fe0ee01dc5 in lemon-0.x

Timestamp:

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

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

 

Location:

src/work/deba

Files:

• edge_map_base.h (modified) (4 diffs)
• edge_map_register.h (deleted)
• edge_map_registry.h (modified) (4 diffs)
• mapbase.h (deleted)
• mappedgraph.h (deleted)
• node_map_base.h (modified) (5 diffs)
• node_map_registry.h (modified) (3 diffs)
• slowgraph.h (deleted)
• test_graph.h (modified) (3 diffs)
• vector_map.h (modified) (2 diffs)

src/work/deba/edge_map_base.h

@@ -12 +12 @@
 template <typename G, typename K>
 class EdgeMapBase {
+
+#include "edge_map_registry.h"
+
 public:
         typedef G Graph;
+        friend class EdgeMapRegistry<G, K>;
 
         typedef K KeyType;
@@ -78 +82 @@
         
         void init() {
-                for (Graph::EdgeIt it(g); g.valid(it); g.next(it)) {
+                for (typename Graph::EdgeIt it(g); g.valid(it); g.next(it)) {
                         add(it);
                 }
@@ -88 +92 @@
         
         void destroy() {
-                for (Graph::EdgeIt it(g); g.valid(it); g.next(it)) {
+                for (typename Graph::EdgeIt it(g); g.valid(it); g.next(it)) {
                         erase(it);
                 }
@@ -113 +117 @@
         class NotSupportedOperationException {};
 
-        friend class Graph;
 };
 

src/work/deba/edge_map_registry.h

@@ -4 +4 @@
 #include <vector>
 
+template <typename G, typename K>
+class EdgeMapRegistry;
+
 #include "edge_map_base.h"
 
-template <typename G, typename E>
+template <typename G, typename K>
 class EdgeMapRegistry {
 public:
         typedef G Graph;
-        typedef E Edge
+        typedef K Edge;
         
         typedef EdgeMapBase<Graph, Edge> MapBase;
+        friend class MapBase;
 
 protected:
-        typedef std::vector<EdgeMapBase*> Container; 
+        
+        Graph* graph;
+
+        typedef std::vector<MapBase*> Container; 
         
         Container container;
-        
+
+public:
+
+        EdgeMapRegistry(Graph g) : graph(&g) {}
+
         void add(MapBase& map_base) {
                 if (map_base.graph) {
@@ -24 +35 @@
                 }
                 container.push_back(&map_base);
-                map_base.graph = this;
+                map_base.graph = graph;
                 map_base.graph_index = container.size()-1;
         } 
         
         void erase(MapBase& map_base) {
-                if (map_base.graph != this) return;
                 container.back()->graph_index = map_base.graph_index; 
                 container[map_base.graph_index] = container.back();
@@ -35 +45 @@
                 map_base.graph = 0;
         }
+
         
         void add(Edge& edge) {
@@ -50 +61 @@
         }
 
-        friend class MapBase;
 };
 

src/work/deba/node_map_base.h

@@ -12 +12 @@
 template <typename G, typename K>
 class NodeMapBase {
+
+#include "node_map_registry.h"
+
 public:
         typedef G Graph;
+        friend class NodeMapRegistry<G, K>;
 
         typedef K KeyType;
@@ -63 +67 @@
         virtual ~NodeMapBase() {
                 if (graph) {
-                        graph.node_maps.erase(*this);
+                        graph->node_maps.erase(*this);
                 }
         }
@@ -78 +82 @@
         
         void init() {
-                for (Graph::NodeIt it(g); g.valid(it); g.next(it)) {
+                for (typename Graph::NodeIt it(g); g.valid(it); g.next(it)) {
                         add(it);
                 }
@@ -88 +92 @@
         
         void destroy() {
-                for (Graph::NodeIt it(g); g.valid(it); g.next(it)) {
+                for (typename Graph::NodeIt it(g); g.valid(it); g.next(it)) {
                         erase(it);
                 }
@@ -113 +117 @@
         class NotSupportedOperationException {};
 
-        friend class Graph;
 };
 

src/work/deba/node_map_registry.h

@@ -4 +4 @@
 #include <vector>
 
+template <typename G, typename K>
+class NodeMapRegistry;
+
 #include "node_map_base.h"
 
-template <typename G, typename E>
+template <typename G, typename K>
 class NodeMapRegistry {
 public:
         typedef G Graph;
-        typedef E Node
+        typedef K Node;
         
-        typedef NodeMapBase<Graph, Node> NodeMapBase;
+        typedef NodeMapBase<Graph, Node> MapBase;
+        friend class MapBase;
 
 protected:
-        typedef std::vector<NodeMapBase*> Container; 
+        
+        Graph* graph;
+
+        typedef std::vector<MapBase*> Container; 
         
         Container container;
-        
-        void add(NodeMapBase& map_base) {
+
+public:
+
+        NodeMapRegistry(Graph g) : graph(&g) {}
+
+        void add(MapBase& map_base) {
                 if (map_base.graph) {
                         map_base.graph->node_maps.erase(map_base);
                 }
                 container.push_back(&map_base);
-                map_base.graph = this;
+                map_base.graph = graph;
                 map_base.graph_index = container.size()-1;
         } 
         
-        void erase(NodeMapBase& map_base) {
-                if (map_base.graph != this) return;
+        void erase(MapBase& map_base) {
                 container.back()->graph_index = map_base.graph_index; 
                 container[map_base.graph_index] = container.back();
@@ -35 +45 @@
                 map_base.graph = 0;
         }
+
         
         void add(Node& node) {
@@ -50 +61 @@
         }
 
-        friend class NodeMapBase;
 };
 

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));

src/work/deba/vector_map.h

@@ -35 +35 @@
         
         void add(const K& key) {
-                container.resize(key->id);
+                if (key->id() >= container.size()) {
+                        container.resize(key->id() + 1);
+                }
         }
         
@@ -44 +46 @@
         
         Container container;
-}
+};
 
 #endif