Mercurial > jwe > octave

comparison liboctave/array/fColVector.cc @ 21120:499b851fbfae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
21119:90cd0f9442d5 21120:499b851fbfae
203 203
204 octave_idx_type a_len = a.numel (); 204 octave_idx_type a_len = a.numel ();
205 205
206 if (nc != a_len) 206 if (nc != a_len)
207 err_nonconformant ("operator *", nr, nc, a_len, 1); 207 err_nonconformant ("operator *", nr, nc, a_len, 1);
208 else 208
209 { 209 retval.clear (nr);
210 retval.clear (nr); 210
211 211 if (nr != 0)
212 if (nr != 0) 212 {
213 if (nc == 0)
214 retval.fill (0.0);
215 else
213 { 216 {
214 if (nc == 0) 217 float *y = retval.fortran_vec ();
215 retval.fill (0.0); 218
216 else 219 F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 ("N", 1),
217 { 220 nr, nc, 1.0f, m.data (), nr,
218 float *y = retval.fortran_vec (); 221 a.data (), 1, 0.0f, y, 1
219 222 F77_CHAR_ARG_LEN (1)));
220 F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 ("N", 1),
221 nr, nc, 1.0f, m.data (), nr,
222 a.data (), 1, 0.0f, y, 1
223 F77_CHAR_ARG_LEN (1)));
224 }
225 } 223 }
226 } 224 }
227 225
228 return retval; 226 return retval;
229 } 227 }
240 238
241 octave_idx_type a_len = a.numel (); 239 octave_idx_type a_len = a.numel ();
242 240
243 if (nc != a_len) 241 if (nc != a_len)
244 err_nonconformant ("operator *", nr, nc, a_len, 1); 242 err_nonconformant ("operator *", nr, nc, a_len, 1);
243
244 if (nr == 0 || nc == 0)
245 retval.resize (nr, 0.0);
245 else 246 else
246 { 247 {
247 if (nr == 0 || nc == 0) 248 retval.resize (nr);
248 retval.resize (nr, 0.0); 249
249 else 250 for (octave_idx_type i = 0; i < a_len; i++)
250 { 251 retval.elem (i) = a.elem (i) * m.elem (i, i);
251 retval.resize (nr); 252
252 253 for (octave_idx_type i = a_len; i < nr; i++)
253 for (octave_idx_type i = 0; i < a_len; i++) 254 retval.elem (i) = 0.0;
254 retval.elem (i) = a.elem (i) * m.elem (i, i);
255
256 for (octave_idx_type i = a_len; i < nr; i++)
257 retval.elem (i) = 0.0;
258 }
259 } 255 }
260 256
261 return retval; 257 return retval;
262 } 258 }
263 259