Changes in lemon/network_simplex.h [660:b1811c363299:665:b95898314e09] in lemon
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/network_simplex.h
r660 r665 382 382 const int MIN_BLOCK_SIZE = 10; 383 383 384 _block_size = std::max( int(BLOCK_SIZE_FACTOR * sqrt(_arc_num)), 384 _block_size = std::max( int(BLOCK_SIZE_FACTOR * 385 std::sqrt(double(_arc_num))), 385 386 MIN_BLOCK_SIZE ); 386 387 } … … 458 459 const int MIN_MINOR_LIMIT = 3; 459 460 460 _list_length = std::max( int(LIST_LENGTH_FACTOR * sqrt(_arc_num)), 461 _list_length = std::max( int(LIST_LENGTH_FACTOR * 462 std::sqrt(double(_arc_num))), 461 463 MIN_LIST_LENGTH ); 462 464 _minor_limit = std::max( int(MINOR_LIMIT_FACTOR * _list_length), … … 578 580 const int MIN_HEAD_LENGTH = 3; 579 581 580 _block_size = std::max( int(BLOCK_SIZE_FACTOR * sqrt(_arc_num)), 582 _block_size = std::max( int(BLOCK_SIZE_FACTOR * 583 std::sqrt(double(_arc_num))), 581 584 MIN_BLOCK_SIZE ); 582 585 _head_length = std::max( int(HEAD_LENGTH_FACTOR * _block_size), … … 1227 1230 1228 1231 // Store the arcs in a mixed order 1229 int k = std::max(int(s qrt(_arc_num)), 10);1232 int k = std::max(int(std::sqrt(double(_arc_num))), 10); 1230 1233 int i = 0; 1231 1234 for (ArcIt e(_graph); e != INVALID; ++e) {
Note: See TracChangeset
for help on using the changeset viewer.