1.1 --- a/lemon/bits/graph_extender.h	Thu Dec 01 09:05:47 2011 +0100
     1.2 +++ b/lemon/bits/graph_extender.h	Wed Jan 11 22:21:07 2012 +0100
     1.3 @@ -913,44 +913,44 @@
     1.4  
     1.5      };
     1.6  
     1.7 -    class RedIt : public RedNode {
     1.8 +    class RedNodeIt : public RedNode {
     1.9        const BpGraph* _graph;
    1.10      public:
    1.11  
    1.12 -      RedIt() {}
    1.13 +      RedNodeIt() {}
    1.14  
    1.15 -      RedIt(Invalid i) : RedNode(i) { }
    1.16 +      RedNodeIt(Invalid i) : RedNode(i) { }
    1.17  
    1.18 -      explicit RedIt(const BpGraph& graph) : _graph(&graph) {
    1.19 +      explicit RedNodeIt(const BpGraph& graph) : _graph(&graph) {
    1.20          _graph->first(static_cast<RedNode&>(*this));
    1.21        }
    1.22  
    1.23 -      RedIt(const BpGraph& graph, const RedNode& node)
    1.24 +      RedNodeIt(const BpGraph& graph, const RedNode& node)
    1.25          : RedNode(node), _graph(&graph) {}
    1.26  
    1.27 -      RedIt& operator++() {
    1.28 +      RedNodeIt& operator++() {
    1.29          _graph->next(static_cast<RedNode&>(*this));
    1.30          return *this;
    1.31        }
    1.32  
    1.33      };
    1.34  
    1.35 -    class BlueIt : public BlueNode {
    1.36 +    class BlueNodeIt : public BlueNode {
    1.37        const BpGraph* _graph;
    1.38      public:
    1.39  
    1.40 -      BlueIt() {}
    1.41 +      BlueNodeIt() {}
    1.42  
    1.43 -      BlueIt(Invalid i) : BlueNode(i) { }
    1.44 +      BlueNodeIt(Invalid i) : BlueNode(i) { }
    1.45  
    1.46 -      explicit BlueIt(const BpGraph& graph) : _graph(&graph) {
    1.47 +      explicit BlueNodeIt(const BpGraph& graph) : _graph(&graph) {
    1.48          _graph->first(static_cast<BlueNode&>(*this));
    1.49        }
    1.50  
    1.51 -      BlueIt(const BpGraph& graph, const BlueNode& node)
    1.52 +      BlueNodeIt(const BpGraph& graph, const BlueNode& node)
    1.53          : BlueNode(node), _graph(&graph) {}
    1.54  
    1.55 -      BlueIt& operator++() {
    1.56 +      BlueNodeIt& operator++() {
    1.57          _graph->next(static_cast<BlueNode&>(*this));
    1.58          return *this;
    1.59        }
    1.60 @@ -1144,23 +1144,23 @@
    1.61      };
    1.62  
    1.63      template <typename _Value>
    1.64 -    class RedMap
    1.65 +    class RedNodeMap
    1.66        : public MapExtender<DefaultMap<BpGraph, RedNode, _Value> > {
    1.67        typedef MapExtender<DefaultMap<BpGraph, RedNode, _Value> > Parent;
    1.68  
    1.69      public:
    1.70 -      explicit RedMap(const BpGraph& bpgraph)
    1.71 +      explicit RedNodeMap(const BpGraph& bpgraph)
    1.72          : Parent(bpgraph) {}
    1.73 -      RedMap(const BpGraph& bpgraph, const _Value& value)
    1.74 +      RedNodeMap(const BpGraph& bpgraph, const _Value& value)
    1.75          : Parent(bpgraph, value) {}
    1.76  
    1.77      private:
    1.78 -      RedMap& operator=(const RedMap& cmap) {
    1.79 -        return operator=<RedMap>(cmap);
    1.80 +      RedNodeMap& operator=(const RedNodeMap& cmap) {
    1.81 +        return operator=<RedNodeMap>(cmap);
    1.82        }
    1.83  
    1.84        template <typename CMap>
    1.85 -      RedMap& operator=(const CMap& cmap) {
    1.86 +      RedNodeMap& operator=(const CMap& cmap) {
    1.87          Parent::operator=(cmap);
    1.88          return *this;
    1.89        }
    1.90 @@ -1168,23 +1168,23 @@
    1.91      };
    1.92  
    1.93      template <typename _Value>
    1.94 -    class BlueMap
    1.95 +    class BlueNodeMap
    1.96        : public MapExtender<DefaultMap<BpGraph, BlueNode, _Value> > {
    1.97        typedef MapExtender<DefaultMap<BpGraph, BlueNode, _Value> > Parent;
    1.98  
    1.99      public:
   1.100 -      explicit BlueMap(const BpGraph& bpgraph)
   1.101 +      explicit BlueNodeMap(const BpGraph& bpgraph)
   1.102          : Parent(bpgraph) {}
   1.103 -      BlueMap(const BpGraph& bpgraph, const _Value& value)
   1.104 +      BlueNodeMap(const BpGraph& bpgraph, const _Value& value)
   1.105          : Parent(bpgraph, value) {}
   1.106  
   1.107      private:
   1.108 -      BlueMap& operator=(const BlueMap& cmap) {
   1.109 -        return operator=<BlueMap>(cmap);
   1.110 +      BlueNodeMap& operator=(const BlueNodeMap& cmap) {
   1.111 +        return operator=<BlueNodeMap>(cmap);
   1.112        }
   1.113  
   1.114        template <typename CMap>
   1.115 -      BlueMap& operator=(const CMap& cmap) {
   1.116 +      BlueNodeMap& operator=(const CMap& cmap) {
   1.117          Parent::operator=(cmap);
   1.118          return *this;
   1.119        }