Small corrections
authordeba
Mon, 03 Apr 2006 16:05:26 +0000
changeset 20337bf1f64962c2
parent 2032 18c08f9129e4
child 2034 b71f8ff62046
Small corrections
lemon/bfs.h
lemon/preflow.h
lemon/radix_sort.h
     1.1 --- a/lemon/bfs.h	Mon Apr 03 16:03:37 2006 +0000
     1.2 +++ b/lemon/bfs.h	Mon Apr 03 16:05:26 2006 +0000
     1.3 @@ -281,7 +281,7 @@
     1.4      template <class T>
     1.5      struct DefProcessedMapTraits : public Traits {
     1.6        typedef T ProcessedMap;
     1.7 -      static ProcessedMap *createProcessedMap(const Graph &G) 
     1.8 +      static ProcessedMap *createProcessedMap(const Graph &) 
     1.9        {
    1.10  	throw UninitializedParameter();
    1.11        }
     2.1 --- a/lemon/preflow.h	Mon Apr 03 16:03:37 2006 +0000
     2.2 +++ b/lemon/preflow.h	Mon Apr 03 16:05:26 2006 +0000
     2.3 @@ -159,16 +159,16 @@
     2.4      ///Except the graph, all of these parameters can be reset by
     2.5      ///calling \ref source, \ref target, \ref capacityMap and \ref
     2.6      ///flowMap, resp.
     2.7 -      Preflow(const Graph& _gr, Node _s, Node _t, 
     2.8 -	      const CapacityMap& _cap, FlowMap& _f,
     2.9 -	      const Tolerance &_sr=Tolerance()) :
    2.10 +    Preflow(const Graph& _gr, Node _s, Node _t, 
    2.11 +            const CapacityMap& _cap, FlowMap& _f,
    2.12 +            const Tolerance &_sr=Tolerance()) :
    2.13  	_g(&_gr), _source(_s), _target(_t), _capacity(&_cap),
    2.14  	_flow(&_f), _surely(_sr),
    2.15  	_node_num(countNodes(_gr)), level(_gr), excess(_gr,0), 
    2.16  	flow_prop(NO_FLOW), status(AFTER_NOTHING) { 
    2.17  	if ( _source==_target )
    2.18  	  throw InvalidArgument();
    2.19 -      }
    2.20 +    }
    2.21      
    2.22      ///Give a reference to the tolerance handler class
    2.23  
     3.1 --- a/lemon/radix_sort.h	Mon Apr 03 16:03:37 2006 +0000
     3.2 +++ b/lemon/radix_sort.h	Mon Apr 03 16:05:26 2006 +0000
     3.3 @@ -325,8 +325,7 @@
     3.4      Allocator allocator;
     3.5  
     3.6      int length = std::distance(first, last);
     3.7 -    Key* buffer;
     3.8 -    buffer = allocator.allocate(2 * length);
     3.9 +    Key* buffer = allocator.allocate(2 * length);
    3.10      try {
    3.11        bool dir = true;
    3.12        std::copy(first, last, buffer);
    3.13 @@ -364,16 +363,17 @@
    3.14      Allocator allocator;
    3.15  
    3.16      int length = std::distance(first, last);
    3.17 -    Key *buffer;
    3.18 -    buffer = allocator.allocate(2 * length);
    3.19 +    Key *buffer = allocator.allocate(2 * length);
    3.20      try {
    3.21        bool dir = true;
    3.22        std::copy(first, last, buffer);
    3.23        for (int i = 0; i < (int)sizeof(Value); ++i) {
    3.24  	if (dir) {
    3.25 -	  counterIntroSort(buffer, buffer + length, buffer + length, i, functor);
    3.26 +	  counterIntroSort(buffer, buffer + length, 
    3.27 +                           buffer + length, i, functor);
    3.28  	} else {
    3.29 -	  counterIntroSort(buffer + length, buffer + 2 * length, buffer, i, functor);
    3.30 +	  counterIntroSort(buffer + length, buffer + 2 * length, 
    3.31 +                           buffer, i, functor);
    3.32  	}
    3.33  	dir = !dir;
    3.34        }