Changeset 1835:eb6c34c76501 in lemon-0.x
- Timestamp:
- 11/29/05 09:40:03 (18 years ago)
- Branch:
- default
- Phase:
- public
- Convert:
- svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2387
- Location:
- lemon
- Files:
-
- 2 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/Makefile.am
r1833 r1835 8 8 libemon_la_SOURCES = \ 9 9 lp_base.cc \ 10 lp_skeleton.cc 10 lp_skeleton.cc \ 11 base.cc 11 12 libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) 12 13 libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) … … 71 72 graph_reader.h \ 72 73 graph_writer.h \ 74 tolerance.h \ 73 75 bits/alteration_notifier.h \ 74 76 bits/array_map.h \ -
lemon/preflow.h
r1792 r1835 23 23 #include <lemon/error.h> 24 24 #include <lemon/invalid.h> 25 #include <lemon/tolerance.h> 25 26 #include <lemon/maps.h> 26 27 #include <lemon/graph_utils.h> … … 62 63 template <typename Graph, typename Num, 63 64 typename CapacityMap=typename Graph::template EdgeMap<Num>, 64 typename FlowMap=typename Graph::template EdgeMap<Num> > 65 typename FlowMap=typename Graph::template EdgeMap<Num>, 66 typename TOL=Tolerance<Num> > 65 67 class Preflow { 66 68 protected: … … 79 81 const CapacityMap* _capacity; 80 82 FlowMap* _flow; 83 84 TOL surely; 85 81 86 int _node_num; //the number of nodes of G 82 87 … … 154 159 ///flowMap, resp. 155 160 Preflow(const Graph& _gr, Node _s, Node _t, 156 const CapacityMap& _cap, FlowMap& _f) : 161 const CapacityMap& _cap, FlowMap& _f, 162 const TOL &tol=TOL()) : 157 163 _g(&_gr), _source(_s), _target(_t), _capacity(&_cap), 158 _flow(&_f), _node_num(countNodes(_gr)), level(_gr), excess(_gr,0), 164 _flow(&_f), surely(tol), 165 _node_num(countNodes(_gr)), level(_gr), excess(_gr,0), 159 166 flow_prop(NO_FLOW), status(AFTER_NOTHING) { 160 167 if ( _source==_target )
Note: See TracChangeset
for help on using the changeset viewer.