Changeset 597:2ca0cdb5f366 in lemon-main

Timestamp:

04/18/09 21:01:12 (16 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

Fix in HaoOrlin? (#264)

Files:

• lemon/hao_orlin.h (modified) (2 diffs)
• test/hao_orlin_test.cc (modified) (6 diffs)

lemon/hao_orlin.h

@@ -227 +227 @@
       for (NodeIt n(_graph); n != INVALID; ++n) {
         (*_excess)[n] = 0;
+        (*_source_set)[n] = false;
       }
 
@@ -526 +527 @@
       for (NodeIt n(_graph); n != INVALID; ++n) {
         (*_excess)[n] = 0;
+        (*_source_set)[n] = false;
       }
 

test/hao_orlin_test.cc

@@ -112 +112 @@
     ho.minCutMap(cut);
     
-    // BUG: The cut value should be positive
-    check(ho.minCutValue() == 0, "Wrong cut value");
-    // BUG: It should work
-    //check(ho.minCutValue() == cutValue(graph, cap1, cut), "Wrong cut value");
+    check(ho.minCutValue() == 1, "Wrong cut value");
+    check(ho.minCutValue() == cutValue(graph, cap1, cut), "Wrong cut value");
   }
   {
@@ -121 +119 @@
     ho.run();
     ho.minCutMap(cut);
-    
-    // BUG: The cut value should be positive
-    check(ho.minCutValue() == 0, "Wrong cut value");
-    // BUG: It should work
-    //check(ho.minCutValue() == cutValue(graph, cap2, cut), "Wrong cut value");
+
+    check(ho.minCutValue() == 1, "Wrong cut value");
+    check(ho.minCutValue() == cutValue(graph, cap2, cut), "Wrong cut value");
   }
   {
@@ -132 +128 @@
     ho.minCutMap(cut);
     
-    // BUG: The cut value should be positive
-    check(ho.minCutValue() == 0, "Wrong cut value");
-    // BUG: It should work
-    //check(ho.minCutValue() == cutValue(graph, cap3, cut), "Wrong cut value");
+    check(ho.minCutValue() == 1, "Wrong cut value");
+    check(ho.minCutValue() == cutValue(graph, cap3, cut), "Wrong cut value");
   }
   
@@ -146 +140 @@
     ho.minCutMap(cut);
     
-    // BUG: The cut value should be 2
-    check(ho.minCutValue() == 1, "Wrong cut value");
-    // BUG: It should work
-    //check(ho.minCutValue() == cutValue(ugraph, cap1, cut), "Wrong cut value");
+    check(ho.minCutValue() == 2, "Wrong cut value");
+    check(ho.minCutValue() == cutValue(ugraph, cap1, cut), "Wrong cut value");
   }
   {
@@ -156 +148 @@
     ho.minCutMap(cut);
     
-    // TODO: Check this cut value
-    check(ho.minCutValue() == 4, "Wrong cut value");
-    // BUG: It should work
-    //check(ho.minCutValue() == cutValue(ugraph, cap2, cut), "Wrong cut value");
+    check(ho.minCutValue() == 5, "Wrong cut value");
+    check(ho.minCutValue() == cutValue(ugraph, cap2, cut), "Wrong cut value");
   }
   {
@@ -166 +156 @@
     ho.minCutMap(cut);
     
-    // TODO: Check this cut value
     check(ho.minCutValue() == 5, "Wrong cut value");
-    // BUG: It should work
-    //check(ho.minCutValue() == cutValue(ugraph, cap3, cut), "Wrong cut value");
+    check(ho.minCutValue() == cutValue(ugraph, cap3, cut), "Wrong cut value");
   }