Changeset 2031:080d51024ac5 in lemon-0.x for lemon/edge_set.h

Timestamp:

04/03/06 11:45:23 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Correcting the structure of the graph's and adaptor's map.
The template assign operators and map iterators can be used for adaptors also.

Some bugfix in the adaptors

New class SwapBpUGraphAdaptor which swaps the two nodeset of the graph.

File:

• lemon/edge_set.h (modified) (3 diffs)

lemon/edge_set.h

@@ -207 +207 @@
     class NodeMap : public Graph::template NodeMap<_Value> {
     public:
+
       typedef typename _Graph::template NodeMap<_Value> Parent;
+
       explicit NodeMap(const ListEdgeSetBase<Graph>& edgeset) 
-        : Parent(*edgeset.graph) { }
+        : Parent(*edgeset.graph) {}
+
       NodeMap(const ListEdgeSetBase<Graph>& edgeset, const _Value& value)
-        : Parent(*edgeset.graph, value) { }
+        : Parent(*edgeset.graph, value) {}
+
+      NodeMap& operator=(const NodeMap& cmap) {
+        return operator=<NodeMap>(cmap);
+      }
+
+      template <typename CMap>
+      NodeMap& operator=(const CMap& cmap) {
+        Parent::operator=(cmap);
+        return *this;
+      }
     };
 
@@ -522 +535 @@
     class NodeMap : public Graph::template NodeMap<_Value> {
     public:
+
       typedef typename _Graph::template NodeMap<_Value> Parent;
+
       explicit NodeMap(const SmartEdgeSetBase<Graph>& edgeset) 
         : Parent(*edgeset.graph) { }
+
       NodeMap(const SmartEdgeSetBase<Graph>& edgeset, const _Value& value)
         : Parent(*edgeset.graph, value) { }
+
+      NodeMap& operator=(const NodeMap& cmap) {
+        return operator=<NodeMap>(cmap);
+      }
+
+      template <typename CMap>
+      NodeMap& operator=(const CMap& cmap) {
+        Parent::operator=(cmap);
+        return *this;
+      }
     };
 
@@ -668 +694 @@
 
     void eraseNode(const Node& node) {
-      if (Parent::IncEdgeIt(*this, node) == INVALID) {
+      if (typename Parent::IncEdgeIt(*this, node) == INVALID) {
         return;
       }