Changeset 2384:805c5a2a36dd in lemon-0.x for lemon/graph_adaptor.h

Timestamp:

03/01/07 18:14:24 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

getNotifier to notifier renaming

File:

• lemon/graph_adaptor.h (modified) (21 diffs)

lemon/graph_adaptor.h

@@ -133 +133 @@
     typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
 
-    NodeNotifier& getNotifier(Node) const {
-      return graph->getNotifier(Node());
+    NodeNotifier& notifier(Node) const {
+      return graph->notifier(Node());
     } 
 
     typedef typename ItemSetTraits<Graph, Edge>::ItemNotifier EdgeNotifier;
 
-    EdgeNotifier& getNotifier(Edge) const {
-      return graph->getNotifier(Edge());
+    EdgeNotifier& notifier(Edge) const {
+      return graph->notifier(Edge());
     } 
     
@@ -1183 +1183 @@
     void setGraph(_Graph& graph) {
       Parent::setGraph(graph);
-      edge_notifier_proxy.setNotifier(graph.getNotifier(GraphEdge()));
+      edge_notifier_proxy.setNotifier(graph.notifier(GraphEdge()));
     }
 
@@ -1197 +1197 @@
     typedef typename Parent::EdgeNotifier UEdgeNotifier;
 
-    using Parent::getNotifier;
+    using Parent::notifier;
 
     typedef AlterationNotifier<AlterableUndirGraphAdaptor, 
                                Edge> EdgeNotifier;
-    EdgeNotifier& getNotifier(Edge) const { return edge_notifier; }
+    EdgeNotifier& notifier(Edge) const { return edge_notifier; }
 
   protected:
@@ -1232 +1232 @@
         edges.push_back(AdaptorBase::Parent::direct(ge, true));
         edges.push_back(AdaptorBase::Parent::direct(ge, false));
-        adaptor->getNotifier(Edge()).add(edges);
+        adaptor->notifier(Edge()).add(edges);
       }
       virtual void add(const std::vector<GraphEdge>& ge) {
@@ -1240 +1240 @@
           edges.push_back(AdaptorBase::Parent::direct(ge[i], false));
         }
-        adaptor->getNotifier(Edge()).add(edges);
+        adaptor->notifier(Edge()).add(edges);
       }
       virtual void erase(const GraphEdge& ge) {
@@ -1246 +1246 @@
         edges.push_back(AdaptorBase::Parent::direct(ge, true));
         edges.push_back(AdaptorBase::Parent::direct(ge, false));
-        adaptor->getNotifier(Edge()).erase(edges);
+        adaptor->notifier(Edge()).erase(edges);
       }
       virtual void erase(const std::vector<GraphEdge>& ge) {
@@ -1254 +1254 @@
           edges.push_back(AdaptorBase::Parent::direct(ge[i], false));
         }
-        adaptor->getNotifier(Edge()).erase(edges);
+        adaptor->notifier(Edge()).erase(edges);
       }
       virtual void build() {
-        adaptor->getNotifier(Edge()).build();
+        adaptor->notifier(Edge()).build();
       }
       virtual void clear() {
-        adaptor->getNotifier(Edge()).clear();
+        adaptor->notifier(Edge()).clear();
       }
 
@@ -2144 +2144 @@
     void setGraph(_Graph& graph) {
       Parent::setGraph(graph);
-      node_notifier_proxy.setNotifier(graph.getNotifier(GraphNode()));
+      node_notifier_proxy.setNotifier(graph.notifier(GraphNode()));
     }
 
@@ -2156 +2156 @@
     typedef InvalidType EdgeNotifier;
 
-    NodeNotifier& getNotifier(Node) const { return node_notifier; }
+    NodeNotifier& notifier(Node) const { return node_notifier; }
 
   protected:
@@ -2187 +2187 @@
         nodes.push_back(AdaptorBase::Parent::inNode(gn));
         nodes.push_back(AdaptorBase::Parent::outNode(gn));
-        adaptor->getNotifier(Node()).add(nodes);
+        adaptor->notifier(Node()).add(nodes);
       }
 
@@ -2196 +2196 @@
           nodes.push_back(AdaptorBase::Parent::outNode(gn[i]));
         }
-        adaptor->getNotifier(Node()).add(nodes);
+        adaptor->notifier(Node()).add(nodes);
       }
 
@@ -2203 +2203 @@
         nodes.push_back(AdaptorBase::Parent::inNode(gn));
         nodes.push_back(AdaptorBase::Parent::outNode(gn));
-        adaptor->getNotifier(Node()).erase(nodes);
+        adaptor->notifier(Node()).erase(nodes);
       }
 
@@ -2212 +2212 @@
           nodes.push_back(AdaptorBase::Parent::outNode(gn[i]));
         }
-        adaptor->getNotifier(Node()).erase(nodes);
+        adaptor->notifier(Node()).erase(nodes);
       }
       virtual void build() {
-        adaptor->getNotifier(Node()).build();
+        adaptor->notifier(Node()).build();
       }
       virtual void clear() {
-        adaptor->getNotifier(Node()).clear();
+        adaptor->notifier(Node()).clear();
       }
 
@@ -2256 +2256 @@
     void setGraph(_Graph& graph) {
       Parent::setGraph(graph);
-      node_notifier_proxy.setNotifier(graph.getNotifier(GraphNode()));
-      edge_notifier_proxy.setNotifier(graph.getNotifier(GraphEdge()));
+      node_notifier_proxy.setNotifier(graph.notifier(GraphNode()));
+      edge_notifier_proxy.setNotifier(graph.notifier(GraphEdge()));
     }
 
