Changeset 2031:080d51024ac5 in lemon-0.x for lemon/bits/edge_set_extender.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/bits/edge_set_extender.h (modified) (9 diffs)

lemon/bits/edge_set_extender.h

@@ -102 +102 @@
 
       explicit NodeIt(const Graph& _graph) : graph(&_graph) {
-        _graph.first(*static_cast<Node*>(this));
+        _graph.first(static_cast<Node&>(*this));
       }
 
@@ -125 +125 @@
 
       explicit EdgeIt(const Graph& _graph) : graph(&_graph) {
-        _graph.first(*static_cast<Edge*>(this));
+        _graph.first(static_cast<Edge&>(*this));
       }
 
@@ -236 +236 @@
       template <typename CMap>
       EdgeMap& operator=(const CMap& cmap) {
-        checkConcept<concept::ReadMap<Edge, _Value>, CMap>();
-        const typename Parent::Graph* graph = Parent::getGraph();
-        Edge it;
-        for (graph->first(it); it != INVALID; graph->next(it)) {
-          Parent::set(it, cmap[it]);
-        }
+        Parent::operator=(cmap);
         return *this;
       }
+
     };
 
@@ -365 +361 @@
 
       explicit NodeIt(const Graph& _graph) : graph(&_graph) {
-        _graph.first(*static_cast<Node*>(this));
+        _graph.first(static_cast<Node&>(*this));
       }
 
@@ -388 +384 @@
 
       explicit EdgeIt(const Graph& _graph) : graph(&_graph) {
-        _graph.first(*static_cast<Edge*>(this));
+        _graph.first(static_cast<Edge&>(*this));
       }
 
@@ -459 +455 @@
 
       explicit UEdgeIt(const Graph& _graph) : graph(&_graph) {
-        _graph.first(*static_cast<UEdge*>(this));
+        _graph.first(static_cast<UEdge&>(*this));
       }
 
@@ -557 +553 @@
       template <typename CMap>
       EdgeMap& operator=(const CMap& cmap) {
-        checkConcept<concept::ReadMap<Edge, _Value>, CMap>();
-        const typename Parent::Graph* graph = Parent::getGraph();
-        Edge it;
-        for (graph->first(it); it != INVALID; graph->next(it)) {
-          Parent::set(it, cmap[it]);
-        }
+        Parent::operator=(cmap);
         return *this;
       }
+
     };
 
@@ -577 +569 @@
       UEdgeMap(const Graph& _g) 
         : Parent(_g) {}
+
       UEdgeMap(const Graph& _g, const _Value& _v) 
         : Parent(_g, _v) {}
@@ -586 +579 @@
       template <typename CMap>
       UEdgeMap& operator=(const CMap& cmap) {
-        checkConcept<concept::ReadMap<UEdge, _Value>, CMap>();
-        const typename Parent::Graph* graph = Parent::getGraph();
-        UEdge it;
-        for (graph->first(it); it != INVALID; graph->next(it)) {
-          Parent::set(it, cmap[it]);
-        }
+        Parent::operator=(cmap);
         return *this;
       }
+
     };