COIN-OR::LEMON - Graph Library

Changeset 391:624e673efa76 in lemon-main


Ignore:
Timestamp:
11/21/08 15:26:58 (16 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Phase:
public
Message:

Def -> Set renaming in Preflow

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/preflow.h

    r390 r391  
    194194
    195195    template <typename _FlowMap>
    196     struct DefFlowMapTraits : public Traits {
     196    struct SetFlowMapTraits : public Traits {
    197197      typedef _FlowMap FlowMap;
    198198      static FlowMap *createFlowMap(const Digraph&) {
     
    208208    /// type
    209209    template <typename _FlowMap>
    210     struct DefFlowMap
    211       : public Preflow<Digraph, CapacityMap, DefFlowMapTraits<_FlowMap> > {
     210    struct SetFlowMap
     211      : public Preflow<Digraph, CapacityMap, SetFlowMapTraits<_FlowMap> > {
    212212      typedef Preflow<Digraph, CapacityMap,
    213                       DefFlowMapTraits<_FlowMap> > Create;
     213                      SetFlowMapTraits<_FlowMap> > Create;
    214214    };
    215215
    216216    template <typename _Elevator>
    217     struct DefElevatorTraits : public Traits {
     217    struct SetElevatorTraits : public Traits {
    218218      typedef _Elevator Elevator;
    219219      static Elevator *createElevator(const Digraph&, int) {
     
    229229    /// type
    230230    template <typename _Elevator>
    231     struct DefElevator
    232       : public Preflow<Digraph, CapacityMap, DefElevatorTraits<_Elevator> > {
     231    struct SetElevator
     232      : public Preflow<Digraph, CapacityMap, SetElevatorTraits<_Elevator> > {
    233233      typedef Preflow<Digraph, CapacityMap,
    234                       DefElevatorTraits<_Elevator> > Create;
     234                      SetElevatorTraits<_Elevator> > Create;
    235235    };
    236236
    237237    template <typename _Elevator>
    238     struct DefStandardElevatorTraits : public Traits {
     238    struct SetStandardElevatorTraits : public Traits {
    239239      typedef _Elevator Elevator;
    240240      static Elevator *createElevator(const Digraph& digraph, int max_level) {
     
    250250    /// the digraph and the maximum level should be passed to it.
    251251    template <typename _Elevator>
    252     struct DefStandardElevator
     252    struct SetStandardElevator
    253253      : public Preflow<Digraph, CapacityMap,
    254                        DefStandardElevatorTraits<_Elevator> > {
     254                       SetStandardElevatorTraits<_Elevator> > {
    255255      typedef Preflow<Digraph, CapacityMap,
    256                       DefStandardElevatorTraits<_Elevator> > Create;
     256                      SetStandardElevatorTraits<_Elevator> > Create;
    257257    };
    258258
  • test/preflow_test.cc

    r389 r391  
    4747  CutMap cut;
    4848
    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);
    5050
    5151  preflow_test.capacityMap(cap);
Note: See TracChangeset for help on using the changeset viewer.