COIN-OR::LEMON - Graph Library

Ignore:
Timestamp:
04/29/04 11:08:14 (17 years ago)
Author:
marci
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@616
Message:

mods implied by preflow mods

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/work/marci/edmonds_karp_demo.cc

    r418 r465  
    7272  Graph::EdgeMap<int> flow(G); //0 flow
    7373  Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
    74     pre_flow_test(G, s, t, cap, flow, true);
     74    pre_flow_test(G, s, t, cap, flow/*, true*/);
    7575  Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
    76     pre_flow_ize(G, s, t, cap, flow, false);
    77   PreflowRes<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
    78     pre_flow_res(G, s, t, cap, flow, true);
     76    pre_flow_ize(G, s, t, cap, flow/*, false*/);
     77//   PreflowRes<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
     78//     pre_flow_res(G, s, t, cap, flow/*, true*/);
    7979  MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
    8080    max_flow_test(G, s, t, cap, flow);
     
    9292    FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
    9393    ts.reset();
    94     pre_flow_ize.run();
     94    pre_flow_ize.preflow(Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >::GEN_FLOW);
    9595    std::cout << "elapsed time: " << ts << std::endl;
    9696    std::cout << "flow value: "<< pre_flow_ize.flowValue() << std::endl;
    9797  }
    9898
    99   {
    100     std::cout << "wrapped preflow ..." << std::endl;
    101     FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
    102     ts.reset();
    103     pre_flow_res.run();
    104     std::cout << "elapsed time: " << ts << std::endl;
    105     std::cout << "flow value: "<< pre_flow_test.flowValue() << std::endl;
    106   }
     99//   {
     100//     std::cout << "wrapped preflow ..." << std::endl;
     101//     FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
     102//     ts.reset();
     103//     pre_flow_res.run();
     104//     std::cout << "elapsed time: " << ts << std::endl;
     105//     std::cout << "flow value: "<< pre_flow_test.flowValue() << std::endl;
     106//   }
    107107
    108108  {
Note: See TracChangeset for help on using the changeset viewer.