Changeset 2305:4a2236cc98a0 in lemon-0.x

Timestamp:

11/21/06 18:28:08 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Keeping order of alteration observers

Removing some automatic callback generation
exception safety reason

Location:

lemon

Files:

• bits/alteration_notifier.h (modified) (17 diffs)
• matrix_maps.h (modified) (2 diffs)

lemon/bits/alteration_notifier.h

@@ -21 +21 @@
 
 #include <vector>
+#include <list>
 
 #include <lemon/bits/utility.h>
@@ -174 +175 @@
       ///
       void attach(AlterationNotifier& _notifier) {
-        notifier = &_notifier;
-        notifier->attach(*this);
+        _notifier.attach(*this);
       }
       
@@ -204 +204 @@
       
       Notifier* notifier;
-      int notifier_index;
+      typename std::list<ObserverBase*>::iterator index;
 
       /// \brief The member function to notificate the observer about an
@@ -212 +212 @@
       /// is added to the container. It have to be overrided in the
       /// subclasses.
-        
       virtual void add(const Item&) = 0;
 
@@ -221 +220 @@
       /// is added to the container. It have to be overrided in the
       /// subclasses.
-
-      virtual void add(const std::vector<Item>& items) {
-        int i;
-        try {
-          for (i = 0; i < (int)items.size(); ++i) {
-            add(items[i]);
-          }
-        } catch (...) {
-          for (int j = 0; j < i; ++j) {
-            add(items[j]);
-          }          
-          throw;
-        }
-      }
+      virtual void add(const std::vector<Item>& items) = 0;
 
       /// \brief The member function to notificate the observer about an
@@ -241 +227 @@
       /// The erase() member function notificates the observer about an
       /// item is erased from the container. It have to be overrided in
-      /// the subclasses.
-        
+      /// the subclasses.       
       virtual void erase(const Item&) = 0;
 
@@ -251 +236 @@
       /// is erased from the container. It have to be overrided in the
       /// subclasses.
-      virtual void erase(const std::vector<Item>& items) {
-        for (int i = 0; i < (int)items.size(); ++i) {
-          erase(items[i]);
-        }
-      }
+      virtual void erase(const std::vector<Item>& items) = 0;
 
       /// \brief The member function to notificate the observer about the
@@ -264 +245 @@
       /// overrided in the subclasses.
 
-      virtual void build() {
-        Item it;
-        try {
-          for (notifier->first(it); it != INVALID; notifier->next(it)) {
-            add(it);
-          }
-        } catch (...) {
-          Item jt;
-          for (notifier->first(jt); jt != it; notifier->next(jt)) {
-            erase(jt);
-          }
-          throw;
-        }
-      }
+      virtual void build() = 0;
 
       /// \brief The member function to notificate the observer about all
@@ -285 +253 @@
       /// items are erased from the container. It have to be overrided in
       /// the subclasses.      
-      virtual void clear() {
-        Item it;
-        for (notifier->first(it); it != INVALID; notifier->next(it)) {
-          erase(it);
-        }
-      }
+      virtual void clear() = 0;
 
     };
@@ -298 +261 @@
     const Container* container;
 
-    typedef std::vector<ObserverBase*> Observers; 
+    typedef std::list<ObserverBase*> Observers; 
     Observers observers;
 
@@ -384 +347 @@
 
     void attach(ObserverBase& observer) {
-      observers.push_back(&observer);
+      observer.index = observers.insert(observers.begin(), &observer);
       observer.notifier = this;
-      observer.notifier_index = observers.size() - 1;
     } 
 
     void detach(ObserverBase& observer) {
-      observers.back()->notifier_index = observer.notifier_index; 
-      observers[observer.notifier_index] = observers.back();
-      observers.pop_back();
+      observers.erase(observer.index);
+      observer.index = observers.end();
       observer.notifier = 0;
     }
