COIN-OR::LEMON - Graph Library

Changeset 390:8dc830d3f9ef in lemon-0.x


Ignore:
Timestamp:
04/24/04 14:53:46 (16 years ago)
Author:
marci
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@521
Message:

jacint mindig modosit, es ezert nekunk is kell

Location:
src/work
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/work/jacint/preflow_res.h

    r388 r390  
    491491} //namespace hugo
    492492
    493 #endif //PREFLOW_H
    494 
    495 
    496 
    497 
     493#endif //HUGO_PREFLOW_RES_H
     494
     495
     496
     497
  • src/work/makefile

    r389 r390  
    11INCLUDEDIRS ?= -I../include -I. -I./{marci,jacint,alpar,klao,akos}
    2 CXXFLAGS = -g -O2 -W -Wall $(INCLUDEDIRS) -ansi -pedantic
     2CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic
    33
    44BINARIES ?= bin_heap_demo
  • src/work/marci/edmonds_karp_demo.cc

    r389 r390  
    1010//#include <graph_wrapper.h>
    1111#include <preflow.h>
    12 #include <preflowproba.h>
     12#include <preflow_res.h>
    1313#include <for_each_macros.h>
    1414
     
    7373  Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
    7474    pre_flow_test(G, s, t, cap, flow, true);
    75   PreflowProba<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
    76     pre_flow_proba(G, s, t, cap, flow, true, true);
     75  PreflowRes<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
     76    pre_flow_res(G, s, t, cap, flow, true);
    7777  MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
    7878    max_flow_test(G, s, t, cap, flow);
     
    9090    FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
    9191    ts.reset();
    92     pre_flow_proba.run();
     92    pre_flow_res.run();
    9393    std::cout << "elapsed time: " << ts << std::endl;
    9494    std::cout << "flow value: "<< pre_flow_test.flowValue() << std::endl;
Note: See TracChangeset for help on using the changeset viewer.