Mercurial > octave-nkf

comparison libinterp/corefcn/bsxfun.cc @ 17787:175b392e91fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use GNU style coding conventions for code in libinterp/ * libinterp/corefcn/Cell.h, libinterp/corefcn/__contourc__.cc, libinterp/corefcn/__dispatch__.cc, libinterp/corefcn/__lin_interpn__.cc, libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc, libinterp/corefcn/balance.cc, libinterp/corefcn/besselj.cc, libinterp/corefcn/betainc.cc, libinterp/corefcn/bitfcns.cc, libinterp/corefcn/bsxfun.cc, libinterp/corefcn/c-file-ptr-stream.cc, libinterp/corefcn/c-file-ptr-stream.h, libinterp/corefcn/cellfun.cc, libinterp/corefcn/colloc.cc, libinterp/corefcn/comment-list.h, libinterp/corefcn/conv2.cc, libinterp/corefcn/daspk.cc, libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc, libinterp/corefcn/data.cc, libinterp/corefcn/debug.cc, libinterp/corefcn/defaults.cc, libinterp/corefcn/defaults.in.h, libinterp/corefcn/defun-int.h, libinterp/corefcn/defun.cc, libinterp/corefcn/det.cc, libinterp/corefcn/dirfns.cc, libinterp/corefcn/display.cc, libinterp/corefcn/dlmread.cc, libinterp/corefcn/dot.cc, libinterp/corefcn/dynamic-ld.cc, libinterp/corefcn/dynamic-ld.h, libinterp/corefcn/eig.cc, libinterp/corefcn/ellipj.cc, libinterp/corefcn/error.cc, libinterp/corefcn/error.h, libinterp/corefcn/event-queue.h, libinterp/corefcn/fft.cc, libinterp/corefcn/fft2.cc, libinterp/corefcn/fftn.cc, libinterp/corefcn/file-io.cc, libinterp/corefcn/filter.cc, libinterp/corefcn/find.cc, libinterp/corefcn/gammainc.cc, libinterp/corefcn/gcd.cc, libinterp/corefcn/getgrent.cc, libinterp/corefcn/getpwent.cc, libinterp/corefcn/getrusage.cc, libinterp/corefcn/givens.cc, libinterp/corefcn/gl-render.cc, libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/gl2ps-renderer.h, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/gripes.cc, libinterp/corefcn/gripes.h, libinterp/corefcn/help.cc, libinterp/corefcn/hess.cc, libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc, libinterp/corefcn/input.h, libinterp/corefcn/inv.cc, libinterp/corefcn/jit-ir.h, libinterp/corefcn/jit-typeinfo.cc, libinterp/corefcn/jit-typeinfo.h, libinterp/corefcn/jit-util.h, libinterp/corefcn/kron.cc, libinterp/corefcn/load-path.cc, libinterp/corefcn/load-path.h, libinterp/corefcn/load-save.cc, libinterp/corefcn/load-save.h, libinterp/corefcn/lookup.cc, libinterp/corefcn/ls-ascii-helper.cc, libinterp/corefcn/ls-hdf5.cc, libinterp/corefcn/ls-hdf5.h, libinterp/corefcn/ls-mat-ascii.cc, libinterp/corefcn/ls-mat-ascii.h, libinterp/corefcn/ls-mat4.cc, libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/ls-mat5.h, libinterp/corefcn/ls-oct-ascii.cc, libinterp/corefcn/lsode.cc, libinterp/corefcn/lu.cc, libinterp/corefcn/luinc.cc, libinterp/corefcn/mappers.cc, libinterp/corefcn/matrix_type.cc, libinterp/corefcn/max.cc, libinterp/corefcn/md5sum.cc, libinterp/corefcn/mex.cc, libinterp/corefcn/mexproto.h, libinterp/corefcn/mgorth.cc, libinterp/corefcn/mxarray.in.h, libinterp/corefcn/nproc.cc, libinterp/corefcn/oct-hist.cc, libinterp/corefcn/oct-lvalue.h, libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-map.h, libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-prcstrm.h, libinterp/corefcn/oct-stdstrm.h, libinterp/corefcn/oct-stream.cc, libinterp/corefcn/oct-stream.h, libinterp/corefcn/octave-link.cc, libinterp/corefcn/octave-link.h, libinterp/corefcn/pager.cc, libinterp/corefcn/pinv.cc, libinterp/corefcn/pr-output.cc, libinterp/corefcn/procstream.h, libinterp/corefcn/profiler.cc, libinterp/corefcn/pt-jit.cc, libinterp/corefcn/pt-jit.h, libinterp/corefcn/quad.cc, libinterp/corefcn/quadcc.cc, libinterp/corefcn/qz.cc, libinterp/corefcn/rand.cc, libinterp/corefcn/rcond.cc, libinterp/corefcn/regexp.cc, libinterp/corefcn/schur.cc, libinterp/corefcn/sighandlers.cc, libinterp/corefcn/sighandlers.h, libinterp/corefcn/sparse-xdiv.cc, libinterp/corefcn/sparse-xdiv.h, libinterp/corefcn/sparse-xpow.cc, libinterp/corefcn/sparse.cc, libinterp/corefcn/spparms.cc, libinterp/corefcn/sqrtm.cc, libinterp/corefcn/str2double.cc, libinterp/corefcn/strfind.cc, libinterp/corefcn/strfns.cc, libinterp/corefcn/sub2ind.cc, libinterp/corefcn/svd.cc, libinterp/corefcn/syl.cc, libinterp/corefcn/symtab.cc, libinterp/corefcn/symtab.h, libinterp/corefcn/syscalls.cc, libinterp/corefcn/sysdep.cc, libinterp/corefcn/sysdep.h, libinterp/corefcn/time.cc, libinterp/corefcn/toplev.cc, libinterp/corefcn/toplev.h, libinterp/corefcn/tril.cc, libinterp/corefcn/txt-eng-ft.cc, libinterp/corefcn/txt-eng-ft.h, libinterp/corefcn/txt-eng.h, libinterp/corefcn/typecast.cc, libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc, libinterp/corefcn/variables.cc, libinterp/corefcn/variables.h, libinterp/corefcn/xdiv.cc, libinterp/corefcn/xdiv.h, libinterp/corefcn/xnorm.h, libinterp/corefcn/xpow.cc, libinterp/corefcn/xpow.h, libinterp/corefcn/zfstream.cc, libinterp/corefcn/zfstream.h, libinterp/dldfcn/__delaunayn__.cc, libinterp/dldfcn/__dsearchn__.cc, libinterp/dldfcn/__eigs__.cc, libinterp/dldfcn/__fltk_uigetfile__.cc, libinterp/dldfcn/__glpk__.cc, libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__init_gnuplot__.cc, libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/__voronoi__.cc, libinterp/dldfcn/amd.cc, libinterp/dldfcn/ccolamd.cc, libinterp/dldfcn/chol.cc, libinterp/dldfcn/colamd.cc, libinterp/dldfcn/convhulln.cc, libinterp/dldfcn/dmperm.cc, libinterp/dldfcn/fftw.cc, libinterp/dldfcn/qr.cc, libinterp/dldfcn/symbfact.cc, libinterp/dldfcn/symrcm.cc, libinterp/dldfcn/tsearch.cc, libinterp/octave-value/ov-base-diag.cc, libinterp/octave-value/ov-base-diag.h, libinterp/octave-value/ov-base-int.cc, libinterp/octave-value/ov-base-int.h, libinterp/octave-value/ov-base-mat.h, libinterp/octave-value/ov-base-scalar.cc, libinterp/octave-value/ov-base-scalar.h, libinterp/octave-value/ov-base-sparse.cc, libinterp/octave-value/ov-base-sparse.h, libinterp/octave-value/ov-base.cc, libinterp/octave-value/ov-base.h, libinterp/octave-value/ov-bool-mat.cc, libinterp/octave-value/ov-bool-mat.h, libinterp/octave-value/ov-bool-sparse.cc, libinterp/octave-value/ov-bool-sparse.h, libinterp/octave-value/ov-bool.cc, libinterp/octave-value/ov-bool.h, libinterp/octave-value/ov-builtin.cc, libinterp/octave-value/ov-builtin.h, libinterp/octave-value/ov-cell.cc, libinterp/octave-value/ov-cell.h, libinterp/octave-value/ov-ch-mat.cc, libinterp/octave-value/ov-ch-mat.h, libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-class.h, libinterp/octave-value/ov-colon.h, libinterp/octave-value/ov-complex.cc, libinterp/octave-value/ov-complex.h, libinterp/octave-value/ov-cx-diag.cc, libinterp/octave-value/ov-cx-diag.h, libinterp/octave-value/ov-cx-mat.cc, libinterp/octave-value/ov-cx-mat.h, libinterp/octave-value/ov-cx-sparse.cc, libinterp/octave-value/ov-cx-sparse.h, libinterp/octave-value/ov-dld-fcn.h, libinterp/octave-value/ov-fcn-handle.cc, libinterp/octave-value/ov-fcn-handle.h, libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-fcn-inline.h, libinterp/octave-value/ov-fcn.h, libinterp/octave-value/ov-float.cc, libinterp/octave-value/ov-float.h, libinterp/octave-value/ov-flt-complex.cc, libinterp/octave-value/ov-flt-complex.h, libinterp/octave-value/ov-flt-cx-diag.cc, libinterp/octave-value/ov-flt-cx-diag.h, libinterp/octave-value/ov-flt-cx-mat.cc, libinterp/octave-value/ov-flt-cx-mat.h, libinterp/octave-value/ov-flt-re-diag.cc, libinterp/octave-value/ov-flt-re-diag.h, libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-flt-re-mat.h, libinterp/octave-value/ov-int16.cc, libinterp/octave-value/ov-int32.cc, libinterp/octave-value/ov-int64.cc, libinterp/octave-value/ov-int8.cc, libinterp/octave-value/ov-intx.h, libinterp/octave-value/ov-java.cc, libinterp/octave-value/ov-lazy-idx.h, libinterp/octave-value/ov-mex-fcn.cc, libinterp/octave-value/ov-mex-fcn.h, libinterp/octave-value/ov-null-mat.cc, libinterp/octave-value/ov-null-mat.h, libinterp/octave-value/ov-oncleanup.cc, libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-perm.h, libinterp/octave-value/ov-range.cc, libinterp/octave-value/ov-range.h, libinterp/octave-value/ov-re-diag.cc, libinterp/octave-value/ov-re-diag.h, libinterp/octave-value/ov-re-mat.cc, libinterp/octave-value/ov-re-mat.h, libinterp/octave-value/ov-re-sparse.cc, libinterp/octave-value/ov-re-sparse.h, libinterp/octave-value/ov-scalar.cc, libinterp/octave-value/ov-scalar.h, libinterp/octave-value/ov-str-mat.cc, libinterp/octave-value/ov-str-mat.h, libinterp/octave-value/ov-struct.cc, libinterp/octave-value/ov-struct.h, libinterp/octave-value/ov-type-conv.h, libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov-typeinfo.h, libinterp/octave-value/ov-uint16.cc, libinterp/octave-value/ov-uint32.cc, libinterp/octave-value/ov-uint64.cc, libinterp/octave-value/ov-uint8.cc, libinterp/octave-value/ov-usr-fcn.cc, libinterp/octave-value/ov-usr-fcn.h, libinterp/octave-value/ov.cc, libinterp/octave-value/ov.h, libinterp/octave.cc, libinterp/operators/op-b-bm.cc, libinterp/operators/op-b-sbm.cc, libinterp/operators/op-bm-b.cc, libinterp/operators/op-bm-bm.cc, libinterp/operators/op-cdm-cdm.cc, libinterp/operators/op-chm.cc, libinterp/operators/op-class.cc, libinterp/operators/op-cm-cm.cc, libinterp/operators/op-cm-cs.cc, libinterp/operators/op-cm-s.cc, libinterp/operators/op-cm-scm.cc, libinterp/operators/op-cm-sm.cc, libinterp/operators/op-cs-cm.cc, libinterp/operators/op-cs-cs.cc, libinterp/operators/op-cs-scm.cc, libinterp/operators/op-cs-sm.cc, libinterp/operators/op-dm-dm.cc, libinterp/operators/op-dm-scm.cc, libinterp/operators/op-double-conv.cc, libinterp/operators/op-fcdm-fcdm.cc, libinterp/operators/op-fcm-fcm.cc, libinterp/operators/op-fcm-fcs.cc, libinterp/operators/op-fcm-fm.cc, libinterp/operators/op-fcm-fs.cc, libinterp/operators/op-fcs-fcm.cc, libinterp/operators/op-fcs-fcs.cc, libinterp/operators/op-fcs-fm.cc, libinterp/operators/op-fcs-fs.cc, libinterp/operators/op-fdm-fdm.cc, libinterp/operators/op-float-conv.cc, libinterp/operators/op-fm-fcm.cc, libinterp/operators/op-fm-fcs.cc, libinterp/operators/op-fm-fm.cc, libinterp/operators/op-fm-fs.cc, libinterp/operators/op-fs-fcm.cc, libinterp/operators/op-fs-fcs.cc, libinterp/operators/op-fs-fm.cc, libinterp/operators/op-fs-fs.cc, libinterp/operators/op-m-cm.cc, libinterp/operators/op-m-cs.cc, libinterp/operators/op-m-m.cc, libinterp/operators/op-m-s.cc, libinterp/operators/op-m-scm.cc, libinterp/operators/op-m-sm.cc, libinterp/operators/op-pm-scm.cc, libinterp/operators/op-range.cc, libinterp/operators/op-s-cm.cc, libinterp/operators/op-s-cs.cc, libinterp/operators/op-s-scm.cc, libinterp/operators/op-sbm-b.cc, libinterp/operators/op-sbm-bm.cc, libinterp/operators/op-sbm-sbm.cc, libinterp/operators/op-scm-cm.cc, libinterp/operators/op-scm-cs.cc, libinterp/operators/op-scm-m.cc, libinterp/operators/op-scm-s.cc, libinterp/operators/op-scm-scm.cc, libinterp/operators/op-scm-sm.cc, libinterp/operators/op-sm-cm.cc, libinterp/operators/op-sm-m.cc, libinterp/operators/op-sm-s.cc, libinterp/operators/op-sm-scm.cc, libinterp/operators/op-sm-sm.cc, libinterp/operators/op-str-m.cc, libinterp/operators/op-str-s.cc, libinterp/operators/op-str-str.cc, libinterp/operators/ops.h, libinterp/parse-tree/lex.h, libinterp/parse-tree/parse.h, libinterp/parse-tree/pt-arg-list.cc, libinterp/parse-tree/pt-arg-list.h, libinterp/parse-tree/pt-assign.cc, libinterp/parse-tree/pt-assign.h, libinterp/parse-tree/pt-binop.cc, libinterp/parse-tree/pt-binop.h, libinterp/parse-tree/pt-bp.h, libinterp/parse-tree/pt-cbinop.cc, libinterp/parse-tree/pt-check.cc, libinterp/parse-tree/pt-colon.cc, libinterp/parse-tree/pt-colon.h, libinterp/parse-tree/pt-const.cc, libinterp/parse-tree/pt-decl.cc, libinterp/parse-tree/pt-decl.h, libinterp/parse-tree/pt-eval.cc, libinterp/parse-tree/pt-except.h, libinterp/parse-tree/pt-exp.h, libinterp/parse-tree/pt-fcn-handle.cc, libinterp/parse-tree/pt-id.cc, libinterp/parse-tree/pt-id.h, libinterp/parse-tree/pt-idx.cc, libinterp/parse-tree/pt-idx.h, libinterp/parse-tree/pt-loop.h, libinterp/parse-tree/pt-mat.cc, libinterp/parse-tree/pt-misc.cc, libinterp/parse-tree/pt-misc.h, libinterp/parse-tree/pt-pr-code.cc, libinterp/parse-tree/pt-select.h, libinterp/parse-tree/pt-stmt.h, libinterp/parse-tree/token.h, libinterp/version.cc: Use GNU style coding conventions for code in libinterp/
author Rik <rik@octave.org>
date Mon, 28 Oct 2013 19:51:46 -0700
parents d63878346099
children 6a71e5030df5
comparison
equal deleted inserted replaced
17786:34d9812a943b 17787:175b392e91fe
87 if (name == bsxfun_builtin_names[i]) 87 if (name == bsxfun_builtin_names[i])
88 return static_cast<bsxfun_builtin_op> (i); 88 return static_cast<bsxfun_builtin_op> (i);
89 return bsxfun_builtin_unknown; 89 return bsxfun_builtin_unknown;
90 } 90 }
91 91
92 typedef octave_value (*bsxfun_handler) (const octave_value&, const octave_value&); 92 typedef octave_value (*bsxfun_handler) (const octave_value&,
93 const octave_value&);
93 94
94 // Static table of handlers. 95 // Static table of handlers.
95 bsxfun_handler bsxfun_handler_table[bsxfun_num_builtin_ops][btyp_num_types]; 96 bsxfun_handler bsxfun_handler_table[bsxfun_num_builtin_ops][btyp_num_types];
96 97
97 template <class NDA, NDA (bsxfun_op) (const NDA&, const NDA&)> 98 template <class NDA, NDA (bsxfun_op) (const NDA&, const NDA&)>
110 NDA xa = octave_value_extract<NDA> (x); 111 NDA xa = octave_value_extract<NDA> (x);
111 NDA ya = octave_value_extract<NDA> (y); 112 NDA ya = octave_value_extract<NDA> (y);
112 return octave_value (bsxfun_rel (xa, ya)); 113 return octave_value (bsxfun_rel (xa, ya));
113 } 114 }
114 115
115 // Pow needs a special handler for reals because of the potentially complex result. 116 // pow() needs a special handler for reals
117 // because of the potentially complex result.
116 template <class NDA, class CNDA> 118 template <class NDA, class CNDA>
117 static octave_value 119 static octave_value
118 do_bsxfun_real_pow (const octave_value& x, const octave_value& y) 120 do_bsxfun_real_pow (const octave_value& x, const octave_value& y)
119 { 121 {
120 NDA xa = octave_value_extract<NDA> (x); 122 NDA xa = octave_value_extract<NDA> (x);
170 bsxfun_handler_table[bsxfun_builtin_power][btyp_double] = 172 bsxfun_handler_table[bsxfun_builtin_power][btyp_double] =
171 do_bsxfun_real_pow<NDArray, ComplexNDArray>; 173 do_bsxfun_real_pow<NDArray, ComplexNDArray>;
172 bsxfun_handler_table[bsxfun_builtin_power][btyp_float] = 174 bsxfun_handler_table[bsxfun_builtin_power][btyp_float] =
173 do_bsxfun_real_pow<FloatNDArray, FloatComplexNDArray>; 175 do_bsxfun_real_pow<FloatNDArray, FloatComplexNDArray>;
174 176
175 REGISTER_OP_HANDLER (bsxfun_builtin_power, btyp_complex, ComplexNDArray, bsxfun_pow); 177 REGISTER_OP_HANDLER (bsxfun_builtin_power, btyp_complex, ComplexNDArray,
176 REGISTER_OP_HANDLER (bsxfun_builtin_power, btyp_float_complex, FloatComplexNDArray, bsxfun_pow); 178 bsxfun_pow);
179 REGISTER_OP_HANDLER (bsxfun_builtin_power, btyp_float_complex,
180 FloatComplexNDArray, bsxfun_pow);
177 181
178 // For chars, we want just relational handlers. 182 // For chars, we want just relational handlers.
179 REGISTER_REL_HANDLER (bsxfun_builtin_eq, btyp_char, charNDArray, bsxfun_eq); 183 REGISTER_REL_HANDLER (bsxfun_builtin_eq, btyp_char, charNDArray, bsxfun_eq);
180 REGISTER_REL_HANDLER (bsxfun_builtin_ne, btyp_char, charNDArray, bsxfun_ne); 184 REGISTER_REL_HANDLER (bsxfun_builtin_ne, btyp_char, charNDArray, bsxfun_ne);
181 REGISTER_REL_HANDLER (bsxfun_builtin_lt, btyp_char, charNDArray, bsxfun_lt); 185 REGISTER_REL_HANDLER (bsxfun_builtin_lt, btyp_char, charNDArray, bsxfun_lt);
271 return false; 275 return false;
272 } 276 }
273 } 277 }
274 278
275 #if 0 279 #if 0
276 // FIXME -- this function is not used; is it OK to delete it? 280 // FIXME: this function is not used; is it OK to delete it?
277 static void 281 static void
278 update_index (octave_value_list& idx, const dim_vector& dv, octave_idx_type i) 282 update_index (octave_value_list& idx, const dim_vector& dv, octave_idx_type i)
279 { 283 {
280 octave_idx_type nd = dv.length (); 284 octave_idx_type nd = dv.length ();
281 285
308 i = i / dv (j); 312 i = i / dv (j);
309 } 313 }
310 } 314 }
311 315
312 DEFUN (bsxfun, args, , 316 DEFUN (bsxfun, args, ,
313 "-*- texinfo -*-\n\ 317 "-*- texinfo -*-\n\
314 @deftypefn {Built-in Function} {} bsxfun (@var{f}, @var{A}, @var{B})\n\ 318 @deftypefn {Built-in Function} {} bsxfun (@var{f}, @var{A}, @var{B})\n\
315 The binary singleton expansion function applier performs broadcasting,\n\ 319 The binary singleton expansion function applier performs broadcasting,\n\
316 that is, applies a binary function @var{f} element-by-element to two\n\ 320 that is, applies a binary function @var{f} element-by-element to two\n\
317 array arguments @var{A} and @var{B}, and expands as necessary\n\ 321 array arguments @var{A} and @var{B}, and expands as necessary\n\
318 singleton dimensions in either input argument. @var{f} is a function\n\ 322 singleton dimensions in either input argument. @var{f} is a function\n\
341 std::string name = func.string_value (); 345 std::string name = func.string_value ();
342 func = symbol_table::find_function (name); 346 func = symbol_table::find_function (name);
343 if (func.is_undefined ()) 347 if (func.is_undefined ())
344 error ("bsxfun: invalid function name: %s", name.c_str ()); 348 error ("bsxfun: invalid function name: %s", name.c_str ());
345 } 349 }
346 else if (! (args(0).is_function_handle () || args(0).is_inline_function ())) 350 else if (! (args(0).is_function_handle ()
351 || args(0).is_inline_function ()))
347 error ("bsxfun: F must be a string or function handle"); 352 error ("bsxfun: F must be a string or function handle");
348 353
349 const octave_value A = args (1); 354 const octave_value A = args (1);
350 const octave_value B = args (2); 355 const octave_value B = args (2);
351 356
352 if (func.is_builtin_function () 357 if (func.is_builtin_function ()
353 || (func.is_function_handle () && ! A.is_object () && ! B.is_object ())) 358 || (func.is_function_handle ()
359 && ! A.is_object () && ! B.is_object ()))
354 { 360 {
355 // This may break if the default behavior is overriden. But if you override 361 // This may break if the default behavior is overriden. But if you
356 // arithmetic operators for builtin classes, you should expect mayhem 362 // override arithmetic operators for builtin classes, you should
357 // anyway (constant folding etc). Querying is_overloaded may not be 363 // expect mayhem anyway (constant folding etc). Querying
358 // exactly what we need here. 364 // is_overloaded() may not be exactly what we need here.
359 octave_function *fcn_val = func.function_value (); 365 octave_function *fcn_val = func.function_value ();
360 if (fcn_val) 366 if (fcn_val)
361 { 367 {
362 octave_value tmp = maybe_optimized_builtin (fcn_val->name (), A, B); 368 octave_value tmp = maybe_optimized_builtin (fcn_val->name (),
369 A, B);
363 if (tmp.is_defined ()) 370 if (tmp.is_defined ())
364 retval(0) = tmp; 371 retval(0) = tmp;
365 } 372 }
366 } 373 }
367 374
372 dim_vector dvb = B.dims (); 379 dim_vector dvb = B.dims ();
373 octave_idx_type ndb = dvb.length (); 380 octave_idx_type ndb = dvb.length ();
374 octave_idx_type nd = nda; 381 octave_idx_type nd = nda;
375 382
376 if (nda > ndb) 383 if (nda > ndb)
377 dvb.resize (nda, 1); 384 dvb.resize (nda, 1);
378 else if (nda < ndb) 385 else if (nda < ndb)
379 { 386 {
380 dva.resize (ndb, 1); 387 dva.resize (ndb, 1);
381 nd = ndb; 388 nd = ndb;
382 } 389 }
393 // Find the size of the output 400 // Find the size of the output
394 dim_vector dvc; 401 dim_vector dvc;
395 dvc.resize (nd); 402 dvc.resize (nd);
396 403
397 for (octave_idx_type i = 0; i < nd; i++) 404 for (octave_idx_type i = 0; i < nd; i++)
398 dvc (i) = (dva (i) < 1 ? dva (i) : (dvb (i) < 1 ? dvb (i) : 405 dvc (i) = (dva (i) < 1 ? dva (i)
399 (dva (i) > dvb (i) ? dva (i) : dvb (i)))); 406 : (dvb (i) < 1 ? dvb (i)
407 : (dva (i) > dvb (i)
408 ? dva (i) : dvb (i))));
400 409
401 if (dva == dvb || dva.numel () == 1 || dvb.numel () == 1) 410 if (dva == dvb || dva.numel () == 1 || dvb.numel () == 1)
402 { 411 {
403 octave_value_list inputs; 412 octave_value_list inputs;
404 inputs (0) = A; 413 inputs (0) = A;
451 inputs (0) = Ac; 460 inputs (0) = Ac;
452 461
453 if (maybe_update_column (Bc, B, dvb, dvc, i, idxB)) 462 if (maybe_update_column (Bc, B, dvb, dvc, i, idxB))
454 inputs (1) = Bc; 463 inputs (1) = Bc;
455 464
456 octave_value_list tmp = func.do_multi_index_op (1, inputs); 465 octave_value_list tmp = func.do_multi_index_op (1,
466 inputs);
457 467
458 if (error_state) 468 if (error_state)
459 break; 469 break;
460 470
461 #define BSXINIT(T, CLS, EXTRACTOR) \ 471 #define BSXINIT(T, CLS, EXTRACTOR) \
491 else if (result_type == "single") 501 else if (result_type == "single")
492 { 502 {
493 if (tmp(0).is_real_type ()) 503 if (tmp(0).is_real_type ())
494 { 504 {
495 have_FloatNDArray = true; 505 have_FloatNDArray = true;
496 result_FloatNDArray = tmp(0).float_array_value (); 506 result_FloatNDArray
507 = tmp(0).float_array_value ();
497 result_FloatNDArray.resize (dvc); 508 result_FloatNDArray.resize (dvc);
498 } 509 }
499 else 510 else
500 { 511 {
501 have_ComplexNDArray = true; 512 have_ComplexNDArray = true;
569 else 580 else
570 { 581 {
571 result_FloatComplexNDArray = 582 result_FloatComplexNDArray =
572 FloatComplexNDArray (result_FloatNDArray); 583 FloatComplexNDArray (result_FloatNDArray);
573 result_FloatComplexNDArray.insert 584 result_FloatComplexNDArray.insert
574 (tmp(0).float_complex_array_value (), ra_idx); 585 (tmp(0).float_complex_array_value (),
586 ra_idx);
575 have_FloatNDArray = false; 587 have_FloatNDArray = false;
576 have_FloatComplexNDArray = true; 588 have_FloatComplexNDArray = true;
577 } 589 }
578 } 590 }
579 else if (have_NDArray) 591 else if (have_NDArray)