Rename DefFlowMap named parameter to SetFlowMap (#177)
authorPeter Kovacs <kpeter@inf.elte.hu>
Thu, 28 Feb 2013 18:05:56 +0100
changeset 12262f00ef323c2e
parent 1225 6a8a688eacf6
child 1227 08f2dc76e82e
Rename DefFlowMap named parameter to SetFlowMap (#177)
in EdmondsKarp according to Preflow
lemon/edmonds_karp.h
test/edmonds_karp_test.cc
     1.1 --- a/lemon/edmonds_karp.h	Thu Feb 28 18:17:53 2013 +0100
     1.2 +++ b/lemon/edmonds_karp.h	Thu Feb 28 18:05:56 2013 +0100
     1.3 @@ -172,7 +172,7 @@
     1.4      ///@{
     1.5  
     1.6      template <typename T>
     1.7 -    struct DefFlowMapTraits : public Traits {
     1.8 +    struct SetFlowMapTraits : public Traits {
     1.9        typedef T FlowMap;
    1.10        static FlowMap *createFlowMap(const Digraph&) {
    1.11  	LEMON_ASSERT(false, "FlowMap is not initialized");
    1.12 @@ -186,10 +186,9 @@
    1.13      /// \ref named-templ-param "Named parameter" for setting FlowMap
    1.14      /// type
    1.15      template <typename T>
    1.16 -    struct DefFlowMap 
    1.17 -      : public EdmondsKarp<Digraph, CapacityMap, DefFlowMapTraits<T> > {
    1.18 -      typedef EdmondsKarp<Digraph, CapacityMap, DefFlowMapTraits<T> >
    1.19 -      Create;
    1.20 +    struct SetFlowMap 
    1.21 +      : public EdmondsKarp<Digraph, CapacityMap, SetFlowMapTraits<T> > {
    1.22 +      typedef EdmondsKarp<Digraph, CapacityMap, SetFlowMapTraits<T> > Create;
    1.23      };
    1.24  
    1.25      /// @}
     2.1 --- a/test/edmonds_karp_test.cc	Thu Feb 28 18:17:53 2013 +0100
     2.2 +++ b/test/edmonds_karp_test.cc	Thu Feb 28 18:05:56 2013 +0100
     2.3 @@ -83,7 +83,7 @@
     2.4    bool b;
     2.5    ignore_unused_variable_warning(v,b);
     2.6    typedef EdmondsKarp<Digraph, CapMap>
     2.7 -              ::DefFlowMap<FlowMap>
     2.8 +              ::SetFlowMap<FlowMap>
     2.9                ::Create EKType;
    2.10    EKType ek_test(g, cap, n, n);
    2.11    const EKType& const_ek_test = ek_test;