Changeset 1991:d7442141d9ef in lemon-0.x for lemon/bits

Timestamp:

03/01/06 11:25:30 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

The graph adadptors can be alteration observed.
In most cases it uses the adapted graph alteration notifiers.
Only special case is now the UndirGraphAdaptor?, where
we have to proxy the signals from the graph.

The SubBidirGraphAdaptor? is removed, because it doest not
gives more feature than the EdgeSubGraphAdaptor?<UndirGraphAdaptor?<Graph>>.

The ResGraphAdaptor? is based on this composition.

Location:

lemon/bits

Files:

• edge_set_extender.h (modified) (2 diffs)
• graph_extender.h (modified) (3 diffs)

lemon/bits/edge_set_extender.h

@@ -69 +69 @@
   public:
 
+    using Parent::getNotifier;
+
     /// \brief Gives back the edge alteration notifier.
     ///
@@ -323 +325 @@
 
   public:
+
+    using Parent::getNotifier;
     
     EdgeNotifier& getNotifier(Edge) const {

lemon/bits/graph_extender.h

@@ -1569 +1569 @@
 
     template <typename _Value>
-    class NodeMapBase : public NodeNotifier::ObserverBase {
+    class NodeMapBase {
     public:
       typedef BpUGraphExtender Graph;
@@ -1591 +1591 @@
 
       NodeMapBase(const Graph& _g) 
-        : graph(&_g), bNodeMap(_g), aNodeMap(_g) {
-        NodeNotifier::ObserverBase::attach(_g.getNotifier(Node()));
-      }
+        : aNodeMap(_g), bNodeMap(_g) {}
       NodeMapBase(const Graph& _g, const _Value& _v) 
-        : graph(&_g), bNodeMap(_g, _v), 
-          aNodeMap(_g, _v) {
-        NodeNotifier::ObserverBase::attach(_g.getNotifier(Node()));
-      }
-
-      virtual ~NodeMapBase() {      
-        if (NodeNotifier::ObserverBase::attached()) {
-          NodeNotifier::ObserverBase::detach();
-        }
-      }
-    
+        : aNodeMap(_g, _v), bNodeMap(_g, _v) {}
+
       ConstReference operator[](const Key& node) const {
         if (Parent::aNode(node)) {
@@ -1630 +1619 @@
       }
 
-    protected:
-      
-      virtual void add(const Node&) {}
-      virtual void add(const std::vector<Node>&) {}
-      virtual void erase(const Node&) {}
-      virtual void erase(const std::vector<Node>&) {}
-      virtual void clear() {}
-      virtual void build() {}
-
-      const Graph* getGraph() const { return graph; }
-      
+      const Graph* getGraph() const {
+        return aNodeMap.getGraph();
+      }
+
     private:
-      const Graph* graph;
+      ANodeMap<_Value> aNodeMap;
       BNodeMap<_Value> bNodeMap;
-      ANodeMap<_Value> aNodeMap;
     };