Ticket #69: 37d179a45077.patch

lemon/bits/graph_extender.h

@@ -840 +840 @@
       }
     }
 
-    std::pair<RedNode, BlueNode> asRedBlueNode(const Node& node) const {
-      if (node == INVALID) {
-        return std::make_pair(RedNode(INVALID), BlueNode(INVALID));
-      } else if (Parent::red(node)) {
-        return std::make_pair(Parent::asRedNodeUnsafe(node), BlueNode(INVALID));
-      } else {
-        return std::make_pair(RedNode(INVALID), Parent::asBlueNodeUnsafe(node));
-      }
-    }
-
     // Alterable extension
 
     typedef AlterationNotifier<BpGraphExtender, Node> NodeNotifier;

lemon/concepts/bpgraph.h

@@ -800 +800 @@
       /// returns INVALID.
       BlueNode asBlueNode(const Node&) const { return BlueNode(); }
 
-      /// \brief Convert the node to either red or blue node.
-      ///
-      /// If the node is from the red partition then it is returned in
-      /// first and second is INVALID. If the node is from the blue
-      /// partition then it is returned in second and first is
-      /// INVALID. If the node INVALID then both first and second are
-      /// INVALID in the return value.
-      std::pair<RedNode, BlueNode> asRedBlueNode(const Node&) const {
-        return std::make_pair(RedNode(), BlueNode());
-      }
-
       /// \brief Gives back the red end node of the edge.
       /// 
       /// Gives back the red end node of the edge.

lemon/concepts/graph_components.h

@@ -423 +423 @@
       /// returns INVALID.
       BlueNode asBlueNode(const Node&) const { return BlueNode(); }
 
-      /// \brief Convert the node to either red or blue node.
-      ///
-      /// If the node is from the red partition then it is returned in
-      /// first and second is INVALID. If the node is from the blue
-      /// partition then it is returned in second and first is
-      /// INVALID. If the node INVALID then both first and second are
-      /// INVALID in the return value.
-      std::pair<RedNode, BlueNode> asRedBlueNode(const Node&) const {
-        return std::make_pair(RedNode(), BlueNode());
-      }
-
       template <typename _BpGraph>
       struct Constraints {
         typedef typename _BpGraph::Node Node;
@@ -463 +452 @@
             bn = bpgraph.asBlueNodeUnsafe(bnan);
             rn = bpgraph.asRedNode(rnan);
             bn = bpgraph.asBlueNode(bnan);
-            std::pair<RedNode, BlueNode> p = bpgraph.asRedBlueNode(rnan);
           }
         }
 

lemon/core.h

@@ -1209 +1209 @@
       typedef typename To::Node Value;
 
       Value operator[](const Key& key) const {
-        std::pair<RedNode, BlueNode> red_blue_pair = _from.asRedBlueNode(key);
-        if (red_blue_pair.first != INVALID) {
-          return _red_node_ref[red_blue_pair.first];
+        if (_from.red(key)) {
+          return _red_node_ref[_from.asRedNodeUnsafe(key)];
         } else {
-          return _blue_node_ref[red_blue_pair.second];
+          return _blue_node_ref[_from.asBlueNodeUnsafe(key)];
         }
       }
 

test/graph_test.h

@@ -52 +52 @@
       check(G.asRedNodeUnsafe(nn) == n,"Wrong node conversion.");
       check(G.asRedNode(nn) == n,"Wrong node conversion.");
       check(G.asBlueNode(nn) == INVALID,"Wrong node conversion.");
-      std::pair<typename Graph::RedNode, typename Graph::BlueNode> rbn =
-        G.asRedBlueNode(nn);
-      check(rbn.first == n,"Wrong node conversion.");
-      check(rbn.second == INVALID,"Wrong node conversion.");
       ++n;
     }
     check(n==INVALID,"Wrong red Node list linking.");
@@ -74 +70 @@
       check(G.asBlueNodeUnsafe(nn) == n,"Wrong node conversion.");
       check(G.asBlueNode(nn) == n,"Wrong node conversion.");
       check(G.asRedNode(nn) == INVALID,"Wrong node conversion.");
-      std::pair<typename Graph::RedNode, typename Graph::BlueNode> rbn =
-        G.asRedBlueNode(nn);
-      check(rbn.first == INVALID,"Wrong node conversion.");
-      check(rbn.second == n,"Wrong node conversion.");
       ++n;
     }
     check(n==INVALID,"Wrong blue Node list linking.");