# HG changeset patch # User deba # Date 1103201089 0 # Node ID 372f08e8f40330f87287a6e0b76a81e59cee89d5 # Parent bd01c5a3f9892be1c8141ba4bbbb29d765f1cc0e AlterationObserverRegistry -> AlterationNotifier third step diff -r bd01c5a3f989 -r 372f08e8f403 src/lemon/alteration_notifier.h --- a/src/lemon/alteration_notifier.h Thu Dec 16 12:26:57 2004 +0000 +++ b/src/lemon/alteration_notifier.h Thu Dec 16 12:44:49 2004 +0000 @@ -192,8 +192,8 @@ /// Assign operator. /// Assign operator for the AlterationNotifier. - /// It makes the registry only empty because the copiable - /// registry's observers have to be registered still into that registry. + /// It makes the notifier only empty because the copiable + /// notifier's observers have to be registered still into that registry. AlterationNotifier& operator=(const AlterationNotifier&) { typename Container::iterator it; for (it = container.begin(); it != container.end(); ++it) { @@ -315,23 +315,23 @@ protected: - mutable EdgeNotifier edge_observers; + mutable EdgeNotifier edge_notifier; - mutable NodeNotifier node_observers; + mutable NodeNotifier node_notifier; public: EdgeNotifier& getNotifier(Edge = INVALID) const { - return edge_observers; + return edge_notifier; } NodeNotifier& getNotifier(Node = INVALID) const { - return node_observers; + return node_notifier; } ~AlterableGraphExtender() { - node_observers.clear(); - edge_observers.clear(); + node_notifier.clear(); + edge_notifier.clear(); } }; @@ -362,17 +362,17 @@ protected: - mutable UndirEdgeNotifier undir_edge_observers; + mutable UndirEdgeNotifier undir_edge_notifier; public: using Parent::getNotifier; UndirEdgeNotifier& getNotifier(UndirEdge) const { - return undir_edge_observers; + return undir_edge_notifier; } ~AlterableUndirGraphExtender() { - undir_edge_observers.clear(); + undir_edge_notifier.clear(); } }; diff -r bd01c5a3f989 -r 372f08e8f403 src/lemon/list_graph.h --- a/src/lemon/list_graph.h Thu Dec 16 12:26:57 2004 +0000 +++ b/src/lemon/list_graph.h Thu Dec 16 12:44:49 2004 +0000 @@ -431,9 +431,9 @@ void regist(ListGraph &_g) { g=&_g; AlterationNotifier::ObserverBase:: - attach(g->node_observers); + attach(g->getNotifier(Node())); AlterationNotifier::ObserverBase:: - attach(g->edge_observers); + attach(g->getNotifier(Edge())); } void deregist() { diff -r bd01c5a3f989 -r 372f08e8f403 src/lemon/smart_graph.h --- a/src/lemon/smart_graph.h Thu Dec 16 12:26:57 2004 +0000 +++ b/src/lemon/smart_graph.h Thu Dec 16 12:44:49 2004 +0000 @@ -267,14 +267,14 @@ void restoreSnapShot(const SnapShot &s) { while(s.edge_num>edges.size()) { - edge_observers.erase(Edge(edges.size()-1)); + Parent::getNotifier(Edge()).erase(Edge(edges.size()-1)); nodes[edges.back().target].first_in=edges.back().next_in; nodes[edges.back().source].first_out=edges.back().next_out; edges.pop_back(); } //nodes.resize(s.nodes_num); while(s.node_num>nodes.size()) { - node_observers.erase(Node(nodes.size()-1)); + Parent::getNotifier(Node()).erase(Node(nodes.size()-1)); nodes.pop_back(); } }