Changeset 980:0f1044b7a3af in lemon-0.x for src/lemon/array_map.h

Timestamp:

11/11/04 10:31:55 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

maxNodeId() and maxEdgeId() changed to maxId(Node) and maxId(Edge)
getNodeObserverRegistry() and getEdgeObserverRegistry() changed to
getObserverRegistry(Node) and getObserverRegistry(Edge)

IdMappableGraphExtender? erased

File:

• src/lemon/array_map.h (modified) (20 diffs)

src/lemon/array_map.h

@@ -45 +45 @@
             typename _Item,
             typename _ItemIt,
-            typename _IdMap,
             typename _Value>
   class ArrayMap : public AlterationObserverRegistry<_Item>::ObserverBase {
@@ -61 +60 @@
     /// The iterator to iterate on the keys.
     typedef _ItemIt KeyIt;
-
-    typedef _IdMap IdMap;
 
     typedef _Value Value;
@@ -95 +92 @@
     /** Graph and Registry initialized map constructor.
      */
-    ArrayMap(const Graph& _g, Registry& _r) : graph(&_g) {
-      attach(_r);
+    ArrayMap(const Graph& _g) : graph(&_g) {
+      attach(_g.getObserverRegistry(_Item()));
       allocate_memory();
       for (KeyIt it(*graph); it != INVALID; ++it) {
-        int id = IdMap(*graph)[it];
+        int id = graph->id(it);;
         allocator.construct(&(values[id]), Value());
       }                                                         
@@ -108 +105 @@
     /// It constrates a map and initialize all of the the map. 
 
-    ArrayMap(const Graph& _g, Registry& _r, const Value& _v) : graph(&_g) {
-      attach(_r);
+    ArrayMap(const Graph& _g, const Value& _v) : graph(&_g) {
+      attach(_g.getObserverRegistry(_Item()));
       allocate_memory();
       for (KeyIt it(*graph); it != INVALID; ++it) {
-        int id = IdMap(*graph)[it];
+        int id = graph->id(it);;
         allocator.construct(&(values[id]), _v);
       }                                                         
@@ -127 +124 @@
       values = allocator.allocate(capacity);
       for (KeyIt it(*graph); it != INVALID; ++it) {
-        int id = IdMap(*graph)[it];
+        int id = graph->id(it);;
         allocator.construct(&(values[id]), copy.values[id]);
       }
@@ -155 +152 @@
 
       for (KeyIt it(*graph); it != INVALID; ++it) {
-        int id = IdMap(*graph)[it];
+        int id = graph->id(it);;
         allocator.construct(&(values[id]), copy.values[id]);
       }
@@ -177 +174 @@
      */
     ReferenceType operator[](const KeyType& key) {
-      int id = IdMap(*graph)[key];
+      int id = graph->id(key);
       return values[id];
     } 
@@ -186 +183 @@
      */
     ConstReferenceType operator[](const KeyType& key) const {
-      int id = IdMap(*graph)[key];
+      int id = graph->id(key);
       return values[id];
     }
@@ -200 +197 @@
      */
     void add(const KeyType& key) {
-      int id = IdMap(*graph)[key];
+      int id = graph->id(key);
       if (id >= capacity) {
         int new_capacity = (capacity == 0 ? 1 : capacity);
@@ -208 +205 @@
         Value* new_values = allocator.allocate(new_capacity);
         for (KeyIt it(*graph); it != INVALID; ++it) {
-          int jd = IdMap(*graph)[it];
+          int jd = graph->id(it);;
           if (id != jd) {
             allocator.construct(&(new_values[jd]), values[jd]);
@@ -224 +221 @@
      */
     void erase(const KeyType& key) {
-      int id = IdMap(*graph)[key];
+      int id = graph->id(key);
       allocator.destroy(&(values[id]));
     }
@@ -231 +228 @@
       allocate_memory();
       for (KeyIt it(*graph); it != INVALID; ++it) {
-        int id = IdMap(*graph)[it];
+        int id = graph->id(it);;
         allocator.construct(&(values[id]), Value());
       }                                                         
@@ -239 +236 @@
       if (capacity != 0) {
         for (KeyIt it(*graph); it != INVALID; ++it) {
-          int id = IdMap(*graph)[it];
+          int id = graph->id(it);;
           allocator.destroy(&(values[id]));
         }                                                               
@@ -303 +300 @@
       
     void allocate_memory() {
-      int max_id = IdMap(*graph).maxId();
+      int max_id = graph->maxId(_Item());
       if (max_id == -1) {
         capacity = 0;
@@ -344 +341 @@
     typedef typename Parent::Node Node;
     typedef typename Parent::NodeIt NodeIt;
-    typedef typename Parent::NodeIdMap NodeIdMap;
     typedef typename Parent::NodeObserverRegistry NodeObserverRegistry;
 
     typedef typename Parent::Edge Edge;
     typedef typename Parent::EdgeIt EdgeIt;
-    typedef typename Parent::EdgeIdMap EdgeIdMap;
     typedef typename Parent::EdgeObserverRegistry EdgeObserverRegistry;
 
@@ -355 +350 @@
 
     template <typename _Value>
-    class NodeMap : public ArrayMap<Graph, Node, NodeIt, NodeIdMap, _Value> {
+    class NodeMap : public ArrayMap<Graph, Node, NodeIt, _Value> {
     public:
       typedef ArrayMappableGraphExtender<_Base> Graph;
@@ -361 +356 @@
       typedef typename Graph::Node Node;
       typedef typename Graph::NodeIt NodeIt;
-      typedef typename Graph::NodeIdMap NodeIdMap;
-
-      typedef ArrayMap<Graph, Node, NodeIt, NodeIdMap, _Value> Parent;
+
+      typedef ArrayMap<Graph, Node, NodeIt, _Value> Parent;
 
       //typedef typename Parent::Graph Graph;
@@ -369 +363 @@
 
       NodeMap(const Graph& g) 
-        : Parent(g, g.getNodeObserverRegistry()) {}
+        : Parent(g) {}
       NodeMap(const Graph& g, const Value& v) 
-        : Parent(g, g.getNodeObserverRegistry(), v) {}
+        : Parent(g, v) {}
 
     };
 
     template <typename _Value>
-    class EdgeMap : public ArrayMap<Graph, Edge, EdgeIt, EdgeIdMap, _Value> {
+    class EdgeMap : public ArrayMap<Graph, Edge, EdgeIt, _Value> {
     public:
       typedef ArrayMappableGraphExtender<_Base> Graph;
@@ -382 +376 @@
       typedef typename Graph::Edge Edge;
       typedef typename Graph::EdgeIt EdgeIt;
-      typedef typename Graph::EdgeIdMap EdgeIdMap;
-
-      typedef ArrayMap<Graph, Edge, EdgeIt, EdgeIdMap, _Value> Parent;
+
+      typedef ArrayMap<Graph, Edge, EdgeIt, _Value> Parent;
 
       //typedef typename Parent::Graph Graph;
@@ -390 +383 @@
 
       EdgeMap(const Graph& g) 
-        : Parent(g, g.getEdgeObserverRegistry()) {}
+        : Parent(g) {}
       EdgeMap(const Graph& g, const Value& v) 
-        : Parent(g, g.getEdgeObserverRegistry(), v) {}
+        : Parent(g, v) {}
 
     };