Changeset 2463:19651a04d056 in lemon-0.x for test/bipartite_matching_test.cc

Timestamp:

08/21/07 15:22:21 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Query functions: aMatching and bMatching
Modified algorithm function interfaces
ANodeMap<UEdge> matching map
BNodeMap<bool> barrier map

Consistency between augmenting path and push-relabel algorithm

File:

• test/bipartite_matching_test.cc (modified) (1 diff)

test/bipartite_matching_test.cc

@@ -137 +137 @@
 
   {
-    Graph::UEdgeMap<bool> mm(graph);
+    Graph::ANodeMap<UEdge> mm(graph);
 
     check(max_cardinality == maxBipartiteMatching(graph, mm),
           "WRONG MATCHING");
     
-    for (ANodeIt it(graph); it != INVALID; ++it) {
-      int num = 0;
-      for (IncEdgeIt jt(graph, it); jt != INVALID; ++jt) {
-        if (mm[jt]) ++num;
+    for (BNodeIt it(graph); it != INVALID; ++it) {
+      int num = 0;
+      
+      for (IncEdgeIt jt(graph, it); jt != INVALID; ++jt) {
+        if (mm[graph.aNode(jt)] == jt) ++num;
+      }
+      check(num <= 1, "INVALID PRIMAL");
+    }
+  }
+
+  {
+    Graph::ANodeMap<UEdge> mm(graph);
+
+    check(max_cardinality == prBipartiteMatching(graph, mm),
+          "WRONG MATCHING");
+    
+    for (BNodeIt it(graph); it != INVALID; ++it) {
+      int num = 0;
+      
+      for (IncEdgeIt jt(graph, it); jt != INVALID; ++jt) {
+        if (mm[graph.aNode(jt)] == jt) ++num;
       }
       check(num <= 1, "INVALID PRIMAL");