Mercurial > octave-nkf
changeset 18083:938f01339043
maint: Use Octave coding convention for indexing vs. function calls in liboctave/array.
* CMatrix.cc, CSparse.cc, Sparse.cc, dMatrix.cc, dSparse.cc, fCMatrix.cc,
fMatrix.cc, idx-vector.cc: Use Octave coding convention for indexing vs.
function calls in liboctave/array.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 04 Dec 2013 18:56:47 -0800 |
| parents | 35464baa7d99 |
| children | 8e056300994b |
| files | liboctave/array/CMatrix.cc liboctave/array/CSparse.cc liboctave/array/Sparse.cc liboctave/array/dMatrix.cc liboctave/array/dSparse.cc liboctave/array/fCMatrix.cc liboctave/array/fMatrix.cc liboctave/array/idx-vector.cc |
| diffstat | 8 files changed, 60 insertions(+), 60 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/array/CMatrix.cc Wed Dec 04 14:15:01 2013 -0800 +++ b/liboctave/array/CMatrix.cc Wed Dec 04 18:56:47 2013 -0800 @@ -3908,7 +3908,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmin (c, m (i, j)); + result(i, j) = xmin (c, m(i, j)); } return result; @@ -3928,7 +3928,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmin (m (i, j), c); + result(i, j) = xmin (m(i, j), c); } return result; @@ -3957,7 +3957,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - if (std::imag (a (i, j)) != 0.0 || std::imag (b (i, j)) != 0.0) + if (std::imag (a(i, j)) != 0.0 || std::imag (b(i, j)) != 0.0) { columns_are_real_only = 0; break; @@ -3967,14 +3967,14 @@ if (columns_are_real_only) { for (octave_idx_type i = 0; i < nr; i++) - result (i, j) = xmin (std::real (a (i, j)), std::real (b (i, j))); + result(i, j) = xmin (std::real (a(i, j)), std::real (b(i, j))); } else { for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmin (a (i, j), b (i, j)); + result(i, j) = xmin (a(i, j), b(i, j)); } } } @@ -3996,7 +3996,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (c, m (i, j)); + result(i, j) = xmax (c, m(i, j)); } return result; @@ -4016,7 +4016,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (m (i, j), c); + result(i, j) = xmax (m(i, j), c); } return result; @@ -4045,7 +4045,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - if (std::imag (a (i, j)) != 0.0 || std::imag (b (i, j)) != 0.0) + if (std::imag (a(i, j)) != 0.0 || std::imag (b(i, j)) != 0.0) { columns_are_real_only = 0; break; @@ -4057,7 +4057,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (std::real (a (i, j)), std::real (b (i, j))); + result(i, j) = xmax (std::real (a(i, j)), std::real (b(i, j))); } } else @@ -4065,7 +4065,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (a (i, j), b (i, j)); + result(i, j) = xmax (a(i, j), b(i, j)); } } }
--- a/liboctave/array/CSparse.cc Wed Dec 04 14:15:01 2013 -0800 +++ b/liboctave/array/CSparse.cc Wed Dec 04 18:56:47 2013 -0800 @@ -348,7 +348,7 @@ found[i] = 0; for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) if (found[ridx (i)] == -j) found[ridx (i)] = -j - 1; @@ -505,7 +505,7 @@ found[i] = 0; for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) if (found[ridx (i)] == -j) found[ridx (i)] = -j - 1; @@ -4320,7 +4320,7 @@ { for (octave_idx_type i = 0; i < b_nr; i++) - Bx[i] = b (i,j); + Bx[i] = b(i,j); F77_XFCN (zgttrs, ZGTTRS, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5307,7 +5307,7 @@ { for (octave_idx_type i = 0; i < b_nr; i++) - Bx[i] = b (i,j); + Bx[i] = b(i,j); F77_XFCN (zpbtrs, ZPBTRS, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -6589,7 +6589,7 @@ for (octave_idx_type j = 0; j < b_nc; j++) { for (octave_idx_type i = 0; i < b_nr; i++) - Bx[i] = b (i,j); + Bx[i] = b(i,j); status = UMFPACK_ZNAME (solve) (UMFPACK_A, Ap, Ai,
--- a/liboctave/array/Sparse.cc Wed Dec 04 14:15:01 2013 -0800 +++ b/liboctave/array/Sparse.cc Wed Dec 04 18:56:47 2013 -0800 @@ -324,9 +324,9 @@ if (n == 1 && a(0) != T ()) { change_capacity (nzm > 1 ? nzm : 1); - xcidx(0) = 0; - xridx(0) = r(0); - xdata(0) = a(0); + xcidx (0) = 0; + xridx (0) = r(0); + xdata (0) = a(0); for (octave_idx_type j = 0; j < nc; j++) xcidx (j+1) = j >= c(0); @@ -497,8 +497,8 @@ new_nz += rd[i-1] != rd[i]; // Allocate result. change_capacity (nzm > new_nz ? nzm : new_nz); - xcidx(0) = 0; - xcidx(1) = new_nz; + xcidx (0) = 0; + xcidx (1) = new_nz; octave_idx_type *rri = ridx (); T *rrd = data (); @@ -1266,8 +1266,8 @@ else { const Sparse<T> tmp = *this; - octave_idx_type lbi = tmp.cidx(lb); - octave_idx_type ubi = tmp.cidx(ub); + octave_idx_type lbi = tmp.cidx (lb); + octave_idx_type ubi = tmp.cidx (ub); octave_idx_type new_nz = nz - (ubi - lbi); *this = Sparse<T> (nr, nc - (ub - lb), new_nz); @@ -1310,20 +1310,20 @@ tmpl.nnz () + tmpu.nnz ()); for (octave_idx_type j = 0, k = 0; j < nc; j++) { - for (octave_idx_type i = tmpl.cidx(j); i < tmpl.cidx(j+1); + for (octave_idx_type i = tmpl.cidx (j); i < tmpl.cidx (j+1); i++) { - xdata(k) = tmpl.data(i); - xridx(k++) = tmpl.ridx(i); + xdata (k) = tmpl.data (i); + xridx (k++) = tmpl.ridx (i); } - for (octave_idx_type i = tmpu.cidx(j); i < tmpu.cidx(j+1); + for (octave_idx_type i = tmpu.cidx (j); i < tmpu.cidx (j+1); i++) { - xdata(k) = tmpu.data(i); - xridx(k++) = tmpu.ridx(i) + lb; + xdata (k) = tmpu.data (i); + xridx (k++) = tmpu.ridx (i) + lb; } - xcidx(j+1) = k; + xcidx (j+1) = k; } } }
--- a/liboctave/array/dMatrix.cc Wed Dec 04 14:15:01 2013 -0800 +++ b/liboctave/array/dMatrix.cc Wed Dec 04 18:56:47 2013 -0800 @@ -3291,7 +3291,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmin (d, m (i, j)); + result(i, j) = xmin (d, m(i, j)); } return result; @@ -3311,7 +3311,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmin (m (i, j), d); + result(i, j) = xmin (m(i, j), d); } return result; @@ -3338,7 +3338,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmin (a (i, j), b (i, j)); + result(i, j) = xmin (a(i, j), b(i, j)); } return result; @@ -3358,7 +3358,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (d, m (i, j)); + result(i, j) = xmax (d, m(i, j)); } return result; @@ -3378,7 +3378,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (m (i, j), d); + result(i, j) = xmax (m(i, j), d); } return result; @@ -3405,7 +3405,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (a (i, j), b (i, j)); + result(i, j) = xmax (a(i, j), b(i, j)); } return result;
--- a/liboctave/array/dSparse.cc Wed Dec 04 14:15:01 2013 -0800 +++ b/liboctave/array/dSparse.cc Wed Dec 04 18:56:47 2013 -0800 @@ -360,7 +360,7 @@ found[i] = 0; for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) if (found[ridx (i)] == -j) found[ridx (i)] = -j - 1; @@ -511,7 +511,7 @@ found[i] = 0; for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = cidx(j); i < cidx(j+1); i++) + for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) if (found[ridx (i)] == -j) found[ridx (i)] = -j - 1; @@ -4418,7 +4418,7 @@ for (octave_idx_type i = 0; i < b_nr; i++) { - Complex c = b (i,j); + Complex c = b(i,j); Bx[i] = std::real (c); Bz[i] = std::imag (c); } @@ -5175,7 +5175,7 @@ { for (octave_idx_type i = 0; i < b_nr; i++) { - Complex c = b (i,j); + Complex c = b(i,j); Bx[i] = std::real (c); Bz[i] = std::imag (c); } @@ -5325,7 +5325,7 @@ { for (octave_idx_type i = 0; i < nr; i++) { - Complex c = b (i, j); + Complex c = b(i, j); Bx[i] = std::real (c); Bz[i] = std::imag (c); } @@ -5480,7 +5480,7 @@ for (octave_idx_type i = 0; i < b_nr; i++) { - Complex c = b (i,j); + Complex c = b(i,j); Bx[i] = std::real (c); Bz[i] = std::imag (c); } @@ -6496,7 +6496,7 @@ { for (octave_idx_type i = 0; i < b_nr; i++) { - Complex c = b (i,j); + Complex c = b(i,j); Bx[i] = std::real (c); Bz[i] = std::imag (c); } @@ -6751,7 +6751,7 @@ { for (octave_idx_type i = 0; i < b_nr; i++) { - Complex c = b (i,j); + Complex c = b(i,j); Bx[i] = std::real (c); Bz[i] = std::imag (c); }
--- a/liboctave/array/fCMatrix.cc Wed Dec 04 14:15:01 2013 -0800 +++ b/liboctave/array/fCMatrix.cc Wed Dec 04 18:56:47 2013 -0800 @@ -3933,7 +3933,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmin (c, m (i, j)); + result(i, j) = xmin (c, m(i, j)); } return result; @@ -3953,7 +3953,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmin (m (i, j), c); + result(i, j) = xmin (m(i, j), c); } return result; @@ -3982,7 +3982,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - if (std::imag (a (i, j)) != 0.0 || std::imag (b (i, j)) != 0.0) + if (std::imag (a(i, j)) != 0.0 || std::imag (b(i, j)) != 0.0) { columns_are_real_only = 0; break; @@ -3992,14 +3992,14 @@ if (columns_are_real_only) { for (octave_idx_type i = 0; i < nr; i++) - result (i, j) = xmin (std::real (a (i, j)), std::real (b (i, j))); + result(i, j) = xmin (std::real (a(i, j)), std::real (b(i, j))); } else { for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmin (a (i, j), b (i, j)); + result(i, j) = xmin (a(i, j), b(i, j)); } } } @@ -4021,7 +4021,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (c, m (i, j)); + result(i, j) = xmax (c, m(i, j)); } return result; @@ -4041,7 +4041,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (m (i, j), c); + result(i, j) = xmax (m(i, j), c); } return result; @@ -4070,7 +4070,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - if (std::imag (a (i, j)) != 0.0 || std::imag (b (i, j)) != 0.0) + if (std::imag (a(i, j)) != 0.0 || std::imag (b(i, j)) != 0.0) { columns_are_real_only = 0; break; @@ -4082,7 +4082,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (std::real (a (i, j)), std::real (b (i, j))); + result(i, j) = xmax (std::real (a(i, j)), std::real (b(i, j))); } } else @@ -4090,7 +4090,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (a (i, j), b (i, j)); + result(i, j) = xmax (a(i, j), b(i, j)); } } }
--- a/liboctave/array/fMatrix.cc Wed Dec 04 14:15:01 2013 -0800 +++ b/liboctave/array/fMatrix.cc Wed Dec 04 18:56:47 2013 -0800 @@ -3308,7 +3308,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmin (d, m (i, j)); + result(i, j) = xmin (d, m(i, j)); } return result; @@ -3328,7 +3328,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmin (m (i, j), d); + result(i, j) = xmin (m(i, j), d); } return result; @@ -3355,7 +3355,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmin (a (i, j), b (i, j)); + result(i, j) = xmin (a(i, j), b(i, j)); } return result; @@ -3375,7 +3375,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (d, m (i, j)); + result(i, j) = xmax (d, m(i, j)); } return result; @@ -3395,7 +3395,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (m (i, j), d); + result(i, j) = xmax (m(i, j), d); } return result; @@ -3422,7 +3422,7 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result (i, j) = xmax (a (i, j), b (i, j)); + result(i, j) = xmax (a(i, j), b(i, j)); } return result;
--- a/liboctave/array/idx-vector.cc Wed Dec 04 14:15:01 2013 -0800 +++ b/liboctave/array/idx-vector.cc Wed Dec 04 18:56:47 2013 -0800 @@ -440,7 +440,7 @@ octave_idx_type nr = bnda.rows (); for (octave_idx_type j = 0; j < nc; j++) - for (octave_idx_type i = bnda.cidx(j); i < bnda.cidx(j+1); i++) + for (octave_idx_type i = bnda.cidx (j); i < bnda.cidx (j+1); i++) if (bnda.data (i)) d[k++] = j * nr + bnda.ridx (i);