comparison libinterp/corefcn/dot.cc @ 20253:b2100e1659ac

maint: Use cuddled parentheses when indexing dimension_vectors. * libinterp/corefcn/besselj.cc, libinterp/corefcn/bsxfun.cc, libinterp/corefcn/data.cc, libinterp/corefcn/dot.cc, libinterp/corefcn/fft.cc, libinterp/corefcn/fft2.cc, libinterp/corefcn/tril.cc, libinterp/corefcn/typecast.cc, libinterp/octave-value/ov-base-int.cc, libinterp/octave-value/ov-base-mat.cc, libinterp/octave-value/ov-base-sparse.cc, libinterp/octave-value/ov-bool-mat.cc, libinterp/octave-value/ov-cell.cc, libinterp/octave-value/ov-cx-mat.cc, libinterp/octave-value/ov-flt-cx-mat.cc, libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-lazy-idx.cc, libinterp/octave-value/ov-re-mat.cc, libinterp/octave-value/ov-str-mat.cc, libinterp/octave-value/ov-struct.cc, liboctave/array/Array-util.cc, liboctave/array/Array.cc, liboctave/array/CMatrix.cc, liboctave/array/CNDArray.cc, liboctave/array/MArray.cc, liboctave/array/Sparse.cc, liboctave/array/dMatrix.cc, liboctave/array/dNDArray.cc, liboctave/array/fCMatrix.cc, liboctave/array/fCNDArray.cc, liboctave/array/fMatrix.cc, liboctave/array/fNDArray.cc, liboctave/operators/mx-inlines.cc: maint: Use cuddled parentheses when indexing dimension_vectors.
author Rik <rik@octave.org>
date Sat, 23 May 2015 21:46:44 -0700
parents 4f45eaf83908
children 4bed806ee3d4
comparison
equal deleted inserted replaced
20252:b5d2f6954c48 20253:b2100e1659ac
171 if (argx.is_single_type () || argy.is_single_type ()) 171 if (argx.is_single_type () || argy.is_single_type ())
172 { 172 {
173 FloatComplexNDArray x = argx.float_complex_array_value (); 173 FloatComplexNDArray x = argx.float_complex_array_value ();
174 FloatComplexNDArray y = argy.float_complex_array_value (); 174 FloatComplexNDArray y = argy.float_complex_array_value ();
175 get_red_dims (dimx, dimy, dim, dimz, m, n, k); 175 get_red_dims (dimx, dimy, dim, dimz, m, n, k);
176 FloatComplexNDArray z(dimz); 176 FloatComplexNDArray z (dimz);
177 if (! error_state) 177 if (! error_state)
178 F77_XFCN (cdotc3, CDOTC3, (m, n, k, 178 F77_XFCN (cdotc3, CDOTC3, (m, n, k,
179 x.data (), y.data (), 179 x.data (), y.data (),
180 z.fortran_vec ())); 180 z.fortran_vec ()));
181 retval = z; 181 retval = z;
183 else 183 else
184 { 184 {
185 ComplexNDArray x = argx.complex_array_value (); 185 ComplexNDArray x = argx.complex_array_value ();
186 ComplexNDArray y = argy.complex_array_value (); 186 ComplexNDArray y = argy.complex_array_value ();
187 get_red_dims (dimx, dimy, dim, dimz, m, n, k); 187 get_red_dims (dimx, dimy, dim, dimz, m, n, k);
188 ComplexNDArray z(dimz); 188 ComplexNDArray z (dimz);
189 if (! error_state) 189 if (! error_state)
190 F77_XFCN (zdotc3, ZDOTC3, (m, n, k, 190 F77_XFCN (zdotc3, ZDOTC3, (m, n, k,
191 x.data (), y.data (), 191 x.data (), y.data (),
192 z.fortran_vec ())); 192 z.fortran_vec ()));
193 retval = z; 193 retval = z;
198 if (argx.is_single_type () || argy.is_single_type ()) 198 if (argx.is_single_type () || argy.is_single_type ())
199 { 199 {
200 FloatNDArray x = argx.float_array_value (); 200 FloatNDArray x = argx.float_array_value ();
201 FloatNDArray y = argy.float_array_value (); 201 FloatNDArray y = argy.float_array_value ();
202 get_red_dims (dimx, dimy, dim, dimz, m, n, k); 202 get_red_dims (dimx, dimy, dim, dimz, m, n, k);
203 FloatNDArray z(dimz); 203 FloatNDArray z (dimz);
204 if (! error_state) 204 if (! error_state)
205 F77_XFCN (sdot3, SDOT3, (m, n, k, x.data (), y.data (), 205 F77_XFCN (sdot3, SDOT3, (m, n, k, x.data (), y.data (),
206 z.fortran_vec ())); 206 z.fortran_vec ()));
207 retval = z; 207 retval = z;
208 } 208 }
209 else 209 else
210 { 210 {
211 NDArray x = argx.array_value (); 211 NDArray x = argx.array_value ();
212 NDArray y = argy.array_value (); 212 NDArray y = argy.array_value ();
213 get_red_dims (dimx, dimy, dim, dimz, m, n, k); 213 get_red_dims (dimx, dimy, dim, dimz, m, n, k);
214 NDArray z(dimz); 214 NDArray z (dimz);
215 if (! error_state) 215 if (! error_state)
216 F77_XFCN (ddot3, DDOT3, (m, n, k, x.data (), y.data (), 216 F77_XFCN (ddot3, DDOT3, (m, n, k, x.data (), y.data (),
217 z.fortran_vec ())); 217 z.fortran_vec ()));
218 retval = z; 218 retval = z;
219 } 219 }
338 { 338 {
339 if (argx.is_single_type () || argy.is_single_type ()) 339 if (argx.is_single_type () || argy.is_single_type ())
340 { 340 {
341 FloatComplexNDArray x = argx.float_complex_array_value (); 341 FloatComplexNDArray x = argx.float_complex_array_value ();
342 FloatComplexNDArray y = argy.float_complex_array_value (); 342 FloatComplexNDArray y = argy.float_complex_array_value ();
343 FloatComplexNDArray z(dimz); 343 FloatComplexNDArray z (dimz);
344 if (! error_state) 344 if (! error_state)
345 F77_XFCN (cmatm3, CMATM3, (m, n, k, np, 345 F77_XFCN (cmatm3, CMATM3, (m, n, k, np,
346 x.data (), y.data (), 346 x.data (), y.data (),
347 z.fortran_vec ())); 347 z.fortran_vec ()));
348 retval = z; 348 retval = z;
349 } 349 }
350 else 350 else
351 { 351 {
352 ComplexNDArray x = argx.complex_array_value (); 352 ComplexNDArray x = argx.complex_array_value ();
353 ComplexNDArray y = argy.complex_array_value (); 353 ComplexNDArray y = argy.complex_array_value ();
354 ComplexNDArray z(dimz); 354 ComplexNDArray z (dimz);
355 if (! error_state) 355 if (! error_state)
356 F77_XFCN (zmatm3, ZMATM3, (m, n, k, np, 356 F77_XFCN (zmatm3, ZMATM3, (m, n, k, np,
357 x.data (), y.data (), 357 x.data (), y.data (),
358 z.fortran_vec ())); 358 z.fortran_vec ()));
359 retval = z; 359 retval = z;
363 { 363 {
364 if (argx.is_single_type () || argy.is_single_type ()) 364 if (argx.is_single_type () || argy.is_single_type ())
365 { 365 {
366 FloatNDArray x = argx.float_array_value (); 366 FloatNDArray x = argx.float_array_value ();
367 FloatNDArray y = argy.float_array_value (); 367 FloatNDArray y = argy.float_array_value ();
368 FloatNDArray z(dimz); 368 FloatNDArray z (dimz);
369 if (! error_state) 369 if (! error_state)
370 F77_XFCN (smatm3, SMATM3, (m, n, k, np, 370 F77_XFCN (smatm3, SMATM3, (m, n, k, np,
371 x.data (), y.data (), 371 x.data (), y.data (),
372 z.fortran_vec ())); 372 z.fortran_vec ()));
373 retval = z; 373 retval = z;
374 } 374 }
375 else 375 else
376 { 376 {
377 NDArray x = argx.array_value (); 377 NDArray x = argx.array_value ();
378 NDArray y = argy.array_value (); 378 NDArray y = argy.array_value ();
379 NDArray z(dimz); 379 NDArray z (dimz);
380 if (! error_state) 380 if (! error_state)
381 F77_XFCN (dmatm3, DMATM3, (m, n, k, np, 381 F77_XFCN (dmatm3, DMATM3, (m, n, k, np,
382 x.data (), y.data (), 382 x.data (), y.data (),
383 z.fortran_vec ())); 383 z.fortran_vec ()));
384 retval = z; 384 retval = z;