Changeset 1999:2ff283124dfc in lemon-0.x for lemon/graph_utils.h

Timestamp:

03/06/06 11:28:37 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Clarifing alteration observing system
It is directly connected now to a container

File:

• lemon/graph_utils.h (modified) (7 diffs)

lemon/graph_utils.h

@@ -1190 +1190 @@
       Map::build();
       Item it;
-      const typename Map::Graph* graph = Map::getGraph(); 
-      for (graph->first(it); it != INVALID; graph->next(it)) {
+      const typename Map::Notifier* notifier = Map::getNotifier(); 
+      for (notifier->first(it); it != INVALID; notifier->next(it)) {
         Map::set(it, invMap.size());
         invMap.push_back(it);   
@@ -1498 +1498 @@
   template <typename _Graph>
   class InDegMap  
-    : protected AlterationNotifier<typename _Graph::Edge>::ObserverBase {
+    : protected ItemSetTraits<_Graph, typename _Graph::Edge>
+      ::ItemNotifier::ObserverBase {
 
   public:
@@ -1505 +1506 @@
     typedef int Value;
     typedef typename Graph::Node Key;
+
+    typedef typename ItemSetTraits<_Graph, typename _Graph::Edge>
+    ::ItemNotifier::ObserverBase Parent;
 
   private:
@@ -1534 +1538 @@
     /// Constructor for creating in-degree map.
     InDegMap(const Graph& _graph) : graph(_graph), deg(_graph) {
-      AlterationNotifier<typename _Graph::Edge>
-        ::ObserverBase::attach(graph.getNotifier(typename _Graph::Edge()));
+      Parent::attach(graph.getNotifier(typename _Graph::Edge()));
       
       for(typename _Graph::NodeIt it(graph); it != INVALID; ++it) {
         deg[it] = countInEdges(graph, it);
       }
-    }
-
-    virtual ~InDegMap() {
-      AlterationNotifier<typename _Graph::Edge>::
-        ObserverBase::detach();
     }
     
@@ -1612 +1610 @@
   template <typename _Graph>
   class OutDegMap  
-    : protected AlterationNotifier<typename _Graph::Edge>::ObserverBase {
-
-  public:
+    : protected ItemSetTraits<_Graph, typename _Graph::Edge>
+      ::ItemNotifier::ObserverBase {
+
+  public:
+
+    typedef typename ItemSetTraits<_Graph, typename _Graph::Edge>
+    ::ItemNotifier::ObserverBase Parent;
     
     typedef _Graph Graph;
@@ -1647 +1649 @@
     /// Constructor for creating out-degree map.
     OutDegMap(const Graph& _graph) : graph(_graph), deg(_graph) {
-      AlterationNotifier<typename _Graph::Edge>
-        ::ObserverBase::attach(graph.getNotifier(typename _Graph::Edge()));
+      Parent::attach(graph.getNotifier(typename _Graph::Edge()));
       
       for(typename _Graph::NodeIt it(graph); it != INVALID; ++it) {
@@ -1655 +1656 @@
     }
 
-    virtual ~OutDegMap() {
-      AlterationNotifier<typename _Graph::Edge>::
-        ObserverBase::detach();
-    }
-    
     /// Gives back the out-degree of a Node.
     int operator[](const Key& key) const {