[Lemon-commits] [lemon_svn] deba: r2672 - hugo/trunk/lemon

[Lemon SVN]

Author: deba
Date: Mon Apr  3 18:05:26 2006
New Revision: 2672

Modified:
   hugo/trunk/lemon/bfs.h
   hugo/trunk/lemon/preflow.h
   hugo/trunk/lemon/radix_sort.h

Log:
Small corrections



Modified: hugo/trunk/lemon/bfs.h
==============================================================================
--- hugo/trunk/lemon/bfs.h	(original)
+++ hugo/trunk/lemon/bfs.h	Mon Apr  3 18:05:26 2006
@@ -281,7 +281,7 @@
     template <class T>
     struct DefProcessedMapTraits : public Traits {
       typedef T ProcessedMap;
-      static ProcessedMap *createProcessedMap(const Graph &G) 
+      static ProcessedMap *createProcessedMap(const Graph &) 
       {
 	throw UninitializedParameter();
       }

Modified: hugo/trunk/lemon/preflow.h
==============================================================================
--- hugo/trunk/lemon/preflow.h	(original)
+++ hugo/trunk/lemon/preflow.h	Mon Apr  3 18:05:26 2006
@@ -159,16 +159,16 @@
     ///Except the graph, all of these parameters can be reset by
     ///calling \ref source, \ref target, \ref capacityMap and \ref
     ///flowMap, resp.
-      Preflow(const Graph& _gr, Node _s, Node _t, 
-	      const CapacityMap& _cap, FlowMap& _f,
-	      const Tolerance &_sr=Tolerance()) :
+    Preflow(const Graph& _gr, Node _s, Node _t, 
+            const CapacityMap& _cap, FlowMap& _f,
+            const Tolerance &_sr=Tolerance()) :
 	_g(&_gr), _source(_s), _target(_t), _capacity(&_cap),
 	_flow(&_f), _surely(_sr),
 	_node_num(countNodes(_gr)), level(_gr), excess(_gr,0), 
 	flow_prop(NO_FLOW), status(AFTER_NOTHING) { 
 	if ( _source==_target )
 	  throw InvalidArgument();
-      }
+    }
     
     ///Give a reference to the tolerance handler class
 

Modified: hugo/trunk/lemon/radix_sort.h
==============================================================================
--- hugo/trunk/lemon/radix_sort.h	(original)
+++ hugo/trunk/lemon/radix_sort.h	Mon Apr  3 18:05:26 2006
@@ -325,8 +325,7 @@
     Allocator allocator;
 
     int length = std::distance(first, last);
-    Key* buffer;
-    buffer = allocator.allocate(2 * length);
+    Key* buffer = allocator.allocate(2 * length);
     try {
       bool dir = true;
       std::copy(first, last, buffer);
@@ -364,16 +363,17 @@
     Allocator allocator;
 
     int length = std::distance(first, last);
-    Key *buffer;
-    buffer = allocator.allocate(2 * length);
+    Key *buffer = allocator.allocate(2 * length);
     try {
       bool dir = true;
       std::copy(first, last, buffer);
       for (int i = 0; i < (int)sizeof(Value); ++i) {
 	if (dir) {
-	  counterIntroSort(buffer, buffer + length, buffer + length, i, functor);
+	  counterIntroSort(buffer, buffer + length, 
+                           buffer + length, i, functor);
 	} else {
-	  counterIntroSort(buffer + length, buffer + 2 * length, buffer, i, functor);
+	  counterIntroSort(buffer + length, buffer + 2 * length, 
+                           buffer, i, functor);
 	}
 	dir = !dir;
       }