1.1 --- a/src/work/athos/mincostflows_test.cc	Tue May 04 16:17:17 2004 +0000
     1.2 +++ b/src/work/athos/mincostflows_test.cc	Tue May 04 16:52:15 2004 +0000
     1.3 @@ -61,16 +61,21 @@
     1.4    length.set(v4_t, 8);
     1.5    length.set(v5_t, 8);
     1.6  
     1.7 -  ConstMap const1map(1);
     1.8 -  std::cout << "Minlengthpaths algorithm test..." << std::endl;
     1.9 +  ConstMap<Edge, int> const1map(1);
    1.10 +  std::cout << "Mincostflows algorithm test..." << std::endl;
    1.11  
    1.12    
    1.13    int k=3;
    1.14 -  MinCostFlows< ListGraph, ListGraph::EdgeMap<int> >
    1.15 +  MinCostFlows< ListGraph, ListGraph::EdgeMap<int>, ConstMap<Edge, int> >
    1.16      surb_test(graph, length, const1map);
    1.17  
    1.18    check(  surb_test.run(s,t,k) == 2 && surb_test.totalLength() == 46,"Two paths, total length should be 46");
    1.19  
    1.20 +  k=1;
    1.21 +  check(  surb_test.run(s,t,k) == 1 && surb_test.totalLength() == 19,"One path, total length should be 19");
    1.22 +  
    1.23 +  //cout << surb_test.run(s,t,k) << surb_test.totalLength()<<endl;
    1.24 +  /*
    1.25    typedef DirPath<ListGraph> DPath;
    1.26    DPath P(graph);
    1.27  
    1.28 @@ -85,7 +90,7 @@
    1.29   
    1.30    surb_test.getPath(P,0);
    1.31    check(P.length() == 4, "First path should contain 4 edges.");  
    1.32 -
    1.33 +  */
    1.34    cout << (passed ? "All tests passed." : "Some of the tests failed!!!")
    1.35         << endl;
    1.36