Changeset 1040:372f08e8f403 in lemon-0.x

Timestamp:

12/16/04 13:44:49 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

AlterationObserverRegistry? -> AlterationNotifier?
third step

Location:

src/lemon

Files:

• alteration_notifier.h (modified) (4 diffs)
• list_graph.h (modified) (1 diff)
• smart_graph.h (modified) (2 diffs)

src/lemon/alteration_notifier.h

@@ -193 +193 @@
                 
     /// 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;
@@ -316 +316 @@
   protected:
 
-    mutable EdgeNotifier edge_observers;
-
-    mutable NodeNotifier node_observers;
+    mutable EdgeNotifier edge_notifier;
+
+    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();
     }
     
@@ -363 +363 @@
   protected:
 
-    mutable UndirEdgeNotifier undir_edge_observers;
+    mutable UndirEdgeNotifier undir_edge_notifier;
 
   public:
@@ -369 +369 @@
     using Parent::getNotifier;
     UndirEdgeNotifier& getNotifier(UndirEdge) const {
-      return undir_edge_observers;
+      return undir_edge_notifier;
     }
 
     ~AlterableUndirGraphExtender() {
-      undir_edge_observers.clear();
+      undir_edge_notifier.clear();
     }
   };

src/lemon/list_graph.h

@@ -432 +432 @@
         g=&_g;
         AlterationNotifier<Node>::ObserverBase::
-          attach(g->node_observers);
+          attach(g->getNotifier(Node()));
         AlterationNotifier<Edge>::ObserverBase::
-          attach(g->edge_observers);
+          attach(g->getNotifier(Edge()));
       }
             

src/lemon/smart_graph.h

@@ -268 +268 @@
     {
       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;
@@ -275 +275 @@
       //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();
       }