Mercurial > hg > octave-nkf
diff src/sparse-xpow.cc @ 11586:12df7854fa7c
strip trailing whitespace from source files
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 20 Jan 2011 17:24:59 -0500 |
parents | fd0a3ac60b0e |
children | 1bf8c244040a |
line wrap: on
line diff
--- a/src/sparse-xpow.cc +++ b/src/sparse-xpow.cc @@ -301,7 +301,7 @@ octave_value elem_xpow (const SparseMatrix& a, double b) { - // FIXME What should a .^ 0 give?? Matlab gives a + // FIXME What should a .^ 0 give?? Matlab gives a // sparse matrix with same structure as a, which is strictly // incorrect. Keep compatiability. @@ -326,9 +326,9 @@ for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { octave_quit (); - + Complex atmp (a.data (i)); - + result (a.ridx(i), j) = std::pow (atmp, btmp); } @@ -452,7 +452,7 @@ for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { octave_quit (); - result.xelem(a.ridx(i), j) = std::pow (a.data(i), + result.xelem(a.ridx(i), j) = std::pow (a.data(i), b (a.ridx(i), j)); } } @@ -476,13 +476,13 @@ { octave_idx_type nz = a.nnz (); SparseComplexMatrix result (a); - + for (octave_idx_type i = 0; i < nz; i++) { octave_quit (); result.data (i) = std::pow (Complex (a.data (i)), b); } - + result.maybe_compress (true); retval = result; @@ -584,7 +584,7 @@ for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { octave_quit (); - result (a.ridx(i), j) = + result (a.ridx(i), j) = std::pow (a.data (i), static_cast<int> (b)); } } @@ -596,7 +596,7 @@ octave_quit (); result (a.ridx(i), j) = std::pow (a.data (i), b); } - } + } retval = result; } @@ -605,7 +605,7 @@ octave_idx_type nz = a.nnz (); SparseComplexMatrix result (a); - + if (xisint (b)) { for (octave_idx_type i = 0; i < nz; i++) @@ -621,7 +621,7 @@ octave_quit (); result.data (i) = std::pow (a.data (i), b); } - } + } result.maybe_compress (true); @@ -657,7 +657,7 @@ Complex tmp; if (xisint (btmp)) - result.xelem(a.ridx(i), j) = std::pow (a.data (i), + result.xelem(a.ridx(i), j) = std::pow (a.data (i), static_cast<int> (btmp)); else result.xelem(a.ridx(i), j) = std::pow (a.data (i), btmp); @@ -692,7 +692,7 @@ } result.maybe_compress (true); - + retval = result; } @@ -716,7 +716,7 @@ } SparseComplexMatrix result (nr, nc, Complex(1.0, 0.0)); - for (octave_idx_type j = 0; j < nc; j++) + for (octave_idx_type j = 0; j < nc; j++) { for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) {