Changeset 703:32f280a5ed7d in lemon-0.x for src/work/deba/vector_map_factory.h

Timestamp:

07/15/04 14:15:58 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

 

File:

• src/work/deba/vector_map_factory.h (modified) (8 diffs)

src/work/deba/vector_map_factory.h

@@ +1 @@
+// -*- c++ -*-
 #ifndef VECTOR_MAP_H
 #define VECTOR_MAP_H
 
 #include <vector>
-#include <iostream>
 
 #include "extended_pair.h"
@@ -56 +56 @@
        */
       Map(const Graph& g, MapRegistry& r, const Value& v) : MapBase(g, r) {
-        init();
         for (KeyIt it(*getGraph()); getGraph()->valid(it); getGraph()->next(it)) {
-          set(it, v);
+          int id = getGraph->id(it);
+          if (id >= container.size) {
+            container.resize(id + 1);
+          }
+          set(it, v);
         }
       }
@@ -66 +69 @@
       template <typename CMap> Map(const CMap& copy) : MapBase(copy) {
         if (getGraph()) {
-          init();
           for (KeyIt it(*getGraph()); getGraph()->valid(it); getGraph()->next(it)) {
+            int id = getGraph->id(it);
+            if (id >= container.size) {
+              container.resize(id + 1);
+            }
             set(it, copy[it]);
           }
@@ -81 +87 @@
         this->MapBase::operator=(copy);
         if (getGraph()) {
-          init();
           for (KeyIt it(*getGraph()); getGraph()->valid(it); getGraph()->next(it)) {
+            int id = getGraph->id(it);
+            if (id >= container.size) {
+              container.resize(id + 1);
+            }
             set(it, copy[it]);
           }
@@ -91 +100 @@
        */
       virtual ~Map() {
-        destroy();
       }
                 
@@ -152 +160 @@
         iterator() {}
 
+        typedef extended_pair<const Key&, const Key&, 
+                              Value&, Value&> Reference;
+
         /** Dereference operator for map.
          */      
-        std::pair<const Key, Value> operator*() {
-          return std::pair<const Key, Value>(it, (*map)[it]);
-        }
-
+        Reference operator*() {
+          return Reference(it, (*map)[it]);
+        }
 
         class Pointer {
           friend class iterator;
         private:
-          typedef extended_pair<const Key&, const Key&, Value&, Value&> Pair;
-          Pair data;
+          Reference data;
           Pointer(const Key& key, Value& val) : data(key, val) {}
         public:
-          Pair* operator->() {return &data;}
+          Reference* operator->() {return &data;}
         };
 
@@ -228 +237 @@
          *  by the begin() and end().
          */
-        const_iterator (Map& pmap, const KeyIt& pit) : map(&pmap), it(pit) {}
+        const_iterator (const Map& pmap, const KeyIt& pit) 
+          : map(&pmap), it(pit) {}
 
       public:
@@ -238 +248 @@
         /** Constructor to convert iterator to const_iterator.
          */
-        const_iterator(iterator p_it) {
-          it = p_it.it;
-        }
+        const_iterator(iterator p_it) : map(p_it.map), it(p_it.it) {}
       
+        typedef extended_pair<const Key&, const Key&, 
+          const Value&, const Value&> Reference;
+
         /** Dereference operator for map.
          */      
-        std::pair<const Key, const Value> operator*() const {
-          return std::pair<const Key, const Value>(it, (*map)[it]);
-        }
+        Reference operator*() {
+          return Reference(it, (*map)[it]);
+        }
+
 
         class Pointer {
           friend class const_iterator;
         private:
-          typedef extended_pair<const Key&, const Key&, const Value&, const Value&> Pair;
-          Pair data;
+          Reference data;
           Pointer(const Key& key, const Value& val) : data(key, val) {}
         public:
-          Pair* operator->() {return &data;}
+          Reference* operator->() {return &data;}
         };
+
         /** Arrow operator for map.
          */      
-        Pointer operator->() const {
-          return Pointer(it, (*map)[it]);
+        Pointer operator->() {
+          return Pointer(it, ((*map)[it])); 
         }