Mercurial > octave

comparison liboctave/array/idx-vector.cc @ 18084:8e056300994b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Follow coding convention of defining and initializing only 1 variable per line in liboctave. * liboctave/array/Array-b.cc, liboctave/array/Array-util.cc, liboctave/array/Array.cc, liboctave/array/CDiagMatrix.cc, liboctave/array/CMatrix.cc, liboctave/array/CSparse.cc, liboctave/array/MDiagArray2.cc, liboctave/array/MatrixType.cc, liboctave/array/PermMatrix.cc, liboctave/array/Sparse.cc, liboctave/array/Sparse.h, liboctave/array/boolSparse.cc, liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc, liboctave/array/dSparse.cc, liboctave/array/dim-vector.cc, liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc, liboctave/array/fDiagMatrix.cc, liboctave/array/fMatrix.cc, liboctave/array/idx-vector.cc, liboctave/array/idx-vector.h, liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxQR.cc, liboctave/numeric/base-qr.cc, liboctave/numeric/bsxfun-defs.cc, liboctave/numeric/bsxfun.h, liboctave/numeric/dbleLU.cc, liboctave/numeric/dbleQR.cc, liboctave/numeric/fCmplxLU.cc, liboctave/numeric/fCmplxQR.cc, liboctave/numeric/floatLU.cc, liboctave/numeric/floatQR.cc, liboctave/numeric/lo-specfun.cc, liboctave/numeric/oct-convn.cc, liboctave/numeric/oct-norm.cc, liboctave/numeric/sparse-dmsolve.cc, liboctave/operators/mx-inlines.cc, liboctave/operators/mx-op-defs.h, liboctave/util/caseless-str.h, liboctave/util/kpse.cc, liboctave/util/lo-utils.cc, liboctave/util/oct-binmap.h, liboctave/util/oct-cmplx.h, liboctave/util/oct-inttypes.cc, liboctave/util/oct-inttypes.h, liboctave/util/oct-sort.cc: Follow coding convention of defining and initializing only 1 variable per line in liboctave.
author Rik <rik@octave.org>
date Wed, 04 Dec 2013 22:13:18 -0800
parents 938f01339043
children af41e41ad28e
comparison
equal deleted inserted replaced
18083:938f01339043 18084:8e056300994b
593 k += j; 593 k += j;
594 } 594 }
595 595
596 for (octave_idx_type i = 0; i < len; i++) 596 for (octave_idx_type i = 0; i < len; i++)
597 { 597 {
598 octave_idx_type j = data[i], k = cnt[j]++; 598 octave_idx_type j = data[i];
599 octave_idx_type k = cnt[j]++;
599 new_data[k] = j; 600 new_data[k] = j;
600 idx_data[k] = i; 601 idx_data[k] = i;
601 } 602 }
602 } 603 }
603 604
834 835
835 case class_range: 836 case class_range:
836 { 837 {
837 // (i:k:end,:) reduces to a range if i <= k and k divides n. 838 // (i:k:end,:) reduces to a range if i <= k and k divides n.
838 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); 839 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
839 octave_idx_type s = r->get_start (), l = r->length (n); 840 octave_idx_type s = r->get_start ();
841 octave_idx_type l = r->length (n);
840 octave_idx_type t = r->get_step (); 842 octave_idx_type t = r->get_step ();
841 if (l*t == n) 843 if (l*t == n)
842 { 844 {
843 *this = new idx_range_rep (s, l * nj, t, DIRECT); 845 *this = new idx_range_rep (s, l * nj, t, DIRECT);
844 reduced = true; 846 reduced = true;
858 { 860 {
859 // (:,i:j) reduces to a range (the step must be 1) 861 // (:,i:j) reduces to a range (the step must be 1)
860 idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep); 862 idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep);
861 if (rj->get_step () == 1) 863 if (rj->get_step () == 1)
862 { 864 {
863 octave_idx_type sj = rj->get_start (), lj = rj->length (nj); 865 octave_idx_type sj = rj->get_start ();
866 octave_idx_type lj = rj->length (nj);
864 *this = new idx_range_rep (sj * n, lj * n, 1, DIRECT); 867 *this = new idx_range_rep (sj * n, lj * n, 1, DIRECT);
865 reduced = true; 868 reduced = true;
866 } 869 }
867 } 870 }
868 break; 871 break;
871 { 874 {
872 // (k,i:d:j) reduces to a range. 875 // (k,i:d:j) reduces to a range.
873 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); 876 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
874 idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep); 877 idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep);
875 octave_idx_type k = r->get_data (); 878 octave_idx_type k = r->get_data ();
876 octave_idx_type sj = rj->get_start (), lj = rj->length (nj); 879 octave_idx_type sj = rj->get_start ();
880 octave_idx_type lj = rj->length (nj);
877 octave_idx_type tj = rj->get_step (); 881 octave_idx_type tj = rj->get_step ();
878 *this = new idx_range_rep (n * sj + k, lj, n * tj, DIRECT); 882 *this = new idx_range_rep (n * sj + k, lj, n * tj, DIRECT);
879 reduced = true; 883 reduced = true;
880 } 884 }
881 break; 885 break;
883 case class_range: 887 case class_range:
884 { 888 {
885 // (i:k:end,p:q) reduces to a range if i <= k and k divides n. 889 // (i:k:end,p:q) reduces to a range if i <= k and k divides n.
886 // (ones (1, m), ones (1, n)) reduces to (ones (1, m*n)) 890 // (ones (1, m), ones (1, n)) reduces to (ones (1, m*n))
887 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); 891 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
888 octave_idx_type s = r->get_start (), l = r->length (n); 892 octave_idx_type s = r->get_start ();
893 octave_idx_type l = r->length (n);
889 octave_idx_type t = r->get_step (); 894 octave_idx_type t = r->get_step ();
890 idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep); 895 idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep);
891 octave_idx_type sj = rj->get_start (), lj = rj->length (nj); 896 octave_idx_type sj = rj->get_start ();
897 octave_idx_type lj = rj->length (nj);
892 octave_idx_type tj = rj->get_step (); 898 octave_idx_type tj = rj->get_step ();
893 if ((l*t == n && tj == 1) || (t == 0 && tj == 0)) 899 if ((l*t == n && tj == 1) || (t == 0 && tj == 0))
894 { 900 {
895 *this = new idx_range_rep (s + n * sj, l * lj, t, DIRECT); 901 *this = new idx_range_rep (s + n * sj, l * lj, t, DIRECT);
896 reduced = true; 902 reduced = true;
920 case class_range: 926 case class_range:
921 { 927 {
922 // (i:d:j,k) reduces to a range. 928 // (i:d:j,k) reduces to a range.
923 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); 929 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
924 idx_scalar_rep * rj = dynamic_cast<idx_scalar_rep *> (j.rep); 930 idx_scalar_rep * rj = dynamic_cast<idx_scalar_rep *> (j.rep);
925 octave_idx_type s = r->get_start (), l = r->length (nj); 931 octave_idx_type s = r->get_start ();
932 octave_idx_type l = r->length (nj);
926 octave_idx_type t = r->get_step (); 933 octave_idx_type t = r->get_step ();
927 octave_idx_type k = rj->get_data (); 934 octave_idx_type k = rj->get_data ();
928 *this = new idx_range_rep (n * k + s, l, t, DIRECT); 935 *this = new idx_range_rep (n * k + s, l, t, DIRECT);
929 reduced = true; 936 reduced = true;
930 } 937 }
987 break; 994 break;
988 995
989 case class_mask: 996 case class_mask:
990 { 997 {
991 idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); 998 idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep);
992 octave_idx_type ext = r->extent (0), len = r->length (0); 999 octave_idx_type ext = r->extent (0);
1000 octave_idx_type len = r->length (0);
993 if (ext == len) 1001 if (ext == len)
994 { 1002 {
995 l = 0; 1003 l = 0;
996 u = len; 1004 u = len;
997 res = true; 1005 res = true;
1060 break; 1068 break;
1061 1069
1062 case class_range: 1070 case class_range:
1063 { 1071 {
1064 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); 1072 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
1065 octave_idx_type start = r->get_start (), step = r->get_step (); 1073 octave_idx_type start = r->get_start ();
1074 octave_idx_type step = r->get_step ();
1066 octave_idx_type i, j; 1075 octave_idx_type i, j;
1067 if (step == 1) 1076 if (step == 1)
1068 for (i = start, j = start + len; i < j; i++) *data++ = i; 1077 for (i = start, j = start + len; i < j; i++) *data++ = i;
1069 else if (step == -1) 1078 else if (step == -1)
1070 for (i = start, j = start - len; i > j; i--) *data++ = i; 1079 for (i = start, j = start - len; i > j; i--) *data++ = i;
1114 ("internal error: out of range complement index requested"); 1123 ("internal error: out of range complement index requested");
1115 1124
1116 if (idx_class () == class_mask) 1125 if (idx_class () == class_mask)
1117 { 1126 {
1118 idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); 1127 idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep);
1119 octave_idx_type nz = r->length (0), ext = r->extent (0); 1128 octave_idx_type nz = r->length (0);
1129 octave_idx_type ext = r->extent (0);
1120 Array<bool> mask (dim_vector (n, 1)); 1130 Array<bool> mask (dim_vector (n, 1));
1121 const bool *data = r->get_data (); 1131 const bool *data = r->get_data ();
1122 bool *ndata = mask.fortran_vec (); 1132 bool *ndata = mask.fortran_vec ();
1123 for (octave_idx_type i = 0; i < ext; i++) 1133 for (octave_idx_type i = 0; i < ext; i++)
1124 ndata[i] = ! data[i]; 1134 ndata[i] = ! data[i];
1205 { 1215 {
1206 if (idx_class () == class_mask) 1216 if (idx_class () == class_mask)
1207 { 1217 {
1208 idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); 1218 idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep);
1209 const bool *data = r->get_data (); 1219 const bool *data = r->get_data ();
1210 octave_idx_type ext = r->extent (0), len = r->length (0); 1220 octave_idx_type ext = r->extent (0);
1221 octave_idx_type len = r->length (0);
1211 octave_idx_type *idata = new octave_idx_type [len]; 1222 octave_idx_type *idata = new octave_idx_type [len];
1212 1223
1213 for (octave_idx_type i = 0, j = 0; i < ext; i++) 1224 for (octave_idx_type i = 0, j = 0; i < ext; i++)
1214 if (data[i]) 1225 if (data[i])
1215 idata[j++] = i; 1226 idata[j++] = i;