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

Timestamp:

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

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

 

Location:

src/work/deba

Files:

• edge_map_base.h (deleted)
• edge_map_registry.h (deleted)
• invalid.h (added)
• main.cpp (added)
• map_base.h (added)
• map_registry.h (added)
• node_map_base.h (deleted)
• node_map_registry.h (deleted)
• test_graph.h (modified) (4 diffs)
• vector_edge_map.h (deleted)
• vector_map.h (modified) (1 diff)

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() { 

src/work/deba/vector_map.h

@@ -3 +3 @@
 
 #include <vector>
+#include <iostream>
 
-template <typename G, typename K, typename V, template <typename, typename> class MapBase > 
-class VectorMap : public MapBase<G, K> {
-public:
-        typedef V ValueType;
+#include "map_base.h"
+
+namespace hugo {
+
+        template <typename G, typename K, typename KIt, typename V> 
+        class VectorMap : public MapBase<G, K, KIt> {
+        public:
+                typedef V ValueType;
         
-        VectorMap() {}
-        VectorMap(G& g) : MapBase<G, K>(g) {
-                init();
-        }
+                VectorMap() {}
+                VectorMap(typename MapBase<G, K, KIt>::Registry& r) : MapBase<G, K, KIt>(r) {}
         
-        ~VectorMap() {
-//              destroy();
-        } 
         
-        ValueType& operator[](const K& key) {
-                return container[key->id];
-        } 
+                ValueType& operator[](const K& key) {
+                        int id = registry->getGraph().id(key);
+                        return container[id];
+                } 
         
-        const ValueType& operator[](const K& key) const {
-                return container[key->id];
-        }
+                const ValueType& operator[](const K& key) const {
+                        int id = registry->getGraph().id(key);
+                        return container[id];
+                }
         
-        const ValueType& get(const K& key) const {
-                return container[key->id];
-        } 
+                const ValueType& get(const K& key) const {
+                        int id = registry->getGraph().id(key);
+                        return container[id];
+                } 
         
-        void set(const K& key, const ValueType& val) {
-                container[key->id] = val;
-        }
+                void set(const K& key, const ValueType& val) {
+                        int id = registry->getGraph().id(key);
+                        container[id] = val;
+                }
         
-        void add(const K& key) {
-                if (key->id() >= container.size()) {
-                        container.resize(key->id() + 1);
+                void add(const K& key) {
+                        int id = registry->getGraph().id(key);
+                        std::cerr << id << std::endl;
+                        if (id >= container.size()) {
+                                container.resize(id + 1);
+                        }
                 }
-        }
         
-        void erase(const K& key) {}
+                void erase(const K& key) {}
 
-private:
-        typedef std::vector<ValueType> Container;
+        private:
+                typedef std::vector<ValueType> Container;
         
-        Container container;
-};
+                Container container;
+        };
+
+}
 
 #endif