Changeset 703:32f280a5ed7d in lemon-0.x for src/work/deba/array_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/array_map_factory.h (modified) (15 diffs)

src/work/deba/array_map_factory.h

@@ +1 @@
+// -*- c++ -*-
 #ifndef ARRAY_MAP_H
 #define ARRAY_MAP_H
@@ -4 +5 @@
 #include <memory>
 
-
-#include <iostream>
-using namespace std;
+#include "extended_pair.h"
 
 namespace hugo {
@@ -20 +19 @@
     typedef typename MapRegistry::MapBase MapBase;
                 
-    template <typename V, typename A = std::allocator<V> > class Map : public MapBase {
+    template <typename V, typename A = std::allocator<V> > 
+    class Map : public MapBase {
     
       public:
@@ -31 +31 @@
                         
       Map(const Graph& g, MapRegistry& r) : MapBase(g, r) {
-        int max_id = -1;
-        for (KeyIt it(*getGraph()); getGraph()->valid(it); getGraph()->next(it)) {
-          int id = getGraph()->id(it);
-          if (id > max_id) {
-            max_id = id;
-          }                     
-        }
-        if (max_id == -1) {
-          capacity = 0;
-          values = 0;
-          return;
-        }
-        capacity = 1;
-        while (capacity <= max_id) {
-          capacity <<= 1;
-        }
-        values = allocator.allocate(capacity);
+        allocate_memory();
         for (KeyIt it(*getGraph()); getGraph()->valid(it); getGraph()->next(it)) {
           int id = getGraph()->id(it);
@@ -55 +39 @@
 
       Map(const Graph& g, MapRegistry& r, const Value& v) : MapBase(g, r) {
-        int max_id = -1;
-        for (KeyIt it(*getGraph()); getGraph()->valid(it); getGraph()->next(it)) {
-          int id = getGraph()->id(it);
-          if (id > max_id) {
-            max_id = id;
-          }                     
-        }
-        if (max_id == -1) {
-          capacity = 0;
-          values = 0;
-          return;
-        }
-        capacity = 1;
-        while (capacity <= max_id) {
-          capacity <<= 1;
-        }
-        values = allocator.allocate(capacity);
+        allocate_memory();
         for (KeyIt it(*getGraph()); getGraph()->valid(it); getGraph()->next(it)) {
           int id = getGraph()->id(it);
@@ -88 +56 @@
       }
 
-      template <typename CMap> Map(const CMap& copy) : MapBase(copy) {
+      template <typename CMap> Map(const CMap& copy) 
+        : capacity(0), values(0), MapBase(copy) {
         if (getGraph()) {
-          init();
+          allocate_memory();
           for (KeyIt it(*getGraph()); getGraph()->valid(it); getGraph()->next(it)) {
             set(it, copy[it]);
@@ -118 +87 @@
         this->MapBase::operator=(copy);
         if (getGraph()) {
-          init();
+          allocate_memory();
           for (KeyIt it(*getGraph()); getGraph()->valid(it); getGraph()->next(it)) {
             set(it, copy[it]);
@@ -124 +93 @@
         }
       }
-
-       
                                 
       virtual ~Map() {
@@ -182 +149 @@
       }
         
-      /** Compatible iterator with the stl maps' iterators.
-       *  It iterates on pairs of a key and a value.
-       */
       class iterator {
         friend class Map;
         friend class const_iterator;
-        private:
+      private:
 
         /** Private constructor to initalize the the iterators returned
@@ -195 +159 @@
         iterator (Map& pmap, const KeyIt& pit) : map(&pmap), it(pit) {}
 
-        public:
+      public:
 
         /** Default constructor. 
          */
         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:
+          Reference data;
+          Pointer(const Key& key, Value& val) : data(key, val) {}
+        public:
+          Reference* operator->() {return &data;}
+        };
 
         /** Arrow operator for map.
          */      
-        std::pair<const Key, Value>* operator->() {
-          static std::pair<const Key, Value> tmp = operator*();
-          return &tmp;
+        Pointer operator->() {
+          return Pointer(it, ((*map)[it])); 
         }
 
@@ -240 +215 @@
           return !(*this == p_it);
         }
-        
-        private:
+
+        
+      private:
         Map* map;
         KeyIt it;
@@ -261 +237 @@
         friend class Map;
         friend class iterator;
-        private:
+      private:
 
         /** Private constructor to initalize the the iterators returned
          *  by the begin() and end().
          */
-        const_iterator (Map& pmap, const KeyIt& pit) : map(&pmap), it(pit) {}
-
-        public:
+        const_iterator (const Map& pmap, const KeyIt& pit) 
+          : map(&pmap), it(pit) {}
+
+      public:
 
         /** Default constructor. 
@@ -276 +253 @@
         /** 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:
+          Reference data;
+          Pointer(const Key& key, const Value& val) : data(key, val) {}
+        public:
+          Reference* operator->() {return &data;}
+        };
 
         /** Arrow operator for map.
          */      
-        std::pair<const Key, const Value>* operator->() const {
-          static std::pair<const Key, const Value> tmp = operator*();
-          return &tmp;
+        Pointer operator->() {
+          return Pointer(it, ((*map)[it])); 
         }
 
@@ -320 +307 @@
         }
         
-        private:
+
+      private:
         const Map* map;
         KeyIt it;
@@ -337 +325 @@
       }
 
-      private:
+    private:
+      
+      void allocate_memory() {
+        int max_id = -1;
+        for (KeyIt it(*getGraph()); getGraph()->valid(it); getGraph()->next(it)) {
+          int id = getGraph()->id(it);
+          if (id > max_id) {
+            max_id = id;
+          }                     
+        }
+        if (max_id == -1) {
+          capacity = 0;
+          values = 0;
+          return;
+        }
+        capacity = 1;
+        while (capacity <= max_id) {
+          capacity <<= 1;
+        }
+        values = allocator.allocate(capacity);  
+      }      
       int capacity;
       Value* values;