Mercurial > octave-nkf

comparison liboctave/array/fMatrix.cc @ 18884:479d1d3cb5c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Thu, 19 Jun 2014 18:08:00 -0400
parents aa9ca67f09fb b314efd58072
children d20c81d3cd21
comparison
equal deleted inserted replaced
18883:aa9ca67f09fb 18884:479d1d3cb5c3
2338 2338
2339 // We compute the size of iwork because DGELSD in older versions 2339 // We compute the size of iwork because DGELSD in older versions
2340 // of LAPACK does not return it on a query call. 2340 // of LAPACK does not return it on a query call.
2341 float dminmn = static_cast<float> (minmn); 2341 float dminmn = static_cast<float> (minmn);
2342 float dsmlsizp1 = static_cast<float> (smlsiz+1); 2342 float dsmlsizp1 = static_cast<float> (smlsiz+1);
2343 #if defined (HAVE_LOG2) 2343 float tmp = xlog2 (dminmn / dsmlsizp1);
2344 float tmp = log2 (dminmn / dsmlsizp1); 2344
2345 #else
2346 float tmp = log (dminmn / dsmlsizp1) / log (2.0);
2347 #endif
2348 octave_idx_type nlvl = static_cast<octave_idx_type> (tmp) + 1; 2345 octave_idx_type nlvl = static_cast<octave_idx_type> (tmp) + 1;
2349 if (nlvl < 0) 2346 if (nlvl < 0)
2350 nlvl = 0; 2347 nlvl = 0;
2351 2348
2352 octave_idx_type liwork = 3 * minmn * nlvl + 11 * minmn; 2349 octave_idx_type liwork = 3 * minmn * nlvl + 11 * minmn;
2529 2526
2530 // We compute the size of iwork because DGELSD in older versions 2527 // We compute the size of iwork because DGELSD in older versions
2531 // of LAPACK does not return it on a query call. 2528 // of LAPACK does not return it on a query call.
2532 float dminmn = static_cast<float> (minmn); 2529 float dminmn = static_cast<float> (minmn);
2533 float dsmlsizp1 = static_cast<float> (smlsiz+1); 2530 float dsmlsizp1 = static_cast<float> (smlsiz+1);
2534 #if defined (HAVE_LOG2) 2531 float tmp = xlog2 (dminmn / dsmlsizp1);
2535 float tmp = log2 (dminmn / dsmlsizp1); 2532
2536 #else
2537 float tmp = log (dminmn / dsmlsizp1) / log (2.0);
2538 #endif
2539 octave_idx_type nlvl = static_cast<octave_idx_type> (tmp) + 1; 2533 octave_idx_type nlvl = static_cast<octave_idx_type> (tmp) + 1;
2540 if (nlvl < 0) 2534 if (nlvl < 0)
2541 nlvl = 0; 2535 nlvl = 0;
2542 2536
2543 octave_idx_type liwork = 3 * minmn * nlvl + 11 * minmn; 2537 octave_idx_type liwork = 3 * minmn * nlvl + 11 * minmn;