Ticket #268: ns-vs-fix-b72846480f05.patch

lemon/network_simplex.h

@@ -381 +381 @@
         const double BLOCK_SIZE_FACTOR = 2.0;
         const int MIN_BLOCK_SIZE = 10;
 
-        _block_size = std::max( int(BLOCK_SIZE_FACTOR * sqrt(_arc_num)),
-                                MIN_BLOCK_SIZE );
+        _block_size =
+          std::max( int(BLOCK_SIZE_FACTOR * sqrt(double(_arc_num))),
+                    MIN_BLOCK_SIZE );
       }
 
       // Find next entering arc
@@ -457 +458 @@
         const double MINOR_LIMIT_FACTOR = 0.1;
         const int MIN_MINOR_LIMIT = 3;
 
-        _list_length = std::max( int(LIST_LENGTH_FACTOR * sqrt(_arc_num)),
-                                 MIN_LIST_LENGTH );
-        _minor_limit = std::max( int(MINOR_LIMIT_FACTOR * _list_length),
-                                 MIN_MINOR_LIMIT );
+        _list_length =
+          std::max( int(LIST_LENGTH_FACTOR * sqrt(double(_arc_num))),
+                    MIN_LIST_LENGTH );
+        _minor_limit =
+          std::max( int(MINOR_LIMIT_FACTOR * _list_length),
+                    MIN_MINOR_LIMIT );
         _curr_length = _minor_count = 0;
         _candidates.resize(_list_length);
       }
@@ -577 +580 @@
         const double HEAD_LENGTH_FACTOR = 0.1;
         const int MIN_HEAD_LENGTH = 3;
 
-        _block_size = std::max( int(BLOCK_SIZE_FACTOR * sqrt(_arc_num)),
-                                MIN_BLOCK_SIZE );
-        _head_length = std::max( int(HEAD_LENGTH_FACTOR * _block_size),
-                                 MIN_HEAD_LENGTH );
+        _block_size =
+          std::max( int(BLOCK_SIZE_FACTOR * sqrt(double(_arc_num))),
+                    MIN_BLOCK_SIZE );
+        _head_length =
+          std::max( int(HEAD_LENGTH_FACTOR * _block_size),
+                    MIN_HEAD_LENGTH );
         _candidates.resize(_head_length + _block_size);
         _curr_length = 0;
       }
@@ -1225 +1230 @@
       }
 
       // Store the arcs in a mixed order
-      int k = std::max(int(sqrt(_arc_num)), 10);
+      int k = std::max(int(sqrt(double(_arc_num))), 10);
       int i = 0;
       for (ArcIt e(_graph); e != INVALID; ++e) {
         _arc_ref[i] = e;