Changeset 1999:2ff283124dfc in lemon-0.x for lemon/bits/vector_map.h

Timestamp:

03/06/06 11:28:37 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Clarifing alteration observing system
It is directly connected now to a container

File:

• lemon/bits/vector_map.h (modified) (11 diffs)

lemon/bits/vector_map.h

@@ -17 +17 @@
  */
 
-#ifndef LEMON_VECTOR_MAP_H
-#define LEMON_VECTOR_MAP_H
+#ifndef LEMON_BITS_VECTOR_MAP_H
+#define LEMON_BITS_VECTOR_MAP_H
 
 #include <vector>
 #include <algorithm>
 
+#include <lemon/bits/traits.h>
 #include <lemon/bits/utility.h>
-#include <lemon/bits/map_extender.h>
+
 #include <lemon/bits/alteration_notifier.h>
-#include <lemon/concept_check.h>
-#include <lemon/concept/maps.h>
-
-/// \ingroup graphbits
+
+///\ingroup graphbits
 ///
 ///\file
 ///\brief Vector based graph maps.
-
 namespace lemon {
 
@@ -41 +39 @@
   ///
   /// The VectorMap template class is graph map structure what
-  /// automatically indates the map when a key is added to or erased from
+  /// automatically updates the map when a key is added to or erased from
   /// the map. This map factory uses the allocators to implement 
   /// the container functionality. This map factory
   /// uses the std::vector to implement the container function.
   ///
-  /// \param Registry The AlterationNotifier that will notify this map.
+  /// \param Notifier The AlterationNotifier that will notify this map.
   /// \param Item The item type of the graph items.
   /// \param Value The value type of the map.
   /// 
-  /// \author Balazs Dezso
-        
-  template <
-    typename _Graph, 
-    typename _Item,    
-    typename _Value
-    >
-  class VectorMap : public AlterationNotifier<_Item>::ObserverBase {
+  /// \author Balazs Dezso      
+  template <typename _Graph, typename _Item, typename _Value>
+  class VectorMap 
+    : public ItemSetTraits<_Graph, _Item>::ItemNotifier::ObserverBase {
   private:
                 
@@ -67 +61 @@
     /// The graph type of the map. 
     typedef _Graph Graph;
+    /// The item type of the map.
+    typedef _Item Item;
     /// The reference map tag.
     typedef True ReferenceMapTag;
@@ -75 +71 @@
     typedef _Value Value;
 
-    typedef AlterationNotifier<_Item> Registry;
+    /// The notifier type.
+    typedef typename ItemSetTraits<_Graph, _Item>::ItemNotifier Notifier;
 
     /// The map type.
     typedef VectorMap Map;
     /// The base class of the map.
-    typedef typename Registry::ObserverBase Parent;
+    typedef typename Notifier::ObserverBase Parent;
 
     /// The reference type of the map;
     typedef typename Container::reference Reference;
-    /// The pointer type of the map;
-    typedef typename Container::pointer Pointer;
-
-    /// The const value type of the map.
-    typedef const Value ConstValue;
     /// The const reference type of the map;
     typedef typename Container::const_reference ConstReference;
-    /// The pointer type of the map;
-    typedef typename Container::const_pointer ConstPointer;
-
-
-    /// \brief Constructor to attach the new map into the registry.
-    ///
-    /// It constructs a map and attachs it into the registry.
+
+
+    /// \brief Constructor to attach the new map into the notifier.
+    ///
+    /// It constructs a map and attachs it into the notifier.
     /// It adds all the items of the graph to the map.
-    VectorMap(const Graph& _g) : graph(&_g) {
-      attach(_g.getNotifier(_Item()));
-      build();
+    VectorMap(const Graph& graph) {
+      Parent::attach(graph.getNotifier(Item()));
+      container.resize(Parent::getNotifier()->maxId() + 1);
     }
 
@@ -108 +98 @@
     /// It constructs a map uses a given value to initialize the map. 
     /// It adds all the items of the graph to the map.
-    VectorMap(const Graph& _g, const Value& _v) : graph(&_g) { 
-      attach(_g.getNotifier(_Item()));
-      container.resize(graph->maxId(_Item()) + 1, _v);
+    VectorMap(const Graph& graph, const Value& value) {
+      Parent::attach(graph.getNotifier(Item()));
+      container.resize(Parent::getNotifier()->maxId() + 1, value);
     }
 
@@ -116 +106 @@
     ///
     /// Copy constructor.
-    VectorMap(const VectorMap& _copy) 
-      : Parent(), graph(_copy.getGraph()) {
+    VectorMap(const VectorMap& _copy) : Parent() {
       if (_copy.attached()) {
-        attach(*_copy.getRegistry());
+        Parent::attach(*_copy.getNotifier());
         container = _copy.container;
       }
     }
 
-    /// \brief Destrcutor
-    ///
-    /// Destructor.
-    virtual ~VectorMap() {
-      if (attached()) {
-        detach();
-      }
-    }
-
-
   private:
 
     VectorMap& operator=(const VectorMap&);
-
-  protected:
-
-    using Parent::attach;
-    using Parent::detach;
-    using Parent::attached;
-
-    const Graph* getGraph() const {
-      return graph;
-    }
 
   public:
@@ -155 +124 @@
     /// actual items of the graph.      
     Reference operator[](const Key& key) {
-      return container[graph->id(key)];
+      return container[Parent::getNotifier()->id(key)];
     } 
                 
@@ -163 +132 @@
     /// actual items of the graph. 
     ConstReference operator[](const Key& key) const {
-      return container[graph->id(key)];
+      return container[Parent::getNotifier()->id(key)];
     }
 
@@ -178 +147 @@
     /// \brief Adds a new key to the map.
     ///         
-    /// It adds a new key to the map. It called by the observer registry
+    /// It adds a new key to the map. It called by the observer notifier
     /// and it overrides the add() member function of the observer base.     
     virtual void add(const Key& key) {
-      int id = graph->id(key);
+      int id = Parent::getNotifier()->id(key);
       if (id >= (int)container.size()) {
         container.resize(id + 1);
@@ -189 +158 @@
     /// \brief Adds more new keys to the map.
     ///         
-    /// It adds more new keys to the map. It called by the observer registry
+    /// It adds more new keys to the map. It called by the observer notifier
     /// and it overrides the add() member function of the observer base.     
     virtual void add(const std::vector<Key>& keys) {
+      int max = container.size() - 1;
       for (int i = 0; i < (int)keys.size(); ++i) {
-        add(keys[i]);
-      }
+        int id = Parent::getNotifier()->id(keys[i]);
+        if (id >= max) {
+          max = id;
+        }
+      }
+      container.resize(max + 1);
     }
 
     /// \brief Erase a key from the map.
     ///
-    /// Erase a key from the map. It called by the observer registry
+    /// Erase a key from the map. It called by the observer notifier
     /// and it overrides the erase() member function of the observer base.     
-    virtual void erase(const Key&) {}
+    virtual void erase(const Key& key) {
+      container[Parent::getNotifier()->id(key)] = Value();
+    }
 
     /// \brief Erase more keys from the map.
     ///
-    /// Erase more keys from the map. It called by the observer registry
+    /// Erase more keys from the map. It called by the observer notifier
     /// and it overrides the erase() member function of the observer base.     
-    virtual void erase(const std::vector<Key>&) {}
+    virtual void erase(const std::vector<Key>& keys) {
+      for (int i = 0; i < (int)keys.size(); ++i) {
+        container[Parent::getNotifier()->id(keys[i])] = Value();
+      }
+    }
     
     /// \brief Buildes the map.
     /// 
-    /// It buildes the map. It called by the observer registry
+    /// It buildes the map. It called by the observer notifier
     /// and it overrides the build() member function of the observer base.
     virtual void build() { 
-      container.resize(graph->maxId(_Item()) + 1);
+      int size = Parent::getNotifier()->maxId() + 1;
+      container.reserve(size);
+      container.resize(size);
     }
 
     /// \brief Clear the map.
     ///
-    /// It erase all items from the map. It called by the observer registry
+    /// It erase all items from the map. It called by the observer notifier
     /// and it overrides the clear() member function of the observer base.     
     virtual void clear() { 
@@ -228 +210 @@
                 
     Container container;
-    const Graph *graph;
 
   };