Mercurial > octave
diff libinterp/corefcn/dot.cc @ 20556:4bed806ee3d4
eliminate more simple uses of error_state
* daspk.cc, dassl.cc, dot.cc, luinc.cc, sylvester.cc, variables.cc,
__eigs__.cc: Eliminate simple uses of error_state.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 05 Oct 2015 20:21:55 -0400 |
| parents | b2100e1659ac |
| children | 8bb38ba1bad6 |
line wrap: on
line diff
--- a/libinterp/corefcn/dot.cc Mon Oct 05 19:29:36 2015 -0400 +++ b/libinterp/corefcn/dot.cc Mon Oct 05 20:21:55 2015 -0400 @@ -147,7 +147,7 @@ argx = argx.reshape (dimx); dimy = dimy.redim (1); argy = argy.reshape (dimy); - match = ! error_state && (dimx == dimy); + match = dimx == dimy; } if (match) @@ -158,9 +158,7 @@ else dim = args(2).int_value (true) - 1; - if (error_state) - ; - else if (dim < 0) + if (dim < 0) error ("dot: DIM must be a valid dimension"); else { @@ -174,10 +172,10 @@ FloatComplexNDArray y = argy.float_complex_array_value (); get_red_dims (dimx, dimy, dim, dimz, m, n, k); FloatComplexNDArray z (dimz); - if (! error_state) - F77_XFCN (cdotc3, CDOTC3, (m, n, k, - x.data (), y.data (), - z.fortran_vec ())); + + F77_XFCN (cdotc3, CDOTC3, (m, n, k, + x.data (), y.data (), + z.fortran_vec ())); retval = z; } else @@ -186,10 +184,10 @@ ComplexNDArray y = argy.complex_array_value (); get_red_dims (dimx, dimy, dim, dimz, m, n, k); ComplexNDArray z (dimz); - if (! error_state) - F77_XFCN (zdotc3, ZDOTC3, (m, n, k, - x.data (), y.data (), - z.fortran_vec ())); + + F77_XFCN (zdotc3, ZDOTC3, (m, n, k, + x.data (), y.data (), + z.fortran_vec ())); retval = z; } } @@ -201,9 +199,9 @@ FloatNDArray y = argy.float_array_value (); get_red_dims (dimx, dimy, dim, dimz, m, n, k); FloatNDArray z (dimz); - if (! error_state) - F77_XFCN (sdot3, SDOT3, (m, n, k, x.data (), y.data (), - z.fortran_vec ())); + + F77_XFCN (sdot3, SDOT3, (m, n, k, x.data (), y.data (), + z.fortran_vec ())); retval = z; } else @@ -212,9 +210,9 @@ NDArray y = argy.array_value (); get_red_dims (dimx, dimy, dim, dimz, m, n, k); NDArray z (dimz); - if (! error_state) - F77_XFCN (ddot3, DDOT3, (m, n, k, x.data (), y.data (), - z.fortran_vec ())); + + F77_XFCN (ddot3, DDOT3, (m, n, k, x.data (), y.data (), + z.fortran_vec ())); retval = z; } } @@ -224,12 +222,10 @@ octave_value_list tmp; tmp(1) = dim + 1; tmp(0) = do_binary_op (octave_value::op_el_mul, argx, argy); - if (! error_state) - { - tmp = feval ("sum", tmp, 1); - if (! tmp.empty ()) - retval = tmp(0); - } + + tmp = feval ("sum", tmp, 1); + if (! tmp.empty ()) + retval = tmp(0); } } } @@ -341,10 +337,10 @@ FloatComplexNDArray x = argx.float_complex_array_value (); FloatComplexNDArray y = argy.float_complex_array_value (); FloatComplexNDArray z (dimz); - if (! error_state) - F77_XFCN (cmatm3, CMATM3, (m, n, k, np, - x.data (), y.data (), - z.fortran_vec ())); + + F77_XFCN (cmatm3, CMATM3, (m, n, k, np, + x.data (), y.data (), + z.fortran_vec ())); retval = z; } else @@ -352,10 +348,10 @@ ComplexNDArray x = argx.complex_array_value (); ComplexNDArray y = argy.complex_array_value (); ComplexNDArray z (dimz); - if (! error_state) - F77_XFCN (zmatm3, ZMATM3, (m, n, k, np, - x.data (), y.data (), - z.fortran_vec ())); + + F77_XFCN (zmatm3, ZMATM3, (m, n, k, np, + x.data (), y.data (), + z.fortran_vec ())); retval = z; } } @@ -366,10 +362,10 @@ FloatNDArray x = argx.float_array_value (); FloatNDArray y = argy.float_array_value (); FloatNDArray z (dimz); - if (! error_state) - F77_XFCN (smatm3, SMATM3, (m, n, k, np, - x.data (), y.data (), - z.fortran_vec ())); + + F77_XFCN (smatm3, SMATM3, (m, n, k, np, + x.data (), y.data (), + z.fortran_vec ())); retval = z; } else @@ -377,10 +373,10 @@ NDArray x = argx.array_value (); NDArray y = argy.array_value (); NDArray z (dimz); - if (! error_state) - F77_XFCN (dmatm3, DMATM3, (m, n, k, np, - x.data (), y.data (), - z.fortran_vec ())); + + F77_XFCN (dmatm3, DMATM3, (m, n, k, np, + x.data (), y.data (), + z.fortran_vec ())); retval = z; } }