COIN-OR::LEMON - Graph Library

Changeset 849:cc3867a7d380 in lemon-0.x


Ignore:
Timestamp:
09/14/04 12:09:24 (15 years ago)
Author:
marci
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1148
Message:
 
Location:
src
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • src/hugo/graph_wrapper.h

    r844 r849  
    230230      NodeMap(const GraphWrapper<Graph>& gw) :  Parent(*(gw.graph)) { }
    231231      NodeMap(const GraphWrapper<Graph>& gw, T a) : Parent(*(gw.graph), a) { }
     232//       NodeMap(const NodeMap<T>& map) : Parent(map) { }
     233//       template<typename Map>
     234//       NodeMap(const Map& map) :  Parent(map) { }
    232235    };
    233236
     
    237240      EdgeMap(const GraphWrapper<Graph>& gw) : Parent(*(gw.graph)) { }
    238241      EdgeMap(const GraphWrapper<Graph>& gw, T a) : Parent(*(gw.graph), a) { }
     242//       EdgeMap(const EdgeMap<T>& map) : Parent(map) { }
     243//       template<typename Map>
     244//       EdgeMap(const Map& map) :  Parent(map) { }
    239245    };
    240246  };
  • src/hugo/preflow.h

    r836 r849  
    345345    ///cut. This method can be called both after running \ref
    346346    ///phase1 and \ref phase2. It is much faster after
    347     ///\ref phase1.  \pre M should be a node map of bools. \pre
     347    ///\ref phase1.  \pre M should be a bool-valued node-map. \pre
    348348    ///If \ref mincut is called after \ref phase2 then M should
    349349    ///be initialized to false.
  • src/work/marci/graph_wrapper_time.cc

    r784 r849  
    1111#include <hugo/time_measure.h>
    1212#include <hugo/graph_wrapper.h>
    13 #include <hugo/max_flow.h>
     13#include <hugo/preflow.h>
    1414#include <hugo/dimacs.h>
    1515#include <hugo/list_graph.h>
     
    3333  ts.reset();
    3434
    35   typedef MaxFlow<Graph, int, FlowMap, FlowMap> MyMaxFlow;
    36   MyMaxFlow max_flow(g, s, t, cap, flow);
    37   max_flow.run(MyMaxFlow::NO_FLOW);
     35  typedef Preflow<Graph, int, FlowMap, FlowMap> MyPreflow;
     36  MyPreflow max_flow(g, s, t, cap, flow);
     37  max_flow.run(MyPreflow::NO_FLOW);
    3838  cout << "flow value: " << max_flow.flowValue() << endl;
    3939  cout << ts << endl;
  • src/work/marci/max_flow_demo.cc

    r777 r849  
    1313#include <hugo/time_measure.h>
    1414//#include <graph_wrapper.h>
    15 #include <hugo/max_flow.h>
     15#include <hugo/preflow.h>
    1616#include <augmenting_flow.h>
    1717//#include <preflow_res.h>
     
    3939  Timer ts;
    4040  Graph::EdgeMap<int> flow(g); //0 flow
    41   MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
     41  Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
    4242    max_flow_test(g, s, t, cap, flow);
    4343  AugmentingFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >
     
    5252    std::cout << "elapsed time: " << ts << std::endl;
    5353    std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
    54     max_flow_test.actMinCut(cut);
     54    max_flow_test.minCut(cut);
    5555
    5656    FOR_EACH_LOC(Graph::EdgeIt, e, g) {
     
    6666    FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
    6767    ts.reset();
    68     max_flow_test.preflow(MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >::GEN_FLOW);
     68    max_flow_test.preflow(Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >::GEN_FLOW);
    6969    std::cout << "elapsed time: " << ts << std::endl;
    7070    std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
Note: See TracChangeset for help on using the changeset viewer.