Changeset 844:9bf990cb066d in lemon-0.x for src/hugo/array_map.h

Timestamp:

09/13/04 22:05:13 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Bug fix in the symmetric maps.
Faster map initialization.
Iterators and Containers STL compatible.

File:

• src/hugo/array_map.h (modified) (14 diffs)

src/hugo/array_map.h

@@ -6 +6 @@
 
 #include <hugo/map_iterator.h>
+#include <hugo/map_bits.h>
 
 ///\ingroup graphmaps
@@ -72 +73 @@
       allocate_memory();
       for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
-        int id = MapBase::getGraph()->id(it);
+        int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), it);
         allocator.construct(&(values[id]), Value());
       }                                                         
@@ -83 +84 @@
       allocate_memory();
       for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
-        int id = MapBase::getGraph()->id(it);
+        int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), it);
         allocator.construct(&(values[id]), v);
       }                                                         
@@ -95 +96 @@
       values = allocator.allocate(capacity);
       for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
-        int id = MapBase::getGraph()->id(it);
+        int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), it);
         allocator.construct(&(values[id]), copy.values[id]);
       }
@@ -124 +125 @@
       values = allocator.allocate(capacity);
       for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
-        int id = MapBase::getGraph()->id(it);
+        int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), it);
         allocator.construct(&(values[id]), copy.values[id]);
       }
@@ -133 +134 @@
      */
     template <typename CMap> ArrayMap& operator=(const CMap& copy) {
-      if (MapBase::getGraph()) {
+      if (capacity != 0) {
         MapBase::destroy();
-      } 
+        allocator.deallocate(values, capacity);
+      }
       MapBase::operator=(copy);
       if (MapBase::getGraph()) {
@@ -161 +163 @@
      */
     ReferenceType operator[](const KeyType& key) {
-      int id = MapBase::getGraph()->id(key);
+      int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), key);
       return values[id];
     } 
@@ -170 +172 @@
      */
     ConstReferenceType operator[](const KeyType& key) const {
-      int id = MapBase::getGraph()->id(key);
+      int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), key);
       return values[id];
     }
@@ -178 +180 @@
      */
     void set(const KeyType& key, const ValueType& val) {
-      int id = MapBase::getGraph()->id(key);
+      int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), key);
       values[id] = val;
     }
@@ -185 +187 @@
      */
     void add(const KeyType& key) {
-      int id = MapBase::getGraph()->id(key);
+      int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), key);
       if (id >= capacity) {
         int new_capacity = (capacity == 0 ? 1 : capacity);
@@ -193 +195 @@
         Value* new_values = allocator.allocate(new_capacity);;
         for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
-          int jd = MapBase::getGraph()->id(it);
+          int jd = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), it);
           if (id != jd) {
             allocator.construct(&(new_values[jd]), values[jd]);
@@ -209 +211 @@
      */
     void erase(const KeyType& key) {
-      int id = MapBase::getGraph()->id(key);
+      int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), key);
       allocator.destroy(&(values[id]));
     }
@@ -279 +281 @@
       
     void allocate_memory() {
-      int max_id = -1;
-      for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
-        int id = MapBase::getGraph()->id(it);
-        if (id > max_id) {
-          max_id = id;
-        }                       
-      }
+      int max_id = KeyInfo<Graph, KeyIt>::maxId(*MapBase::getGraph());
       if (max_id == -1) {
         capacity = 0;
@@ -301 +297 @@
     Value* values;
     Allocator allocator;
+
+  public:
+    // STL  compatibility typedefs.
+    typedef Iterator iterator;
+    typedef ConstIterator const_iterator;
+    typedef typename Iterator::PairValueType value_type;
+    typedef typename Iterator::KeyType key_type;
+    typedef typename Iterator::ValueType data_type;
+    typedef typename Iterator::PairReferenceType reference;
+    typedef typename Iterator::PairPointerType pointer;
+    typedef typename ConstIterator::PairReferenceType const_reference;
+    typedef typename ConstIterator::PairPointerType const_pointer;
+    typedef int difference_type;                
   };