Changeset 391:624e673efa76 in lemon-main
- Timestamp:
- 11/21/08 15:26:58 (16 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/preflow.h
r390 r391 194 194 195 195 template <typename _FlowMap> 196 struct DefFlowMapTraits : public Traits {196 struct SetFlowMapTraits : public Traits { 197 197 typedef _FlowMap FlowMap; 198 198 static FlowMap *createFlowMap(const Digraph&) { … … 208 208 /// type 209 209 template <typename _FlowMap> 210 struct DefFlowMap211 : public Preflow<Digraph, CapacityMap, DefFlowMapTraits<_FlowMap> > {210 struct SetFlowMap 211 : public Preflow<Digraph, CapacityMap, SetFlowMapTraits<_FlowMap> > { 212 212 typedef Preflow<Digraph, CapacityMap, 213 DefFlowMapTraits<_FlowMap> > Create;213 SetFlowMapTraits<_FlowMap> > Create; 214 214 }; 215 215 216 216 template <typename _Elevator> 217 struct DefElevatorTraits : public Traits {217 struct SetElevatorTraits : public Traits { 218 218 typedef _Elevator Elevator; 219 219 static Elevator *createElevator(const Digraph&, int) { … … 229 229 /// type 230 230 template <typename _Elevator> 231 struct DefElevator232 : public Preflow<Digraph, CapacityMap, DefElevatorTraits<_Elevator> > {231 struct SetElevator 232 : public Preflow<Digraph, CapacityMap, SetElevatorTraits<_Elevator> > { 233 233 typedef Preflow<Digraph, CapacityMap, 234 DefElevatorTraits<_Elevator> > Create;234 SetElevatorTraits<_Elevator> > Create; 235 235 }; 236 236 237 237 template <typename _Elevator> 238 struct DefStandardElevatorTraits : public Traits {238 struct SetStandardElevatorTraits : public Traits { 239 239 typedef _Elevator Elevator; 240 240 static Elevator *createElevator(const Digraph& digraph, int max_level) { … … 250 250 /// the digraph and the maximum level should be passed to it. 251 251 template <typename _Elevator> 252 struct DefStandardElevator252 struct SetStandardElevator 253 253 : public Preflow<Digraph, CapacityMap, 254 DefStandardElevatorTraits<_Elevator> > {254 SetStandardElevatorTraits<_Elevator> > { 255 255 typedef Preflow<Digraph, CapacityMap, 256 DefStandardElevatorTraits<_Elevator> > Create;256 SetStandardElevatorTraits<_Elevator> > Create; 257 257 }; 258 258 -
test/preflow_test.cc
r389 r391 47 47 CutMap cut; 48 48 49 Preflow<Digraph, CapMap>:: DefFlowMap<FlowMap>::Create preflow_test(g,cap,n,n);49 Preflow<Digraph, CapMap>::SetFlowMap<FlowMap>::Create preflow_test(g,cap,n,n); 50 50 51 51 preflow_test.capacityMap(cap);
Note: See TracChangeset
for help on using the changeset viewer.