Mercurial > octave

comparison liboctave/numeric/eigs-base.cc @ 20974:1edf15793cac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use is_empty rather than "numel () == 0" for clarity. * daspk.cc, dasrt.cc, dassl.cc, gl-render.cc, lsode.cc, tril.cc, txt-eng-ft.cc, ov-fcn-inline.cc, ov-java.cc, ov-range.cc, ov-struct.cc, Array.cc, Range.cc, chNDArray.cc, dNDArray.cc, fNDArray.cc, DASPK.cc, DASRT.cc, DASSL.cc, LSODE.cc, eigs-base.cc: Use is_empty rather than "numel () == 0" for clarity.
author Rik <rik@octave.org>
date Wed, 23 Dec 2015 21:46:39 -0800
parents 77f5591878bf
children 7cac4e7458f2
comparison
equal deleted inserted replaced
20973:7af34656efed 20974:1edf15793cac
827 (*current_liboctave_error_handler) 827 (*current_liboctave_error_handler)
828 ("eigs: opts.p must be greater than k and less than n"); 828 ("eigs: opts.p must be greater than k and less than n");
829 return -1; 829 return -1;
830 } 830 }
831 831
832 if (have_b && cholB && permB.numel () != 0) 832 if (have_b && cholB && ! permB.is_empty ())
833 { 833 {
834 // Check the we really have a permutation vector 834 // Check the we really have a permutation vector
835 if (permB.numel () != n) 835 if (permB.numel () != n)
836 { 836 {
837 (*current_liboctave_error_handler) 837 (*current_liboctave_error_handler)
878 note3 = true; 878 note3 = true;
879 if (cholB) 879 if (cholB)
880 { 880 {
881 bt = b; 881 bt = b;
882 b = b.transpose (); 882 b = b.transpose ();
883 if (permB.numel () == 0) 883 if (permB.is_empty ())
884 { 884 {
885 permB = ColumnVector (n); 885 permB = ColumnVector (n);
886 for (octave_idx_type i = 0; i < n; i++) 886 for (octave_idx_type i = 0; i < n; i++)
887 permB(i) = i; 887 permB(i) = i;
888 } 888 }
1151 (*current_liboctave_error_handler) 1151 (*current_liboctave_error_handler)
1152 ("eigs: opts.p must be greater than k and less than n"); 1152 ("eigs: opts.p must be greater than k and less than n");
1153 return -1; 1153 return -1;
1154 } 1154 }
1155 1155
1156 if (have_b && cholB && permB.numel () != 0) 1156 if (have_b && cholB && ! permB.is_empty ())
1157 { 1157 {
1158 // Check the we really have a permutation vector 1158 // Check the we really have a permutation vector
1159 if (permB.numel () != n) 1159 if (permB.numel () != n)
1160 { 1160 {
1161 (*current_liboctave_error_handler) ("eigs: permB vector invalid"); 1161 (*current_liboctave_error_handler) ("eigs: permB vector invalid");
1741 (*current_liboctave_error_handler) 1741 (*current_liboctave_error_handler)
1742 ("eigs: opts.p must be greater than k and less than n"); 1742 ("eigs: opts.p must be greater than k and less than n");
1743 return -1; 1743 return -1;
1744 } 1744 }
1745 1745
1746 if (have_b && cholB && permB.numel () != 0) 1746 if (have_b && cholB && ! permB.is_empty ())
1747 { 1747 {
1748 // Check the we really have a permutation vector 1748 // Check the we really have a permutation vector
1749 if (permB.numel () != n) 1749 if (permB.numel () != n)
1750 { 1750 {
1751 (*current_liboctave_error_handler) 1751 (*current_liboctave_error_handler)
1792 note3 = true; 1792 note3 = true;
1793 if (cholB) 1793 if (cholB)
1794 { 1794 {
1795 bt = b; 1795 bt = b;
1796 b = b.transpose (); 1796 b = b.transpose ();
1797 if (permB.numel () == 0) 1797 if (permB.is_empty ())
1798 { 1798 {
1799 permB = ColumnVector (n); 1799 permB = ColumnVector (n);
1800 for (octave_idx_type i = 0; i < n; i++) 1800 for (octave_idx_type i = 0; i < n; i++)
1801 permB(i) = i; 1801 permB(i) = i;
1802 } 1802 }
2114 (*current_liboctave_error_handler) 2114 (*current_liboctave_error_handler)
2115 ("eigs: opts.p must be greater than k and less than n"); 2115 ("eigs: opts.p must be greater than k and less than n");
2116 return -1; 2116 return -1;
2117 } 2117 }
2118 2118
2119 if (have_b && cholB && permB.numel () != 0) 2119 if (have_b && cholB && ! permB.is_empty ())
2120 { 2120 {
2121 // Check that we really have a permutation vector 2121 // Check that we really have a permutation vector
2122 if (permB.numel () != n) 2122 if (permB.numel () != n)
2123 { 2123 {
2124 (*current_liboctave_error_handler) ("eigs: permB vector invalid"); 2124 (*current_liboctave_error_handler) ("eigs: permB vector invalid");
2809 (*current_liboctave_error_handler) 2809 (*current_liboctave_error_handler)
2810 ("eigs: opts.p must be greater than k and less than n"); 2810 ("eigs: opts.p must be greater than k and less than n");
2811 return -1; 2811 return -1;
2812 } 2812 }
2813 2813
2814 if (have_b && cholB && permB.numel () != 0) 2814 if (have_b && cholB && ! permB.is_empty ())
2815 { 2815 {
2816 // Check the we really have a permutation vector 2816 // Check the we really have a permutation vector
2817 if (permB.numel () != n) 2817 if (permB.numel () != n)
2818 { 2818 {
2819 (*current_liboctave_error_handler) 2819 (*current_liboctave_error_handler)
2860 note3 = true; 2860 note3 = true;
2861 if (cholB) 2861 if (cholB)
2862 { 2862 {
2863 bt = b; 2863 bt = b;
2864 b = b.hermitian (); 2864 b = b.hermitian ();
2865 if (permB.numel () == 0) 2865 if (permB.is_empty ())
2866 { 2866 {
2867 permB = ColumnVector (n); 2867 permB = ColumnVector (n);
2868 for (octave_idx_type i = 0; i < n; i++) 2868 for (octave_idx_type i = 0; i < n; i++)
2869 permB(i) = i; 2869 permB(i) = i;
2870 } 2870 }
3134 (*current_liboctave_error_handler) 3134 (*current_liboctave_error_handler)
3135 ("eigs: opts.p must be greater than k and less than n"); 3135 ("eigs: opts.p must be greater than k and less than n");
3136 return -1; 3136 return -1;
3137 } 3137 }
3138 3138
3139 if (have_b && cholB && permB.numel () != 0) 3139 if (have_b && cholB && ! permB.is_empty ())
3140 { 3140 {
3141 // Check that we really have a permutation vector 3141 // Check that we really have a permutation vector
3142 if (permB.numel () != n) 3142 if (permB.numel () != n)
3143 { 3143 {
3144 (*current_liboctave_error_handler) ("eigs: permB vector invalid"); 3144 (*current_liboctave_error_handler) ("eigs: permB vector invalid");