Changeset 1990:15fb7a4ea6be in lemon-0.x for lemon/iterable_maps.h

Timestamp:

03/01/06 11:17:25 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Some classes assumed that the GraphMaps? should be inherited
from an ObserverBase?. These classes parents replaced with
DefaultMap? which cause that the graph maps should not be
inherited from the ObserverBase?.

File:

• lemon/iterable_maps.h (modified) (8 diffs)

lemon/iterable_maps.h

@@ -20 +20 @@
 #include <lemon/invalid.h>
 
+#include <lemon/bits/default_map.h>
+
 #include <vector>
 #include <map>
@@ -48 +50 @@
   /// \param _Item One of the graph's item type, the key of the map.
   template <typename _Graph, typename _Item>
-  class IterableBoolMap 
-    : protected ItemSetTraits<_Graph, _Item>::template Map<int>::Parent {
+  class IterableBoolMap : protected DefaultMap<_Graph, _Item, int> {
   private:
     typedef _Graph Graph;
     
     typedef typename ItemSetTraits<Graph, _Item>::ItemIt KeyIt;
-    typedef typename ItemSetTraits<Graph, _Item>
-    ::template Map<int>::Parent Parent;
+    typedef DefaultMap<_Graph, _Item, int> Parent;
     
     std::vector<_Item> array;
@@ -400 +400 @@
   /// \param _Item One of the graph's item type, the key of the map.
   template <typename _Graph, typename _Item>
-  class IterableIntMap : protected ItemSetTraits<_Graph, _Item> 
-  ::template Map<_iterable_maps_bits::IterableIntMapNode<_Item> >::Parent {
+  class IterableIntMap 
+    : protected DefaultMap<_Graph, _Item, _iterable_maps_bits::
+                           IterableIntMapNode<_Item> > {
   public:
-    typedef typename ItemSetTraits<_Graph, _Item> 
-    ::template Map<_iterable_maps_bits::IterableIntMapNode<_Item> >
-    ::Parent Parent;
+    typedef DefaultMap<_Graph, _Item, _iterable_maps_bits::
+                       IterableIntMapNode<_Item> >
+    Parent;
 
     /// The key type
@@ -688 +689 @@
   /// \param _Value Any comparable value type.
   template <typename _Graph, typename _Item, typename _Value>
-  class IterableValueMap : protected ItemSetTraits<_Graph, _Item> 
-  ::template Map<_iterable_maps_bits::IterableValueMapNode<_Item, _Value> >
-  ::Parent {
+  class IterableValueMap 
+    : protected DefaultMap<_Graph, _Item, _iterable_maps_bits::
+                           IterableValueMapNode<_Item, _Value> > {
   public:
-    typedef typename ItemSetTraits<_Graph, _Item> 
-    ::template Map<_iterable_maps_bits::IterableValueMapNode<_Item, _Value> >
-    ::Parent Parent;
+    typedef DefaultMap<_Graph, _Item, _iterable_maps_bits::
+                       IterableValueMapNode<_Item, _Value> > Parent;
 
     /// The key type
@@ -703 +703 @@
     typedef _Graph Graph;
 
+  protected:
+
+    typedef typename ItemSetTraits<_Graph, Key>::ItemIt KeyIt; 
+
+  public:
+
     /// \brief Constructor of the Map with a given value.
     ///
@@ -708 +714 @@
     explicit IterableValueMap(const Graph& graph, 
                               const Value& value = Value()) 
-      : Parent(graph, _iterable_maps_bits::IterableValueMapNode<_Item, 
-               _Value>(value)) {
-      for (typename Parent::ItemIt it(*this); it != INVALID; ++it) {
+      : Parent(graph, _iterable_maps_bits::
+               IterableValueMapNode<_Item, _Value>(value)) {
+      for (KeyIt it(*Parent::getGraph()); it != INVALID; ++it) {
         lace(it);
       }
     }
 
-  private:
+  protected:
     
     void unlace(const Key& key) {
@@ -872 +878 @@
   protected:
     
+    virtual void add(const Key& key) {
+      Parent::add(key);
+      unlace(key);
+    }
+
+    virtual void add(const std::vector<Key>& keys) {
+      Parent::add(keys);
+      for (int i = 0; i < (int)keys.size(); ++i) {
+        lace(keys[i]);
+      }
+    }
+
     virtual void erase(const Key& key) {
       unlace(key);
@@ -884 +902 @@
     }
 
+    virtual void build() {
+      Parent::build();
+      for (KeyIt it(*Parent::getGraph()); it != INVALID; ++it) {
+        lace(it);
+      }
+    }
+
     virtual void clear() {
       first.clear();