Changeset 1729:06f939455cb1 in lemon-0.x

Timestamp:

10/17/05 12:28:48 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Removing signal/commit Change from alteration notifier

It makes slower the change Target/Source? functions
and used only by the In/Out? DegMap?

Files:

• lemon/bits/alteration_notifier.h (modified) (2 diffs)
• lemon/graph_utils.h (modified) (2 diffs)
• lemon/list_graph.h (modified) (5 diffs)
• lemon/smart_graph.h (modified) (1 diff)
• test/graph_utils_test.cc (modified) (2 diffs)

lemon/bits/alteration_notifier.h

@@ -173 +173 @@
       }
 
-      /// \brief Signal a property change on the given item.
-      ///
-      /// Signal a property change on the given item. It should
-      /// be used always with the commitChange() function.
-      /// This function is called always the property change.
-      /// The commitChange() is called always after the change.
-      virtual void signalChange(const Item&) {}
-
-      /// \brief Commit the property change on the given item.
-      ///
-      /// Commit the property change on the given item. It should
-      /// be used always with the signalChange() function.
-      /// This function is called always the property change.
-      /// The commitChange() is called always after the change.
-      virtual void commitChange(const Item&) {}
-
       /// \brief The member function to notificate the observer about the
       /// container is built.
@@ -325 +309 @@
       }
     }
-    
-    /// \brief Signal a property change on the given item.
-    ///
-    /// Signal a property change on the given item. It should
-    /// be used always with the commitChange() function.
-    /// This function is called always the property change.
-    /// The commitChange() is called always after the change.
-    void signalChange(const Item& item) {
-      typename Container::iterator it;
-      for (it = container.begin(); it != container.end(); ++it) {
-        (*it)->signalChange(item);
-      }
-    }
-    
-    /// \brief Commit the property change on the given item.
-    ///
-    /// Commit the property change on the given item. It should
-    /// be used always with the signalChange() function.
-    /// This function is called always the property change.
-    /// The commitChange() is called always after the change.
-    void commitChange(const Item& item) {
-      typename Container::iterator it;
-      for (it = container.begin(); it != container.end(); ++it) {
-        (*it)->commitChange(item);
-      }
-    }
 
     /// \brief Notifies all the registered observers about the container is 

lemon/graph_utils.h

@@ -1326 +1326 @@
   /// whenever the graph changes.
   ///
+  /// \warning Besides addNode() and addEdge(), a graph structure may provide
+  /// alternative ways to mogify the graph. The correct behavior of InDegMap
+  /// is not guarantied if these additional featureas are used. For example
+  /// the funstions \ref ListGraph::changeSource() "changeSource()",
+  /// \ref ListGraph::changeTarget() "changeTarget()" and
+  /// \ref ListGraph::reverseEdge() "reverseEdge()"
+  /// of \ref ListGraph will \e not update the degree values correctly.
+  ///
   /// \sa OutDegMap
 
@@ -1424 +1432 @@
   /// whenever the graph changes.
   ///
+  /// \warning Besides addNode() and addEdge(), a graph structure may provide
+  /// alternative ways to mogify the graph. The correct behavior of OutDegMap
+  /// is not guarantied if these additional featureas are used. For example
+  /// the funstions \ref ListGraph::changeSource() "changeSource()",
+  /// \ref ListGraph::changeTarget() "changeTarget()" and
+  /// \ref ListGraph::reverseEdge() "reverseEdge()"
+  /// of \ref ListGraph will \e not update the degree values correctly.
+  ///
   /// \sa InDegMap
 

lemon/list_graph.h

@@ -339 +339 @@
     ///valid. However <tt>InEdge</tt>'s are invalidated.
     void changeTarget(Edge e, Node n) { 
-      getNotifier(Edge()).signalChange(e); 
       _changeTarget(e,n); 
-      getNotifier(Edge()).commitChange(e); 
     }
     /// Changes the source of \c e to \c n
@@ -351 +349 @@
     ///valid. However <tt>OutEdge</tt>'s are invalidated.
     void changeSource(Edge e, Node n) { 
-      getNotifier(Edge()).signalChange(e); 
       _changeSource(e,n);
-      getNotifier(Edge()).commitChange(e); 
     }
 
@@ -363 +359 @@
     void reverseEdge(Edge e) {
       Node t=target(e);
-      getNotifier(Edge()).signalChange(e); 
       _changeTarget(e,source(e));
       _changeSource(e,t);
-      getNotifier(Edge()).commitChange(e); 
     }
 
@@ -594 +588 @@
     /// valid. However <tt>InEdge</tt>'s are invalidated.
     void changeTarget(UndirEdge e, Node n) { 
-      getNotifier(UndirEdge()).signalChange(e); 
-      getNotifier(Edge()).signalChange(direct(e, true)); 
-      getNotifier(Edge()).signalChange(direct(e, false)); 
       _changeTarget(e,n); 
-      getNotifier(UndirEdge()).commitChange(e);
-      getNotifier(Edge()).commitChange(direct(e, true)); 
-      getNotifier(Edge()).commitChange(direct(e, false)); 
     }
     /// Changes the source of \c e to \c n
@@ -610 +598 @@
     ///valid. However <tt>OutEdge</tt>'s are invalidated.
     void changeSource(UndirEdge e, Node n) { 
-      getNotifier(UndirEdge()).signalChange(e); 
-      getNotifier(Edge()).signalChange(direct(e, true)); 
-      getNotifier(Edge()).signalChange(direct(e, false)); 
       _changeSource(e,n); 
-      getNotifier(UndirEdge()).commitChange(e);
-      getNotifier(Edge()).commitChange(direct(e, true)); 
-      getNotifier(Edge()).commitChange(direct(e, false)); 
     }
     /// \brief Contract two nodes.

lemon/smart_graph.h

@@ -316 +316 @@
     Node split(Node n, bool connect = true) 
     {
-      for (OutEdgeIt it(*this, n); it != INVALID; ++it) {
-        getNotifier(Edge()).signalChange(it);
-      }
       Node b = _split(n,connect);
-      for (OutEdgeIt it(*this, b); it != INVALID; ++it) {
-        getNotifier(Edge()).commitChange(it);
-      }
       return b;
     }

test/graph_utils_test.cc

@@ -83 +83 @@
     ListGraph graph;
     InDegMap<ListGraph> inDeg(graph);
+    OutDegMap<ListGraph> outDeg(graph);
     std::vector<ListGraph::Node> nodes(nodeNum);
     for (int i = 0; i < nodeNum; ++i) {
@@ -96 +97 @@
             "Wrong in degree map");
     }
-    for (int i = 0; i < edgeNum; ++i) {
-      graph.changeTarget(edges[i], nodes[urandom(nodeNum)]);
-    }
     for (int i = 0; i < nodeNum; ++i) {
-      check(inDeg[nodes[i]] == countInEdges(graph, nodes[i]),
-            "Wrong in degree map");
-    }
-    for (int i = 0; i < edgeNum; ++i) {
-      graph.changeSource(edges[i], nodes[urandom(nodeNum)]);
-    }
-    for (int i = 0; i < nodeNum; ++i) {
-      check(inDeg[nodes[i]] == countInEdges(graph, nodes[i]), 
-            "Wrong in degree map");
-    }
-    for (int i = 0; i < edgeNum; ++i) {
-      graph.reverseEdge(edges[i]);
-    }
-    for (int i = 0; i < nodeNum; ++i) {
-      check(inDeg[nodes[i]] == countInEdges(graph, nodes[i]), 
+      check(outDeg[nodes[i]] == countOutEdges(graph, nodes[i]), 
             "Wrong in degree map");
     }