@@ -2270 +2270 @@
     typedef AlterationNotifier<AlterableSplitGraphAdaptor, Edge> EdgeNotifier;
 
-    NodeNotifier& getNotifier(Node) const { return node_notifier; }
-    EdgeNotifier& getNotifier(Edge) const { return edge_notifier; }
+    NodeNotifier& notifier(Node) const { return node_notifier; }
+    EdgeNotifier& notifier(Edge) const { return edge_notifier; }
 
   protected:
@@ -2302 +2302 @@
         nodes.push_back(AdaptorBase::Parent::inNode(gn));
         nodes.push_back(AdaptorBase::Parent::outNode(gn));
-        adaptor->getNotifier(Node()).add(nodes);
-        adaptor->getNotifier(Edge()).add(AdaptorBase::Parent::edge(gn));
+        adaptor->notifier(Node()).add(nodes);
+        adaptor->notifier(Edge()).add(AdaptorBase::Parent::edge(gn));
       }
       virtual void add(const std::vector<GraphNode>& gn) {
@@ -2313 +2313 @@
           nodes.push_back(AdaptorBase::Parent::outNode(gn[i]));
         }
-        adaptor->getNotifier(Node()).add(nodes);
-        adaptor->getNotifier(Edge()).add(edges);
+        adaptor->notifier(Node()).add(nodes);
+        adaptor->notifier(Edge()).add(edges);
       }
       virtual void erase(const GraphNode& gn) {
-        adaptor->getNotifier(Edge()).erase(AdaptorBase::Parent::edge(gn));
+        adaptor->notifier(Edge()).erase(AdaptorBase::Parent::edge(gn));
         std::vector<Node> nodes;
         nodes.push_back(AdaptorBase::Parent::inNode(gn));
         nodes.push_back(AdaptorBase::Parent::outNode(gn));
-        adaptor->getNotifier(Node()).erase(nodes);
+        adaptor->notifier(Node()).erase(nodes);
       }
       virtual void erase(const std::vector<GraphNode>& gn) {
@@ -2331 +2331 @@
           nodes.push_back(AdaptorBase::Parent::outNode(gn[i]));
         }
-        adaptor->getNotifier(Edge()).erase(edges);
-        adaptor->getNotifier(Node()).erase(nodes);
+        adaptor->notifier(Edge()).erase(edges);
+        adaptor->notifier(Node()).erase(nodes);
       }
       virtual void build() {
         std::vector<Edge> edges;
-        const typename Parent::Notifier* notifier = Parent::getNotifier();
+        const typename Parent::Notifier* notifier = Parent::notifier();
         GraphNode it;
         for (notifier->first(it); it != INVALID; notifier->next(it)) {
           edges.push_back(AdaptorBase::Parent::edge(it));
         }
-        adaptor->getNotifier(Node()).build();
-        adaptor->getNotifier(Edge()).add(edges);        
+        adaptor->notifier(Node()).build();
+        adaptor->notifier(Edge()).add(edges);        
       }
       virtual void clear() {
         std::vector<Edge> edges;
-        const typename Parent::Notifier* notifier = Parent::getNotifier();
+        const typename Parent::Notifier* notifier = Parent::notifier();
         GraphNode it;
         for (notifier->first(it); it != INVALID; notifier->next(it)) {
           edges.push_back(AdaptorBase::Parent::edge(it));
         }
-        adaptor->getNotifier(Edge()).erase(edges);        
-        adaptor->getNotifier(Node()).clear();
+        adaptor->notifier(Edge()).erase(edges);        
+        adaptor->notifier(Node()).clear();
       }
 
@@ -2382 +2382 @@
 
       virtual void add(const GraphEdge& ge) {
-        adaptor->getNotifier(Edge()).add(AdaptorBase::edge(ge));
+        adaptor->notifier(Edge()).add(AdaptorBase::edge(ge));
       }
       virtual void add(const std::vector<GraphEdge>& ge) {
@@ -2389 +2389 @@
           edges.push_back(AdaptorBase::edge(ge[i]));
         }
-        adaptor->getNotifier(Edge()).add(edges);
+        adaptor->notifier(Edge()).add(edges);
       }
       virtual void erase(const GraphEdge& ge) {
-        adaptor->getNotifier(Edge()).erase(AdaptorBase::edge(ge));
+        adaptor->notifier(Edge()).erase(AdaptorBase::edge(ge));
       }
       virtual void erase(const std::vector<GraphEdge>& ge) {
@@ -2399 +2399 @@
           edges.push_back(AdaptorBase::edge(ge[i]));
         }
-        adaptor->getNotifier(Edge()).erase(edges);
+        adaptor->notifier(Edge()).erase(edges);
       }
       virtual void build() {
         std::vector<Edge> edges;
-        const typename Parent::Notifier* notifier = Parent::getNotifier();
+        const typename Parent::Notifier* notifier = Parent::notifier();
         GraphEdge it;
         for (notifier->first(it); it != INVALID; notifier->next(it)) {
           edges.push_back(AdaptorBase::Parent::edge(it));
         }
-        adaptor->getNotifier(Edge()).add(edges);
+        adaptor->notifier(Edge()).add(edges);
       }
       virtual void clear() {
         std::vector<Edge> edges;
-        const typename Parent::Notifier* notifier = Parent::getNotifier();
+        const typename Parent::Notifier* notifier = Parent::notifier();
         GraphEdge it;
         for (notifier->first(it); it != INVALID; notifier->next(it)) {
           edges.push_back(AdaptorBase::Parent::edge(it));
         }
-        adaptor->getNotifier(Edge()).erase(edges);
+        adaptor->notifier(Edge()).erase(edges);
       }