comparison libinterp/corefcn/bsxfun.cc @ 31607:aac27ad79be6 stable

maint: Re-indent code after switch to using namespace macros. * build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc, __ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc, __pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc, debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc, dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h, oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc, gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc, ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h, octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc, op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h: Re-indent code after switch to using namespace macros.
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 18:02:15 -0800
parents e88a07dec498
children 597f3ee61a48
comparison
equal deleted inserted replaced
31605:e88a07dec498 31607:aac27ad79be6
403 dim_vector dvc; 403 dim_vector dvc;
404 dvc.resize (nd); 404 dvc.resize (nd);
405 405
406 for (octave_idx_type i = 0; i < nd; i++) 406 for (octave_idx_type i = 0; i < nd; i++)
407 dvc(i) = (dva(i) < 1 ? dva(i) 407 dvc(i) = (dva(i) < 1 ? dva(i)
408 : (dvb(i) < 1 ? dvb(i) 408 : (dvb(i) < 1 ? dvb(i)
409 : (dva(i) > dvb(i) ? dva(i) 409 : (dva(i) > dvb(i) ? dva(i)
410 : dvb(i)))); 410 : dvb(i))));
411 411
412 if (dva == dvb || dva.numel () == 1 || dvb.numel () == 1) 412 if (dva == dvb || dva.numel () == 1 || dvb.numel () == 1)
413 { 413 {
414 octave_value_list inputs (2); 414 octave_value_list inputs (2);
415 inputs(0) = A; 415 inputs(0) = A;
510 = tmp(0).float_complex_array_value (); 510 = tmp(0).float_complex_array_value ();
511 result_FloatComplexNDArray.resize (dvc); 511 result_FloatComplexNDArray.resize (dvc);
512 } 512 }
513 } 513 }
514 else if BSXINIT(boolNDArray, "logical", bool) 514 else if BSXINIT(boolNDArray, "logical", bool)
515 else if BSXINIT(int8NDArray, "int8", int8) 515 else if BSXINIT(int8NDArray, "int8", int8)
516 else if BSXINIT(int16NDArray, "int16", int16) 516 else if BSXINIT(int16NDArray, "int16", int16)
517 else if BSXINIT(int32NDArray, "int32", int32) 517 else if BSXINIT(int32NDArray, "int32", int32)
518 else if BSXINIT(int64NDArray, "int64", int64) 518 else if BSXINIT(int64NDArray, "int64", int64)
519 else if BSXINIT(uint8NDArray, "uint8", uint8) 519 else if BSXINIT(uint8NDArray, "uint8", uint8)
520 else if BSXINIT(uint16NDArray, "uint16", uint16) 520 else if BSXINIT(uint16NDArray, "uint16", uint16)
521 else if BSXINIT(uint32NDArray, "uint32", uint32) 521 else if BSXINIT(uint32NDArray, "uint32", uint32)
522 else if BSXINIT(uint64NDArray, "uint64", uint64) 522 else if BSXINIT(uint64NDArray, "uint64", uint64)
523 else 523 else
524 { 524 {
525 C = tmp(0); 525 C = tmp(0);
526 C = C.resize (dvc); 526 C = C.resize (dvc);
527 } 527 }
528 } 528 }
529 else // Skip semi-fast path for sparse matrices 529 else // Skip semi-fast path for sparse matrices
530 { 530 {
531 C = tmp (0); 531 C = tmp (0);
532 C = C.resize (dvc); 532 C = C.resize (dvc);
549 else 549 else
550 { 550 {
551 result_ComplexNDArray 551 result_ComplexNDArray
552 = ComplexNDArray (result_NDArray); 552 = ComplexNDArray (result_NDArray);
553 result_ComplexNDArray.insert 553 result_ComplexNDArray.insert
554 (tmp(0).complex_array_value (), ra_idx); 554 (tmp(0).complex_array_value (), ra_idx);
555 have_NDArray = false; 555 have_NDArray = false;
556 have_ComplexNDArray = true; 556 have_ComplexNDArray = true;
557 } 557 }
558 } 558 }
559 else if (have_FloatNDArray) 559 else if (have_FloatNDArray)
564 C = result_FloatNDArray; 564 C = result_FloatNDArray;
565 C = cat_op (C, tmp(0), ra_idx); 565 C = cat_op (C, tmp(0), ra_idx);
566 } 566 }
567 else if (tmp(0).isreal ()) 567 else if (tmp(0).isreal ())
568 result_FloatNDArray.insert 568 result_FloatNDArray.insert
569 (tmp(0).float_array_value (), ra_idx); 569 (tmp(0).float_array_value (), ra_idx);
570 else 570 else
571 { 571 {
572 result_FloatComplexNDArray 572 result_FloatComplexNDArray
573 = FloatComplexNDArray (result_FloatNDArray); 573 = FloatComplexNDArray (result_FloatNDArray);
574 result_FloatComplexNDArray.insert 574 result_FloatComplexNDArray.insert
575 (tmp(0).float_complex_array_value (), ra_idx); 575 (tmp(0).float_complex_array_value (), ra_idx);
576 have_FloatNDArray = false; 576 have_FloatNDArray = false;
577 have_FloatComplexNDArray = true; 577 have_FloatComplexNDArray = true;
578 } 578 }
579 } 579 }
580 580
590 else \ 590 else \
591 result_ ## T .insert (tmp(0). EXTRACTOR ## _array_value (), ra_idx); \ 591 result_ ## T .insert (tmp(0). EXTRACTOR ## _array_value (), ra_idx); \
592 } 592 }
593 593
594 else if BSXLOOP(ComplexNDArray, "double", complex) 594 else if BSXLOOP(ComplexNDArray, "double", complex)
595 else if BSXLOOP(FloatComplexNDArray, "single", float_complex) 595 else if BSXLOOP(FloatComplexNDArray, "single", float_complex)
596 else if BSXLOOP(boolNDArray, "logical", bool) 596 else if BSXLOOP(boolNDArray, "logical", bool)
597 else if BSXLOOP(int8NDArray, "int8", int8) 597 else if BSXLOOP(int8NDArray, "int8", int8)
598 else if BSXLOOP(int16NDArray, "int16", int16) 598 else if BSXLOOP(int16NDArray, "int16", int16)
599 else if BSXLOOP(int32NDArray, "int32", int32) 599 else if BSXLOOP(int32NDArray, "int32", int32)
600 else if BSXLOOP(int64NDArray, "int64", int64) 600 else if BSXLOOP(int64NDArray, "int64", int64)
601 else if BSXLOOP(uint8NDArray, "uint8", uint8) 601 else if BSXLOOP(uint8NDArray, "uint8", uint8)
602 else if BSXLOOP(uint16NDArray, "uint16", uint16) 602 else if BSXLOOP(uint16NDArray, "uint16", uint16)
603 else if BSXLOOP(uint32NDArray, "uint32", uint32) 603 else if BSXLOOP(uint32NDArray, "uint32", uint32)
604 else if BSXLOOP(uint64NDArray, "uint64", uint64) 604 else if BSXLOOP(uint64NDArray, "uint64", uint64)
605 else 605 else
606 C = cat_op (C, tmp(0), ra_idx); 606 C = cat_op (C, tmp(0), ra_idx);
607 } 607 }
608 } 608 }
609 609
610 #define BSXEND(T) \ 610 #define BSXEND(T) \
611 (have_ ## T) \ 611 (have_ ## T) \
612 retval(0) = result_ ## T; 612 retval(0) = result_ ## T;
613 613
614 if BSXEND(NDArray) 614 if BSXEND(NDArray)
615 else if BSXEND(ComplexNDArray) 615 else if BSXEND(ComplexNDArray)
616 else if BSXEND(FloatNDArray) 616 else if BSXEND(FloatNDArray)
617 else if BSXEND(FloatComplexNDArray) 617 else if BSXEND(FloatComplexNDArray)
618 else if BSXEND(boolNDArray) 618 else if BSXEND(boolNDArray)
619 else if BSXEND(int8NDArray) 619 else if BSXEND(int8NDArray)
620 else if BSXEND(int16NDArray) 620 else if BSXEND(int16NDArray)
621 else if BSXEND(int32NDArray) 621 else if BSXEND(int32NDArray)
622 else if BSXEND(int64NDArray) 622 else if BSXEND(int64NDArray)
623 else if BSXEND(uint8NDArray) 623 else if BSXEND(uint8NDArray)
624 else if BSXEND(uint16NDArray) 624 else if BSXEND(uint16NDArray)
625 else if BSXEND(uint32NDArray) 625 else if BSXEND(uint32NDArray)
626 else if BSXEND(uint64NDArray) 626 else if BSXEND(uint64NDArray)
627 else 627 else
628 retval(0) = C; 628 retval(0) = C;
629 } 629 }
630 } 630 }
631 631
632 return retval; 632 return retval;
633 } 633 }