Mercurial > octave
diff liboctave/array/dSparse.cc @ 21120:499b851fbfae
Replace pattern if/err_XXX/else/code with if/err_XXX/ code.
* schur.cc, ov-complex.h, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.h,
ov-flt-complex.h, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-range.cc,
ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.h, ov-str-mat.cc, ops.h, pt-idx.cc,
Array.cc, CColVector.cc, CMatrix.cc, CRowVector.cc, MSparse.cc, PermMatrix.cc,
Sparse.cc, dColVector.cc, dMatrix.cc, dRowVector.cc, dSparse.cc,
fCColVector.cc, fCMatrix.cc, fCRowVector.cc, fColVector.cc, fMatrix.cc,
fRowVector.cc:
Replace pattern if/err_XXX/else/code with if/err_XXX/ code.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 20 Jan 2016 16:58:59 -0800 |
| parents | 358aa7fcbd33 |
| children | 7cac4e7458f2 |
line wrap: on
line diff
--- a/liboctave/array/dSparse.cc Wed Jan 20 16:10:23 2016 -0800 +++ b/liboctave/array/dSparse.cc Wed Jan 20 16:58:59 2016 -0800 @@ -763,60 +763,58 @@ if (x_nr != y_nr || x_nc != y_nc) err_nonconformant ("atan2", x_nr, x_nc, y_nr, y_nc); - else + + r = SparseMatrix (x_nr, x_nc, (x.nnz () + y.nnz ())); + + octave_idx_type jx = 0; + r.cidx (0) = 0; + for (octave_idx_type i = 0 ; i < x_nc ; i++) { - r = SparseMatrix (x_nr, x_nc, (x.nnz () + y.nnz ())); - - octave_idx_type jx = 0; - r.cidx (0) = 0; - for (octave_idx_type i = 0 ; i < x_nc ; i++) - { - octave_idx_type ja = x.cidx (i); - octave_idx_type ja_max = x.cidx (i+1); - bool ja_lt_max= ja < ja_max; - - octave_idx_type jb = y.cidx (i); - octave_idx_type jb_max = y.cidx (i+1); - bool jb_lt_max = jb < jb_max; - - while (ja_lt_max || jb_lt_max) - { - octave_quit (); - if ((! jb_lt_max) - || (ja_lt_max && (x.ridx (ja) < y.ridx (jb)))) + octave_idx_type ja = x.cidx (i); + octave_idx_type ja_max = x.cidx (i+1); + bool ja_lt_max= ja < ja_max; + + octave_idx_type jb = y.cidx (i); + octave_idx_type jb_max = y.cidx (i+1); + bool jb_lt_max = jb < jb_max; + + while (ja_lt_max || jb_lt_max) + { + octave_quit (); + if ((! jb_lt_max) + || (ja_lt_max && (x.ridx (ja) < y.ridx (jb)))) + { + r.ridx (jx) = x.ridx (ja); + r.data (jx) = atan2 (x.data (ja), 0.); + jx++; + ja++; + ja_lt_max= ja < ja_max; + } + else if ((! ja_lt_max) + || (jb_lt_max && (y.ridx (jb) < x.ridx (ja)))) + { + jb++; + jb_lt_max= jb < jb_max; + } + else + { + double tmp = atan2 (x.data (ja), y.data (jb)); + if (tmp != 0.) { + r.data (jx) = tmp; r.ridx (jx) = x.ridx (ja); - r.data (jx) = atan2 (x.data (ja), 0.); jx++; - ja++; - ja_lt_max= ja < ja_max; } - else if ((! ja_lt_max) - || (jb_lt_max && (y.ridx (jb) < x.ridx (ja)))) - { - jb++; - jb_lt_max= jb < jb_max; - } - else - { - double tmp = atan2 (x.data (ja), y.data (jb)); - if (tmp != 0.) - { - r.data (jx) = tmp; - r.ridx (jx) = x.ridx (ja); - jx++; - } - ja++; - ja_lt_max= ja < ja_max; - jb++; - jb_lt_max= jb < jb_max; - } - } - r.cidx (i+1) = jx; - } - - r.maybe_compress (); + ja++; + ja_lt_max= ja < ja_max; + jb++; + jb_lt_max= jb < jb_max; + } + } + r.cidx (i+1) = jx; } + + r.maybe_compress (); } else (*current_liboctave_error_handler) ("matrix size mismatch");