Mercurial > octave
comparison liboctave/array/fDiagMatrix.cc @ 23450:855122b993da
maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
* Canvas.cc, color-picker.cc, dialog.cc, marker.cc, main-window.cc, Cell.cc,
__magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, bsxfun.cc, call-stack.cc,
cellfun.cc, data.cc, defaults.cc, det.cc, eig.cc, error.cc, file-io.cc,
filter.cc, find.cc, gammainc.cc, gcd.cc, gl-render.cc, graphics.cc,
graphics.in.h, help.cc, hex2num.cc, inv.cc, load-save.cc, lookup.cc,
ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, lu.cc, max.cc,
mex.cc, oct-hist.cc, oct-map.cc, oct-procbuf.cc, oct-stream.cc, pr-output.cc,
rand.cc, regexp.cc, schur.cc, str2double.cc, strfns.cc, symtab.cc, sysdep.cc,
tril.cc, variables.cc, xdiv.cc, audiodevinfo.cc, audioread.cc, colamd.cc,
gzip.cc, ov-base-diag.cc, ov-base-mat.h, ov-base-scalar.h, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-range.cc, ov-range.h, ov-struct.cc,
ov-usr-fcn.cc, ov.cc, octave.cc, op-class.cc, pt-eval.cc, pt-funcall.cc,
pt-idx.cc, pt-jit.cc, pt-stmt.cc, version.cc, Array-util.cc, Array.cc,
CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CSparse.cc, Range.cc, Sparse.cc,
chNDArray.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dSparse.cc,
dim-vector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fDiagMatrix.cc,
fMatrix.cc, fNDArray.cc, idx-vector.cc, idx-vector.h, Faddeeva.cc, DASPK.cc,
DASRT.cc, DASSL.cc, EIG.cc, fEIG.cc, gsvd.cc, lo-specfun.cc, oct-rand.cc,
qr.cc, qrp.cc, randgamma.cc, schur.cc, svd.cc, Sparse-diag-op-defs.h,
mx-inlines.cc, oct-env.cc, cmd-edit.cc, kpse.cc, oct-inttypes.h, oct-sort.cc:
Wrap tertiary operator in parentheses "(COND ? x : y)".
author | Rik <rik@octave.org> |
---|---|
date | Thu, 27 Apr 2017 17:33:10 -0700 |
parents | c9fab0bc983e |
children | 8befed6e9ccc |
comparison
equal
deleted
inserted
replaced
23449:c763214a8260 | 23450:855122b993da |
---|---|
290 octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); | 290 octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); |
291 | 291 |
292 FloatDiagMatrix c (a_nr, b_nc); | 292 FloatDiagMatrix c (a_nr, b_nc); |
293 | 293 |
294 octave_idx_type len = c.length (); | 294 octave_idx_type len = c.length (); |
295 octave_idx_type lenm = len < a_nc ? len : a_nc; | 295 octave_idx_type lenm = (len < a_nc ? len : a_nc); |
296 | 296 |
297 for (octave_idx_type i = 0; i < lenm; i++) | 297 for (octave_idx_type i = 0; i < lenm; i++) |
298 c.dgxelem (i) = a.dgelem (i) * b.dgelem (i); | 298 c.dgxelem (i) = a.dgelem (i) * b.dgelem (i); |
299 for (octave_idx_type i = lenm; i < len; i++) | 299 for (octave_idx_type i = lenm; i < len; i++) |
300 c.dgxelem (i) = 0.0f; | 300 c.dgxelem (i) = 0.0f; |