COIN-OR::LEMON - Graph Library

Changeset 1031:0b7169db694f in lemon-0.x


Ignore:
Timestamp:
12/06/04 12:56:10 (16 years ago)
Author:
marci
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1421
Message:

:-(

Location:
src/work/marci/lp
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • src/work/marci/lp/max_flow_by_lp.cc

    r1025 r1031  
    1111#include <augmenting_flow.h>
    1212//#include <preflow_res.h>
    13 #include <lp_solver_wrapper.h>
     13//#include <lp_solver_wrapper_2.h>
    1414#include <min_cost_gen_flow.h>
    1515
     
    180180    min_cost(g, excess, lcap, cap, flow, cost);
    181181  min_cost.feasible();
    182   min_cost.run();
     182  min_cost.runByLP();
    183183
    184184  std::cout << "elapsed time: " << ts << std::endl;
  • src/work/marci/lp/min_cost_gen_flow.h

    r1028 r1031  
    1515//#include <preflow_res.h>
    1616#include <work/marci/merge_node_graph_wrapper.h>
    17 #include <work/marci/lp/lp_solver_wrapper.h>
     17#include <work/marci/lp/lp_solver_wrapper_2.h>
    1818
    1919namespace lemon {
     
    212212    }
    213213    void runByLP() {
    214       LPSolverWrapper lp;
     214      typedef LPSolverWrapper LPSolver;
     215      LPSolver lp;
    215216      lp.setMinimize();
    216       typedef LPSolverWrapper::ColIt ColIt;
    217       typedef LPSolverWrapper::RowIt RowIt;
     217      typedef LPSolver::ColIt ColIt;
     218      typedef LPSolver::RowIt RowIt;
    218219      typedef typename Graph::template EdgeMap<ColIt> EdgeIndexMap;
    219220      EdgeIndexMap edge_index_map(g);
Note: See TracChangeset for help on using the changeset viewer.