Changeset 571:9632ea8be6ca in lemon-0.x for src/work

Timestamp:

05/07/04 10:18:30 (21 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

 

Location:

src/work/deba

Files:

• main.cpp (modified) (1 diff)
• map_base.h (modified) (7 diffs)
• map_registry.h (modified) (2 diffs)
• test_graph.h (modified) (3 diffs)
• vector_map.h (deleted)
• vector_map_factory.h (added)

src/work/deba/main.cpp

@@ -8 +8 @@
 int main() {
         ListGraph g;
-        ListGraph::NodeMap<int> map(g);
+        ListGraph::NodeMapFactory::VectorMap<int> map(g, g.node_maps);
         ListGraph::Node node = g.addNode();
         map[node] = 12; 

src/work/deba/map_base.h

@@ -40 +40 @@
                 */
         
-                MapBase(Registry& r) : registry(0) {
-                        registry->add(*this);
+                MapBase(Graph& g, Registry& r) : graph(&g), registry(0) {
+                        registry->attach(*this);
                 }
 
@@ -48 +48 @@
                 */      
         
-                MapBase(const MapBase& copy) : registry(0) {
-                        if (registry) {
-                                registry->add(*this);
+                MapBase(const MapBase& copy) : registry(0), graph(copy.graph) {
+                        if (copy.registry) {
+                                copy.registry->attach(*this);
                         }
                 } 
@@ -60 +60 @@
                 const MapBase& operator=(const MapBase& copy) {
                         if (registry) {
-                                registry->erase(*this);
+                                registry->detach(*this);
                         }
-                        registry = copy.registry;
-                        if (registry) {
-                                registry->add(*this);
+                        graph = copy.graph;
+                        if (copy.registry) {
+                                copy.registry->attach(*this);
                         }
                 }
@@ -75 +75 @@
                 virtual ~MapBase() {
                         if (registry) {
-                                registry->erase(*this);
+                                registry->detach(*this);
                         }
                 }
@@ -82 +82 @@
                 
                 Registry* registry;
+                Graph* graph;
 
                 int registry_index;
@@ -89 +90 @@
                 */
         
-                virtual void init(Graph& g) {
+                virtual void init() {
 
-                        for (KeyIt it(g); g.valid(it); g.next(it)) {
+                        for (KeyIt it(*graph); graph->valid(it); graph->next(it)) {
                                 add(it);
                         }
@@ -100 +101 @@
                 */
         
-                virtual void destroy(Graph& g) {
-                        for (KeyIt it(g); g.valid(it); g.next(it)) {
+                virtual void destroy() {
+                        for (KeyIt it(*graph); graph->valid(it); graph->next(it)) {
                                 erase(it);
                         }

src/work/deba/map_registry.h

@@ -29 +29 @@
           Container container;
 
-                Graph* graph;           
-                
                 
         public:
         
-                MapRegistry(Graph& g) : container(0), graph(&g) {}
+                MapRegistry() {}
+        
+                MapRegistry(const MapRegistry&) {}
+                
+                MapRegistry& operator=(const MapRegistry&) {
+                        for (it = container.begin(); it != container.end(); ++it) {
+                                (*it)->destroy();
+                                (*it)->graph = 0;
+                                (*it)->registry = 0;
+                        }
+                }
                                 
                 ~MapRegistry() {
                         typename Container::iterator it;
                         for (it = container.begin(); it != container.end(); ++it) {
-                                (*it)->destroy(*graph);
+                                (*it)->destroy();
                                 (*it)->registry = 0;
+                                (*it)->graph = 0;
                         }
                 }
         
-        private:
-                MapRegistry(const MapRegistry& ) {}
-                MapRegistry& operator=(const MapRegistry& ) {}
         
         public:
         
-                void add(Map& map) {
+                void attach(Map& map) {
                         if (map.registry) {
-                                map.registry->erase(map);
+                                map.registry->detach(map);
                         }
                         container.push_back(&map);
                         map.registry = this;
                         map.registry_index = container.size()-1;
-                        map.init(*graph);
+                        map.init();
                 } 
         
-                void erase(Map& map_base) {
-                        map_base.destroy(*graph);
+                void detach(Map& map_base) {
+                        map_base.destroy();
                         container.back()->registry_index = map_base.registry_index; 
                         container[map_base.registry_index] = container.back();
                         container.pop_back();
                         map_base.registry = 0;
+                        map_base.graph = 0;
                 }
         
@@ -83 +90 @@
                 }
 
-                Graph& getGraph() {
-                        return *graph;
-                }
-
-
         };
 

src/work/deba/test_graph.h

@@ -8 +8 @@
 #include "invalid.h"
 
-#include "vector_map.h"
+#include "vector_map_factory.h"
 
 namespace hugo {
@@ -39 +39 @@
   private:
 
+ 
+        public:
+        
                 typedef MapRegistry<ListGraph, Node, NodeIt> NodeMapRegistry;
                 NodeMapRegistry node_maps;
                 
+                
                 typedef MapRegistry<ListGraph, Edge, EdgeIt> EdgeMapRegistry;
                 EdgeMapRegistry edge_maps;
+
+                typedef VectorMapFactory<ListGraph, Edge, EdgeIt> EdgeMapFactory;
+                typedef VectorMapFactory<ListGraph, Node, NodeIt> NodeMapFactory;
  
-        public:
- 
-
-    template <typename T>
-    class NodeMap : public VectorMap<ListGraph, Node, NodeIt, T> {
-                public:
-                        NodeMap(ListGraph& g) : VectorMap<ListGraph, Node, NodeIt, T>(g.node_maps) {}
-                };
-                
-    template <typename T>
-    class EdgeMap : public VectorMap<ListGraph, Edge, EdgeIt, T> {
-                public:
-                        EdgeMap(ListGraph& g) : VectorMap<ListGraph, Edge, EdgeIt, T>(g.edge_maps) {}
-                };
-
 
     int node_id;
@@ -216 +208 @@
     /* default constructor */
 
-    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() : node_id(0), edge_id(0), _node_num(0), _edge_num(0), _first_node(0), _last_node(0){ }
     
     ~ListGraph() {