Mercurial > octave
diff liboctave/array/fRowVector.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 | e39e05d90788 |
| children | 7cac4e7458f2 |
line wrap: on
line diff
--- a/liboctave/array/fRowVector.cc Wed Jan 20 16:10:23 2016 -0800 +++ b/liboctave/array/fRowVector.cc Wed Jan 20 16:58:59 2016 -0800 @@ -201,24 +201,22 @@ if (a_nr != len) err_nonconformant ("operator *", 1, len, a_nr, a_nc); + + if (len == 0) + retval.resize (a_nc, 0.0); else { - if (len == 0) - retval.resize (a_nc, 0.0); - else - { - // Transpose A to form A'*x == (x'*A)' + // Transpose A to form A'*x == (x'*A)' - octave_idx_type ld = a_nr; + octave_idx_type ld = a_nr; - retval.resize (a_nc); - float *y = retval.fortran_vec (); + retval.resize (a_nc); + float *y = retval.fortran_vec (); - F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 ("T", 1), - a_nr, a_nc, 1.0, a.data (), - ld, v.data (), 1, 0.0, y, 1 - F77_CHAR_ARG_LEN (1))); - } + F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 ("T", 1), + a_nr, a_nc, 1.0, a.data (), + ld, v.data (), 1, 0.0, y, 1 + F77_CHAR_ARG_LEN (1))); } return retval; @@ -324,7 +322,8 @@ if (len != a_len) err_nonconformant ("operator *", len, a_len); - else if (len != 0) + + if (len != 0) F77_FUNC (xsdot, XSDOT) (len, v.data (), 1, a.data (), 1, retval); return retval;