Changeset 844:9bf990cb066d in lemon-0.x for src/hugo/vector_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/vector_map.h (modified) (8 diffs)

src/hugo/vector_map.h

@@ -6 +6 @@
 
 #include <hugo/map_iterator.h>
+#include <hugo/map_bits.h>
 
 ///\ingroup graphmaps
@@ -74 +75 @@
     /** Graph and Registry initialized map constructor.
      */
-    VectorMap(const Graph& g, MapRegistry& r) : MapBase(g, r) {
-      init();
-    }
+    VectorMap(const Graph& g, MapRegistry& r) 
+      : MapBase(g, r), container(KeyInfo<Graph, KeyIt>::maxId(g)+1) {}
 
     /** Constructor to use default value to initialize the map. 
      */
     VectorMap(const Graph& g, MapRegistry& r, const Value& v) 
-      : MapBase(g, r) {
-      for (KeyIt it(*getGraph()); it != INVALID; ++it) {
-        int id = getGraph()->id(it);
-        if (id >= (int)container.size()) {
-          container.resize(id + 1);
-        }
-        set(it, v);
-      }
-    }
+      : MapBase(g, r), container(KeyInfo<Graph, KeyIt>::maxId(g)+1, v) {}
 
     /** Constructor to copy a map of an other map type.
      */
     template <typename CMap> VectorMap(const CMap& copy) : MapBase(copy) {
-      if (getGraph()) {
-        for (KeyIt it(*getGraph()); it != INVALID; ++it) {
-          int id = getGraph()->id(it);
-          if (id >= (int)container.size()) {
-            container.resize(id + 1);
-          }
+      if (MapBase::getGraph()) {
+        container.resize(KeyInfo<Graph, KeyIt>::maxId(*MapBase::getGraph())+1);
+        for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
           set(it, copy[it]);
         }
@@ -108 +97 @@
      */
     template <typename CMap> VectorMap& operator=(const CMap& copy) {
-      if (getGraph()) {
-        destroy();
-      } 
+      container.clear();
       this->MapBase::operator=(copy);
-      if (getGraph()) {
-        for (KeyIt it(*getGraph()); it != INVALID; ++it) {
-          int id = getGraph()->id(it);
-          if (id >= (int)container.size()) {
-            container.resize(id + 1);
-          }
+      if (MapBase::getGraph()) {
+        container.resize(KeyInfo<Graph, KeyIt>::maxId(*MapBase::getGraph())+1);
+        for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
           set(it, copy[it]);
         }
@@ -134 +118 @@
      */
     ReferenceType operator[](const KeyType& key) {
-      int id = getGraph()->id(key);
+      int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), key);
       return container[id];
     } 
@@ -143 +127 @@
      */
     ConstReferenceType operator[](const KeyType& key) const {
-      int id = getGraph()->id(key);
+      int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), key);
       return container[id];
     }
@@ -151 +135 @@
      */
     void set(const KeyType& key, const ValueType& val) {
-      int id = getGraph()->id(key);
+      int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), key);
       container[id] = val;
     }
@@ -158 +142 @@
      */
     void add(const KeyType& key) {
-      int id = getGraph()->id(key);
+      int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), key);
       if (id >= (int)container.size()) {
         container.resize(id + 1);
@@ -232 +216 @@
     Container container;
 
-                
+  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;                
   };