Changeset 1999:2ff283124dfc in lemon-0.x for lemon/bits/map_extender.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/map_extender.h (modified) (3 diffs)

lemon/bits/map_extender.h

@@ -30 +30 @@
 
   /// \ingroup graphbits
+  /// 
+  /// \brief Extender for maps
   template <typename _Map>
-  class IterableMapExtender : public _Map {
+  class MapExtender : public _Map {
   public:
 
     typedef _Map Parent;
-    typedef IterableMapExtender Map;
+    typedef MapExtender Map;
 
 
@@ -50 +52 @@
     friend class ConstMapIt;
 
-  protected:
-
-    using Parent::getGraph;
-
   public:
 
-    IterableMapExtender(const Graph& graph) : Parent(graph) {}
+    MapExtender(const Graph& graph) 
+      : Parent(graph) {}
 
-    IterableMapExtender(const Graph& graph, const Value& value) 
+    MapExtender(const Graph& graph, const Value& value) 
       : Parent(graph, value) {}
 
 
-    class MapIt : public ItemSetTraits<Graph, Item>::ItemIt {
+    class MapIt : public Item {
     public:
       
-      typedef typename ItemSetTraits<Graph, Item>::ItemIt Parent;
-
+      typedef Item Parent;
       typedef typename Map::Value Value;
       
-      MapIt(Map& _map) : Parent(*_map.getGraph()), map(_map) {}
+      MapIt() {}
+
+      MapIt(Invalid i) : Parent(i) { }
+
+      explicit MapIt(Map& _map) : map(_map) {
+        map.getNotifier()->first(*this);
+      }
+
+      MapIt(const Map& _map, const Item& item) 
+        : Parent(item), map(_map) {}
+
+      MapIt& operator++() { 
+        map.getNotifier()->next(*this);
+        return *this; 
+      }
       
       typename MapTraits<Map>::ConstReturnValue operator*() const {
@@ -88 +100 @@
     };
 
-    class ConstMapIt : public ItemSetTraits<Graph, Key>::ItemIt {
+    class ConstMapIt : public Item {
     public:
 
-      typedef typename ItemSetTraits<Graph, Key>::ItemIt Parent;
+      typedef Item Parent;
 
       typedef typename Map::Value Value;
+      
+      ConstMapIt() {}
 
-      ConstMapIt(const Map& _map) : Parent(*_map.getGraph()), map(_map) {}
+      ConstMapIt(Invalid i) : Parent(i) { }
+
+      explicit ConstMapIt(Map& _map) : map(_map) {
+        map.getNotifier()->first(*this);
+      }
+
+      ConstMapIt(const Map& _map, const Item& item) 
+        : Parent(item), map(_map) {}
+
+      ConstMapIt& operator++() { 
+        map.getNotifier()->next(*this);
+        return *this; 
+      }
 
       typename MapTraits<Map>::ConstReturnValue operator*() const {
         return map[*this];
       }
+
     protected:
       const Map& map;
     };
 
-    class ItemIt : public ItemSetTraits<Graph, Key>::ItemIt {
+    class ItemIt : Item {
     public:
       
-      typedef typename ItemSetTraits<Graph, Key>::ItemIt Parent;
+      typedef Item Parent;
+      
+      ItemIt() {}
 
-      ItemIt(Map& _map) : Parent(*_map.getGraph()) {}
+      ItemIt(Invalid i) : Parent(i) { }
+
+      explicit ItemIt(Map& _map) : map(_map) {
+        map->getNotifier()->first(*this);
+      }
+
+      ItemIt(const Map& _map, const Item& item) 
+        : Parent(item), map(_map) {}
+
+      ItemIt& operator++() { 
+        map.getNotifier()->next(*this);
+        return *this; 
+      }
+
+    protected:
+      const Map& map;
       
     };