lemon-0.x: comparison lemon/bits/alteration

equal deleted inserted replaced

-:3f2c431b4f61
+:1d8a8f01f31e
 #ifndef LEMON_BITS_ALTERATION_NOTIFIER_H
 #define LEMON_BITS_ALTERATION_NOTIFIER_H
 #include <vector>
+#include <list>
 #include <lemon/bits/utility.h>
 ///\ingroup graphbits
 ///\file
 /// \brief Attaches the observer into an AlterationNotifier.
 ///
 /// This member attaches the observer into an AlterationNotifier.
 ///
 void attach(AlterationNotifier& _notifier) {
-	notifier = &_notifier;
+	_notifier.attach(*this);
-	notifier->attach(*this);
 }
 /// \brief Detaches the observer into an AlterationNotifier.
 ///
 /// This member detaches the observer from an AlterationNotifier.
 ObserverBase& operator=(const ObserverBase& copy);
 protected:
 Notifier* notifier;
-int notifier_index;
+typename std::list<ObserverBase*>::iterator index;
 /// \brief The member function to notificate the observer about an
 /// item is added to the container.
 ///
 /// The add() member function notificates the observer about an item
 /// is added to the container. It have to be overrided in the
 /// subclasses.
 virtual void add(const Item&) = 0;
 /// \brief The member function to notificate the observer about
 /// more item is added to the container.
 ///
 /// The add() member function notificates the observer about more item
 /// is added to the container. It have to be overrided in the
 /// subclasses.
+virtual void add(const std::vector<Item>& items) = 0;
-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;
-}
-}
 /// \brief The member function to notificate the observer about an
 /// item is erased from the container.
 ///
 /// The erase() member function notificates the observer about an
 /// item is erased from the container. It have to be overrided in
 /// the subclasses.
 virtual void erase(const Item&) = 0;
 /// \brief The member function to notificate the observer about
 /// more item is erased from the container.
 ///
 /// The erase() member function notificates the observer about more item
 /// is erased from the container. It have to be overrided in the
 /// subclasses.
-virtual void erase(const std::vector<Item>& items) {
+virtual void erase(const std::vector<Item>& items) = 0;
-for (int i = 0; i < (int)items.size(); ++i) {
-erase(items[i]);
-}
-}
 /// \brief The member function to notificate the observer about the
 /// container is built.
 ///
 /// The build() member function notificates the observer about the
 /// container is built from an empty container. It have to be
 /// overrided in the subclasses.
-virtual void build() {
+virtual void build() = 0;
-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;
-}
-}
 /// \brief The member function to notificate the observer about all
 /// items are erased from the container.
 ///
 /// The clear() member function notificates the observer about all
 /// items are erased from the container. It have to be overrided in
 /// the subclasses.
-virtual void clear() {
+virtual void clear() = 0;
-Item it;
-for (notifier->first(it); it != INVALID; notifier->next(it)) {
-erase(it);
-}
-}
 };
 protected:
 const Container* container;
-typedef std::vector<ObserverBase*> Observers;
+typedef std::list<ObserverBase*> Observers;
 Observers observers;
 public:
 }
 protected:
 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.erase(observer.index);
-observers[observer.notifier_index] = observers.back();
+observer.index = observers.end();
-observers.pop_back();
 observer.notifier = 0;
 }
 public:
 ///
 /// It notifies all the registed observers about an item added to
 /// the container.
 ///
 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) {
+for (jt = it.base(); jt != observers.end(); ++jt) {
-(*it)->erase(item);
+(*jt)->erase(item);
 }
 throw;
 }
 }
 ///
 /// It notifies all the registed observers about more item added to
 /// the container.
 ///
 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) {
+for (jt = it.base(); jt != observers.end(); ++jt) {
-(*it)->erase(items);
+(*jt)->erase(items);
 }
 throw;
 }
 }
 /// the container.
 ///
 /// It notifies all the registed observers about an item erased from
 /// the container.
 ///
-void erase(const Item& key) throw() {
+void erase(const Item& item) throw() {
-int i = 0;
+typename Observers::iterator it = observers.begin();
-while (i != (int)observers.size()) {
+while (it != observers.end()) {
 try {
-observers[i]->erase(key);
+(*it)->erase(item);
-++i;
+++it;
 } catch (const ImmediateDetach&) {
-observers[i]->detach();
+it = observers.erase(it);
+(*it)->index = observers.end();
+(*it)->notifier = 0;
 }
 }
 }
 /// \brief Notifies all the registed observers about more item erased
 ///
 /// It notifies all the registed observers about more item erased from
 /// the container.
 ///
 void erase(const std::vector<Item>& items) {
-int i = 0;
+typename Observers::iterator it = observers.begin();
-while (i != (int)observers.size()) {
+while (it != observers.end()) {
 try {
-observers[i]->erase(items);
+(*it)->erase(items);
-++i;
+++it;
 } catch (const ImmediateDetach&) {
-observers[i]->detach();
+it = observers.erase(it);
+(*it)->index = observers.end();
+(*it)->notifier = 0;
 }
 }
 }
 /// \brief Notifies all the registed observers about the container is
 /// built.
 ///
 /// Notifies all the registed observers about the container is built
 /// 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) {
+for (jt = it.base(); jt != observers.end(); ++jt) {
-(*it)->clear();
+(*jt)->clear();
 }
 throw;
 }
 }
 /// erased.
 ///
 /// Notifies all the registed observers about all items are erased
 /// from the container.
 void clear() {
-int i = 0;
+typename Observers::iterator it = observers.begin();
-while (i != (int)observers.size()) {
+while (it != observers.end()) {
 try {
-observers[i]->clear();
+(*it)->clear();
-++i;
+++it;
 } catch (const ImmediateDetach&) {
-observers[i]->detach();
+it = observers.erase(it);
+(*it)->index = observers.end();
+(*it)->notifier = 0;
 }
 }
 }
 };

changeset 2305	4a2236cc98a0
parent 2188	984870a2dde4
child 2384	805c5a2a36dd