comparison liboctave/array/CMatrix.cc @ 18882:b314efd58072 gui-release

maint: Periodic merge of stable to gui-release.
author John W. Eaton <jwe@octave.org>
date Thu, 19 Jun 2014 15:51:05 -0400
parents 8e056300994b ff4da3c8ed16
children 479d1d3cb5c3
comparison
equal deleted inserted replaced
18874:e7b5be5a7f80 18882:b314efd58072
2681 // We compute the size of rwork and iwork because ZGELSD in 2681 // We compute the size of rwork and iwork because ZGELSD in
2682 // older versions of LAPACK does not return them on a query 2682 // older versions of LAPACK does not return them on a query
2683 // call. 2683 // call.
2684 double dminmn = static_cast<double> (minmn); 2684 double dminmn = static_cast<double> (minmn);
2685 double dsmlsizp1 = static_cast<double> (smlsiz+1); 2685 double dsmlsizp1 = static_cast<double> (smlsiz+1);
2686 #if defined (HAVE_LOG2) 2686 double tmp = xlog2 (dminmn / dsmlsizp1);
2687 double tmp = log2 (dminmn / dsmlsizp1); 2687
2688 #else
2689 double tmp = log (dminmn / dsmlsizp1) / log (2.0);
2690 #endif
2691 octave_idx_type nlvl = static_cast<octave_idx_type> (tmp) + 1; 2688 octave_idx_type nlvl = static_cast<octave_idx_type> (tmp) + 1;
2692 if (nlvl < 0) 2689 if (nlvl < 0)
2693 nlvl = 0; 2690 nlvl = 0;
2694 2691
2695 octave_idx_type lrwork = minmn*(10 + 2*smlsiz + 8*nlvl) 2692 octave_idx_type lrwork = minmn*(10 + 2*smlsiz + 8*nlvl)
2873 // We compute the size of rwork and iwork because ZGELSD in 2870 // We compute the size of rwork and iwork because ZGELSD in
2874 // older versions of LAPACK does not return them on a query 2871 // older versions of LAPACK does not return them on a query
2875 // call. 2872 // call.
2876 double dminmn = static_cast<double> (minmn); 2873 double dminmn = static_cast<double> (minmn);
2877 double dsmlsizp1 = static_cast<double> (smlsiz+1); 2874 double dsmlsizp1 = static_cast<double> (smlsiz+1);
2878 #if defined (HAVE_LOG2) 2875 double tmp = xlog2 (dminmn / dsmlsizp1);
2879 double tmp = log2 (dminmn / dsmlsizp1); 2876
2880 #else
2881 double tmp = log (dminmn / dsmlsizp1) / log (2.0);
2882 #endif
2883 octave_idx_type nlvl = static_cast<octave_idx_type> (tmp) + 1; 2877 octave_idx_type nlvl = static_cast<octave_idx_type> (tmp) + 1;
2884 if (nlvl < 0) 2878 if (nlvl < 0)
2885 nlvl = 0; 2879 nlvl = 0;
2886 2880
2887 octave_idx_type lrwork = minmn*(10 + 2*smlsiz + 8*nlvl) 2881 octave_idx_type lrwork = minmn*(10 + 2*smlsiz + 8*nlvl)