COIN-OR::LEMON - Graph Library

Changeset 597:2ca0cdb5f366 in lemon-1.2


Ignore:
Timestamp:
04/18/09 21:01:12 (10 years ago)
Author:
Balazs Dezso <deba@…>
Branch:
default
Phase:
public
Message:

Fix in HaoOrlin? (#264)

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/hao_orlin.h

    r596 r597  
    227227      for (NodeIt n(_graph); n != INVALID; ++n) {
    228228        (*_excess)[n] = 0;
     229        (*_source_set)[n] = false;
    229230      }
    230231
     
    526527      for (NodeIt n(_graph); n != INVALID; ++n) {
    527528        (*_excess)[n] = 0;
     529        (*_source_set)[n] = false;
    528530      }
    529531
  • test/hao_orlin_test.cc

    r596 r597  
    112112    ho.minCutMap(cut);
    113113   
    114     // BUG: The cut value should be positive
    115     check(ho.minCutValue() == 0, "Wrong cut value");
    116     // BUG: It should work
    117     //check(ho.minCutValue() == cutValue(graph, cap1, cut), "Wrong cut value");
     114    check(ho.minCutValue() == 1, "Wrong cut value");
     115    check(ho.minCutValue() == cutValue(graph, cap1, cut), "Wrong cut value");
    118116  }
    119117  {
     
    121119    ho.run();
    122120    ho.minCutMap(cut);
    123    
    124     // BUG: The cut value should be positive
    125     check(ho.minCutValue() == 0, "Wrong cut value");
    126     // BUG: It should work
    127     //check(ho.minCutValue() == cutValue(graph, cap2, cut), "Wrong cut value");
     121
     122    check(ho.minCutValue() == 1, "Wrong cut value");
     123    check(ho.minCutValue() == cutValue(graph, cap2, cut), "Wrong cut value");
    128124  }
    129125  {
     
    132128    ho.minCutMap(cut);
    133129   
    134     // BUG: The cut value should be positive
    135     check(ho.minCutValue() == 0, "Wrong cut value");
    136     // BUG: It should work
    137     //check(ho.minCutValue() == cutValue(graph, cap3, cut), "Wrong cut value");
     130    check(ho.minCutValue() == 1, "Wrong cut value");
     131    check(ho.minCutValue() == cutValue(graph, cap3, cut), "Wrong cut value");
    138132  }
    139133 
     
    146140    ho.minCutMap(cut);
    147141   
    148     // BUG: The cut value should be 2
    149     check(ho.minCutValue() == 1, "Wrong cut value");
    150     // BUG: It should work
    151     //check(ho.minCutValue() == cutValue(ugraph, cap1, cut), "Wrong cut value");
     142    check(ho.minCutValue() == 2, "Wrong cut value");
     143    check(ho.minCutValue() == cutValue(ugraph, cap1, cut), "Wrong cut value");
    152144  }
    153145  {
     
    156148    ho.minCutMap(cut);
    157149   
    158     // TODO: Check this cut value
    159     check(ho.minCutValue() == 4, "Wrong cut value");
    160     // BUG: It should work
    161     //check(ho.minCutValue() == cutValue(ugraph, cap2, cut), "Wrong cut value");
     150    check(ho.minCutValue() == 5, "Wrong cut value");
     151    check(ho.minCutValue() == cutValue(ugraph, cap2, cut), "Wrong cut value");
    162152  }
    163153  {
     
    166156    ho.minCutMap(cut);
    167157   
    168     // TODO: Check this cut value
    169158    check(ho.minCutValue() == 5, "Wrong cut value");
    170     // BUG: It should work
    171     //check(ho.minCutValue() == cutValue(ugraph, cap3, cut), "Wrong cut value");
     159    check(ho.minCutValue() == cutValue(ugraph, cap3, cut), "Wrong cut value");
    172160  }
    173161
Note: See TracChangeset for help on using the changeset viewer.