@@ -405 +366 @@
     /// 
     void add(const Item& item) {
-      typename Observers::iterator it;
+      typename Observers::reverse_iterator it;
       try {
-        for (it = observers.begin(); it != observers.end(); ++it) {
+        for (it = observers.rbegin(); it != observers.rend(); ++it) {
           (*it)->add(item);
         }
       } catch (...) {
         typename Observers::iterator jt;
-        for (jt = observers.begin(); jt != it; ++jt) {
-          (*it)->erase(item);
+        for (jt = it.base(); jt != observers.end(); ++jt) {
+          (*jt)->erase(item);
         }
         throw;
@@ -426 +387 @@
     /// 
     void add(const std::vector<Item>& items) {
-      typename Observers::iterator it;
+      typename Observers::reverse_iterator it;
       try {
-        for (it = observers.begin(); it != observers.end(); ++it) {
+        for (it = observers.rbegin(); it != observers.rend(); ++it) {
           (*it)->add(items);
         }
       } catch (...) {
         typename Observers::iterator jt;
-        for (jt = observers.begin(); jt != it; ++jt) {
-          (*it)->erase(items);
+        for (jt = it.base(); jt != observers.end(); ++jt) {
+          (*jt)->erase(items);
         }
         throw;
@@ -446 +407 @@
     /// the container.
     /// 
-    void erase(const Item& key) throw() {
-      int i = 0;
-      while (i != (int)observers.size()) {
+    void erase(const Item& item) throw() {
+      typename Observers::iterator it = observers.begin();
+      while (it != observers.end()) {
         try {
-          observers[i]->erase(key);
-          ++i;
+          (*it)->erase(item);
+          ++it;
         } catch (const ImmediateDetach&) {
-          observers[i]->detach();
+          it = observers.erase(it);
+          (*it)->index = observers.end();
+          (*it)->notifier = 0;
         }
       }
@@ -465 +428 @@
     /// 
     void erase(const std::vector<Item>& items) {
-      int i = 0;
-      while (i != (int)observers.size()) {
+      typename Observers::iterator it = observers.begin();
+      while (it != observers.end()) {
         try {
-          observers[i]->erase(items);
-          ++i;
+          (*it)->erase(items);
+          ++it;
         } catch (const ImmediateDetach&) {
-          observers[i]->detach();
+          it = observers.erase(it);
+          (*it)->index = observers.end();
+          (*it)->notifier = 0;
         }
       }
@@ -482 +447 @@
     /// from an empty container.
     void build() {
-      typename Observers::iterator it;
+      typename Observers::reverse_iterator it;
       try {
-        for (it = observers.begin(); it != observers.end(); ++it) {
+        for (it = observers.rbegin(); it != observers.rend(); ++it) {
           (*it)->build();
         }
       } catch (...) {
         typename Observers::iterator jt;
-        for (jt = observers.begin(); jt != it; ++jt) {
-          (*it)->clear();
+        for (jt = it.base(); jt != observers.end(); ++jt) {
+          (*jt)->clear();
         }
         throw;
@@ -502 +467 @@
     /// from the container.
     void clear() {
-      int i = 0;
-      while (i != (int)observers.size()) {
+      typename Observers::iterator it = observers.begin();
+      while (it != observers.end()) {
         try {
-          observers[i]->clear();
-          ++i;
+          (*it)->clear();
+          ++it;
         } catch (const ImmediateDetach&) {
-          observers[i]->detach();
+          it = observers.erase(it);
+          (*it)->index = observers.end();
+          (*it)->notifier = 0;
         }
       }

lemon/matrix_maps.h

@@ -355 +355 @@
     }
 
+    virtual void add(const std::vector<Key>& keys) {
+      int new_size = 0;
+      for (int i = 0; i < (int)keys.size(); ++i) {
+        if (size(Parent::getNotifier()->id(keys[i]) + 1) >= new_size) {
+          new_size = size(Parent::getNotifier()->id(keys[i]) + 1);      
+        }
+      }
+      if (new_size > (int)values.size()) {
+        values.resize(new_size);
+      }
+    }
+
     virtual void erase(const Key&) {}
+
+    virtual void erase(const std::vector<Key>&) {}
 
     virtual void build() {
@@ -496 +510 @@
     }
 
+    virtual void add(const std::vector<Key>& keys) {
+      int new_size = 0;
+      for (int i = 0; i < (int)keys.size(); ++i) {
+        if (size(Parent::getNotifier()->id(keys[i]) + 1) >= new_size) {
+          new_size = size(Parent::getNotifier()->id(keys[i]) + 1);      
+        }
+      }
+      if (new_size > (int)values.size()) {
+        values.resize(new_size);
+      }
+    }
+
     virtual void erase(const Key&) {}
+
+    virtual void erase(const std::vector<Key>&) {}
 
     virtual void build() {