Changeset 593:7ac52d6a268e in lemon-main for test

Timestamp:

04/17/09 09:54:14 (16 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Extend and modify the interface of matching algorithms (#265)

• Rename decomposition() to status() in MaxMatching?.
• Add a new query function statusMap() to MaxMatching?.
• Add a new query function matchingMap() to all the three classes.
• Rename matchingValue() to matchingWeight() in the weighted matching classes.

File:

• test/max_matching_test.cc (modified) (6 diffs)

test/max_matching_test.cc

@@ -139 +139 @@
   const_mat_test.matching(e);
   const_mat_test.matching(n);
+  const MaxMatching<Graph>::MatchingMap& mmap =
+    const_mat_test.matchingMap();
+  e = mmap[n];
   const_mat_test.mate(n);
 
   MaxMatching<Graph>::Status stat = 
-    const_mat_test.decomposition(n);
+    const_mat_test.status(n);
+  const MaxMatching<Graph>::StatusMap& smap =
+    const_mat_test.statusMap();
+  stat = smap[n];
   const_mat_test.barrier(n);
-  
-  ignore_unused_variable_warning(stat);
 }
 
@@ -168 +172 @@
   mat_test.run();
   
-  const_mat_test.matchingValue();
+  const_mat_test.matchingWeight();
   const_mat_test.matchingSize();
   const_mat_test.matching(e);
   const_mat_test.matching(n);
+  const MaxWeightedMatching<Graph>::MatchingMap& mmap =
+    const_mat_test.matchingMap();
+  e = mmap[n];
   const_mat_test.mate(n);
   
@@ -202 +209 @@
   mat_test.run();
   
-  const_mat_test.matchingValue();
+  const_mat_test.matchingWeight();
   const_mat_test.matching(e);
   const_mat_test.matching(n);
+  const MaxWeightedPerfectMatching<Graph>::MatchingMap& mmap =
+    const_mat_test.matchingMap();
+  e = mmap[n];
   const_mat_test.mate(n);
   
@@ -225 +235 @@
 
   for (NodeIt n(graph); n != INVALID; ++n) {
-    check(mm.decomposition(n) == MaxMatching<SmartGraph>::EVEN ||
+    check(mm.status(n) == MaxMatching<SmartGraph>::EVEN ||
           mm.matching(n) != INVALID, "Wrong Gallai-Edmonds decomposition");
-    if (mm.decomposition(n) == MaxMatching<SmartGraph>::ODD) {
+    if (mm.status(n) == MaxMatching<SmartGraph>::ODD) {
       ++barrier_num;
     } else {
@@ -240 +250 @@
       ++num;
     }
-    check(mm.decomposition(graph.u(e)) != MaxMatching<SmartGraph>::EVEN ||
-          mm.decomposition(graph.v(e)) != MaxMatching<SmartGraph>::MATCHED,
+    check(mm.status(graph.u(e)) != MaxMatching<SmartGraph>::EVEN ||
+          mm.status(graph.v(e)) != MaxMatching<SmartGraph>::MATCHED,
           "Wrong Gallai-Edmonds decomposition");
 
-    check(mm.decomposition(graph.v(e)) != MaxMatching<SmartGraph>::EVEN ||
-          mm.decomposition(graph.u(e)) != MaxMatching<SmartGraph>::MATCHED,
+    check(mm.status(graph.v(e)) != MaxMatching<SmartGraph>::EVEN ||
+          mm.status(graph.u(e)) != MaxMatching<SmartGraph>::MATCHED,
           "Wrong Gallai-Edmonds decomposition");
 
-    if (mm.decomposition(graph.u(e)) != MaxMatching<SmartGraph>::ODD &&
-        mm.decomposition(graph.v(e)) != MaxMatching<SmartGraph>::ODD) {
+    if (mm.status(graph.u(e)) != MaxMatching<SmartGraph>::ODD &&
+        mm.status(graph.v(e)) != MaxMatching<SmartGraph>::ODD) {
       comp.join(graph.u(e), graph.v(e));
     }
@@ -257 +267 @@
   int odd_comp_num = 0;
   for (NodeIt n(graph); n != INVALID; ++n) {
-    if (mm.decomposition(n) != MaxMatching<SmartGraph>::ODD) {
+    if (mm.status(n) != MaxMatching<SmartGraph>::ODD) {
       int root = comp.find(n);
       if (comp_root.find(root) == comp_root.end()) {