octave: libinterp/corefcn/cellfun.cc annotate

annotate libinterp/corefcn/cellfun.cc @ 20756:200ae1d650b7

propagate octave_execution_exception objects through try/catch blocks * gripes.h, gripes.cc (gripe_user_supplied_eval, gripe_wrong_type_arg): New overloaded functions that accept octave_execution_exception objects. * error.h, error.cc (error, verror, error_1, usage_1, debug_or_throw_exception): New overloaded functions that accept * octave_execution_exception objects. * __qp__.cc, cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, file-io.cc, graphics.cc, graphics.in.h, input.cc, load-path.cc, ls-mat-ascii.cc, lsode.cc, mex.cc, oct-handle.h, oct-map.cc, oct-stream.cc, quad.cc, rand.cc, toplev.cc, utils.cc, variables.cc, __eigs__.cc, ov-base.cc, ov-class.cc, ov-fcn-handle.cc, ov-oncleanup.cc, ov.cc, octave.cc, oct-parse.in.yy: Propagate octave_execution_exception objects through try/catch blocks.

author	John W. Eaton <jwe@octave.org>
date	Wed, 25 Nov 2015 15:27:48 -0500
parents	68e3a747ca02
children	a6eaedd8bd75

rev	line source
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	1 /*
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 18862 diff changeset	3 Copyright (C) 2005-2015 Mohamed Kamoun
4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 18862 diff changeset	4 Copyright (C) 2006-2015 Bill Denney
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	5 Copyright (C) 2009 Jaroslav Hajek
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10428 diff changeset	6 Copyright (C) 2010 VZLU Prague
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	7
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	8 This file is part of Octave.
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	9
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	10 Octave is free software; you can redistribute it and/or modify it
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	11 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	12 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	13 option) any later version.
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	14
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	15 Octave is distributed in the hope that it will be useful, but WITHOUT
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	18 for more details.
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	19
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	20 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	21 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	22 <http://www.gnu.org/licenses/>.
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	23
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	24 */
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	25
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	26 #ifdef HAVE_CONFIG_H
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	27 #include <config.h>
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	28 #endif
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	29
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	30 #include <string>
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	31 #include <vector>
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	32 #include <list>
8994 a8d30dc1beec cellfun optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8985 diff changeset	33 #include <memory>
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	34
14076 9aff66860e03 accept abbreviated cellfun option names John W. Eaton <jwe@octave.org> parents: 13960 diff changeset	35 #include "caseless-str.h"
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	36 #include "lo-mappers.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8373 diff changeset	37 #include "oct-locbuf.h"
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	38
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	39 #include "Cell.h"
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	40 #include "oct-map.h"
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	41 #include "defun.h"
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	42 #include "parse.h"
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	43 #include "variables.h"
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	44 #include "unwind-prot.h"
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	45 #include "gripes.h"
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	46 #include "toplev.h"
9728 70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	47 #include "utils.h"
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	48
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	49 #include "ov-bool.h"
13329 80f7564a3849 handle class objects in num2cell John W. Eaton <jwe@octave.org> parents: 13234 diff changeset	50 #include "ov-class.h"
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	51 #include "ov-colon.h"
10044 2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	52 #include "ov-complex.h"
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	53 #include "ov-float.h"
10044 2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	54 #include "ov-flt-complex.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	55 #include "ov-int16.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	56 #include "ov-int32.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	57 #include "ov-int64.h"
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	58 #include "ov-int8.h"
200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	59 #include "ov-scalar.h"
10044 2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	60 #include "ov-uint16.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	61 #include "ov-uint32.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	62 #include "ov-uint64.h"
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	63 #include "ov-uint8.h"
10044 2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	64
12952 5a5cb2a4b71d cellfun: Fix a regression for function handles to overloaded functions Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12949 diff changeset	65 #include "ov-fcn-handle.h"
5a5cb2a4b71d cellfun: Fix a regression for function handles to overloaded functions Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12949 diff changeset	66
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	67 static octave_value_list
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	68 get_output_list (octave_idx_type count, octave_idx_type nargout,
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	69 const octave_value_list& inputlist,
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	70 octave_value& func,
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	71 octave_value& error_handler)
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	72 {
16000 3f93cd251bdb fix ErrorHandler in cellfun (bug #38256) Stefan Mahr <dac922@gmx.de> parents: 15195 diff changeset	73 octave_value_list tmp;
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20443 diff changeset	74
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20443 diff changeset	75 bool execution_error = false;
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20443 diff changeset	76
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	77 try
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	78 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	79 tmp = func.do_multi_index_op (nargout, inputlist);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	80 }
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	81 catch (const octave_execution_exception& e)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	82 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	83 if (error_handler.is_defined ())
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	84 {
200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	85 recover_from_exception ();
200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	86
200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	87 execution_error = true;
200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	88 }
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20443 diff changeset	89 else
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	90 throw e;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	91 }
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	92
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20443 diff changeset	93 if (execution_error)
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	94 {
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	95 if (error_handler.is_defined ())
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	96 {
11046 14993c9e857e amd.cc, cellfun.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10964 diff changeset	97 octave_scalar_map msg;
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	98 msg.assign ("identifier", last_error_id ());
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	99 msg.assign ("message", last_error_message ());
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	100 msg.assign ("index",
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	101 static_cast<double> (count
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	102 + static_cast<octave_idx_type>(1)));
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	103
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	104 octave_value_list errlist = inputlist;
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	105 errlist.prepend (msg);
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	106
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	107 buffer_error_messages--;
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	108
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	109 tmp = error_handler.do_multi_index_op (nargout, errlist);
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	110 }
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	111 else
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	112 tmp.clear ();
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	113 }
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	114
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	115 return tmp;
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	116 }
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	117
17892 5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	118 // Templated function because the user can be stubborn enough to request
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	119 // a cell array as an output even in these cases where the output fits
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	120 // in an ordinary array
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	121 template<typename BNDA, typename NDA>
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	122 static octave_value_list
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	123 try_cellfun_internal_ops (const octave_value_list& args, int nargin)
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	124 {
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	125 octave_value_list retval;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	126
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	127 std::string name = args(0).string_value ();
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	128
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	129 const Cell f_args = args(1).cell_value ();
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	130
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	131 octave_idx_type k = f_args.numel ();
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	132
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	133 if (name == "isempty")
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	134 {
17892 5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	135 BNDA result (f_args.dims ());
13231 20ed9548070f maint: style fixes for cellfun John W. Eaton <jwe@octave.org> parents: 13230 diff changeset	136 for (octave_idx_type count = 0; count < k; count++)
14854 5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	137 result(count) = f_args.elem (count).is_empty ();
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	138 retval(0) = result;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	139 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	140 else if (name == "islogical")
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	141 {
17892 5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	142 BNDA result (f_args.dims ());
13231 20ed9548070f maint: style fixes for cellfun John W. Eaton <jwe@octave.org> parents: 13230 diff changeset	143 for (octave_idx_type count= 0; count < k; count++)
14854 5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	144 result(count) = f_args.elem (count).is_bool_type ();
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	145 retval(0) = result;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	146 }
17002 dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	147 else if (name == "isnumeric")
dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	148 {
17892 5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	149 BNDA result (f_args.dims ());
17002 dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	150 for (octave_idx_type count= 0; count < k; count++)
dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	151 result(count) = f_args.elem (count).is_numeric_type ();
dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	152 retval(0) = result;
dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	153 }
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	154 else if (name == "isreal")
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	155 {
17892 5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	156 BNDA result (f_args.dims ());
13231 20ed9548070f maint: style fixes for cellfun John W. Eaton <jwe@octave.org> parents: 13230 diff changeset	157 for (octave_idx_type count= 0; count < k; count++)
14854 5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	158 result(count) = f_args.elem (count).is_real_type ();
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	159 retval(0) = result;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	160 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	161 else if (name == "length")
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	162 {
17892 5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	163 NDA result (f_args.dims ());
13231 20ed9548070f maint: style fixes for cellfun John W. Eaton <jwe@octave.org> parents: 13230 diff changeset	164 for (octave_idx_type count= 0; count < k; count++)
14854 5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	165 result(count) = static_cast<double> (f_args.elem (count).length ());
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	166 retval(0) = result;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	167 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	168 else if (name == "ndims")
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	169 {
17892 5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	170 NDA result (f_args.dims ());
13231 20ed9548070f maint: style fixes for cellfun John W. Eaton <jwe@octave.org> parents: 13230 diff changeset	171 for (octave_idx_type count = 0; count < k; count++)
14854 5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	172 result(count) = static_cast<double> (f_args.elem (count).ndims ());
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	173 retval(0) = result;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	174 }
17004 19b7c7412a63 cell2mat.m: Re-vamp input validation for 30% speedup Rik <rik@octave.org> parents: 17002 diff changeset	175 else if (name == "numel" \|\| name == "prodofsize")
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	176 {
17892 5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	177 NDA result (f_args.dims ());
13231 20ed9548070f maint: style fixes for cellfun John W. Eaton <jwe@octave.org> parents: 13230 diff changeset	178 for (octave_idx_type count = 0; count < k; count++)
14854 5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	179 result(count) = static_cast<double> (f_args.elem (count).numel ());
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	180 retval(0) = result;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	181 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	182 else if (name == "size")
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	183 {
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	184 if (nargin == 3)
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	185 {
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	186 int d = args(2).nint_value () - 1;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	187
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	188 if (d < 0)
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	189 error ("cellfun: K must be a positive integer");
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	190
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	191 NDA result (f_args.dims ());
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	192
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	193 for (octave_idx_type count = 0; count < k; count++)
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	194 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	195 dim_vector dv = f_args.elem (count).dims ();
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	196 if (d < dv.length ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	197 result(count) = static_cast<double> (dv(d));
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	198 else
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	199 result(count) = 1.0;
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	200 }
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	201
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	202 retval(0) = result;
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	203 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	204 else
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	205 error ("cellfun: not enough arguments for \"size\"");
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	206 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	207 else if (name == "isclass")
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	208 {
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	209 if (nargin == 3)
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	210 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14501 diff changeset	211 std::string class_name = args(2).string_value ();
17892 5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	212 BNDA result (f_args.dims ());
13231 20ed9548070f maint: style fixes for cellfun John W. Eaton <jwe@octave.org> parents: 13230 diff changeset	213 for (octave_idx_type count = 0; count < k; count++)
14854 5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	214 result(count) = (f_args.elem (count).class_name () == class_name);
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	215
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	216 retval(0) = result;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	217 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	218 else
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	219 error ("cellfun: not enough arguments for \"isclass\"");
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	220 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	221
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	222 return retval;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	223 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	224
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	225 static void
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	226 get_mapper_fun_options (const octave_value_list& args, int& nargin,
14076 9aff66860e03 accept abbreviated cellfun option names John W. Eaton <jwe@octave.org> parents: 13960 diff changeset	227 bool& uniform_output, octave_value& error_handler)
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	228 {
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	229 while (nargin > 3 && args(nargin-2).is_string ())
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	230 {
14076 9aff66860e03 accept abbreviated cellfun option names John W. Eaton <jwe@octave.org> parents: 13960 diff changeset	231 caseless_str arg = args(nargin-2).string_value ();
9aff66860e03 accept abbreviated cellfun option names John W. Eaton <jwe@octave.org> parents: 13960 diff changeset	232
9aff66860e03 accept abbreviated cellfun option names John W. Eaton <jwe@octave.org> parents: 13960 diff changeset	233 size_t compare_len = std::max (arg.length (), static_cast<size_t> (2));
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	234
14076 9aff66860e03 accept abbreviated cellfun option names John W. Eaton <jwe@octave.org> parents: 13960 diff changeset	235 if (arg.compare ("uniformoutput", compare_len))
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14501 diff changeset	236 uniform_output = args(nargin-1).bool_value ();
14076 9aff66860e03 accept abbreviated cellfun option names John W. Eaton <jwe@octave.org> parents: 13960 diff changeset	237 else if (arg.compare ("errorhandler", compare_len))
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	238 {
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	239 if (args(nargin-1).is_function_handle ()
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	240 \|\| args(nargin-1).is_inline_function ())
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	241 {
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	242 error_handler = args(nargin-1);
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	243 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	244 else if (args(nargin-1).is_string ())
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	245 {
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	246 std::string err_name = args(nargin-1).string_value ();
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	247
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	248 error_handler = symbol_table::find_function (err_name);
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	249
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	250 if (error_handler.is_undefined ())
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	251 {
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	252 error ("cellfun: invalid function NAME: %s",
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	253 err_name.c_str ());
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	254 break;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	255 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	256 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	257 else
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	258 {
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	259 error ("cellfun: invalid value for 'ErrorHandler' function");
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	260 break;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	261 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	262 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	263 else
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	264 {
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	265 error ("cellfun: unrecognized parameter %s",
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14501 diff changeset	266 arg.c_str ());
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	267 break;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	268 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	269
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	270 nargin -= 2;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	271 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	272
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	273 nargin -= 1;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	274 }
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	275
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	276 DEFUN (cellfun, args, nargout,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	277 "-- texinfo --\n\
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	278 @deftypefn {Built-in Function} {} cellfun (@var{name}, @var{C})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	279 @deftypefnx {Built-in Function} {} cellfun (\"size\", @var{C}, @var{k})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	280 @deftypefnx {Built-in Function} {} cellfun (\"isclass\", @var{C}, @var{class})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	281 @deftypefnx {Built-in Function} {} cellfun (@var{func}, @var{C})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	282 @deftypefnx {Built-in Function} {} cellfun (@var{func}, @var{C}, @var{D})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	283 @deftypefnx {Built-in Function} {[@var{a}, @dots{}] =} cellfun (@dots{})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	284 @deftypefnx {Built-in Function} {} cellfun (@dots{}, \"ErrorHandler\", @var{errfunc})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	285 @deftypefnx {Built-in Function} {} cellfun (@dots{}, \"UniformOutput\", @var{val})\n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	286 \n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	287 Evaluate the function named @var{name} on the elements of the cell array\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	288 @var{C}.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	289 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	290 Elements in @var{C} are passed on to the named function individually. The\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	291 function @var{name} can be one of the functions\n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	292 \n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	293 @table @code\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	294 @item isempty\n\
5543 4d52e637a72a [project @ 2005-11-21 16:13:47 by jwe] jwe parents: 5451 diff changeset	295 Return 1 for empty elements.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	296 \n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	297 @item islogical\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	298 Return 1 for logical elements.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	299 \n\
17002 dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	300 @item isnumeric\n\
dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	301 Return 1 for numeric elements.\n\
dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	302 \n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	303 @item isreal\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	304 Return 1 for real elements.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	305 \n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	306 @item length\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	307 Return a vector of the lengths of cell elements.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	308 \n\
5543 4d52e637a72a [project @ 2005-11-21 16:13:47 by jwe] jwe parents: 5451 diff changeset	309 @item ndims\n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	310 Return the number of dimensions of each element.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	311 \n\
17170 d6499c14021c doc: Periodic grammarcheck of documentation. Rik <rik@octave.org> parents: 17004 diff changeset	312 @item numel\n\
12932 f951ffdd0133 doc: Document numel option to cellfun. Use fewer function handles in examples. Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	313 @itemx prodofsize\n\
f951ffdd0133 doc: Document numel option to cellfun. Use fewer function handles in examples. Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	314 Return the number of elements contained within each cell element. The\n\
f951ffdd0133 doc: Document numel option to cellfun. Use fewer function handles in examples. Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	315 number is the product of the dimensions of the object at each cell element.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	316 \n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	317 @item size\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	318 Return the size along the @var{k}-th dimension.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	319 \n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	320 @item isclass\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	321 Return 1 for elements of @var{class}.\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	322 @end table\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	323 \n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	324 Additionally, @code{cellfun} accepts an arbitrary function @var{func}\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	325 in the form of an inline function, function handle, or the name of a\n\
18812 9ac2357f19bc doc: Replace "non-zero" with "nonzero" to match existing usage. Rik <rik@octave.org> parents: 18678 diff changeset	326 function (in a character string). The function can take one or more\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	327 arguments, with the inputs arguments given by @var{C}, @var{D}, etc.\n\
18812 9ac2357f19bc doc: Replace "non-zero" with "nonzero" to match existing usage. Rik <rik@octave.org> parents: 18678 diff changeset	328 Equally the function can return one or more output arguments. For example:\n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	329 \n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	330 @example\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	331 @group\n\
12932 f951ffdd0133 doc: Document numel option to cellfun. Use fewer function handles in examples. Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	332 cellfun (\"atan2\", @{1, 0@}, @{0, 1@})\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	333 @result{} [ 1.57080 0.00000 ]\n\
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	334 @end group\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	335 @end example\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	336 \n\
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	337 The number of output arguments of @code{cellfun} matches the number of output\n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	338 arguments of the function. The outputs of the function will be collected\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	339 into the output arguments of @code{cellfun} like this:\n\
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	340 \n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	341 @example\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	342 @group\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	343 function [a, b] = twoouts (x)\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	344 a = x;\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	345 b = x*x;\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	346 endfunction\n\
14854 5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	347 [aa, bb] = cellfun (@@twoouts, @{1, 2, 3@})\n\
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	348 @result{}\n\
12642 f96b9b9f141b doc: Periodic grammarcheck and spellcheck of documentation. Rik <octave@nomad.inbox5.com> parents: 12483 diff changeset	349 aa =\n\
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	350 1 2 3\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	351 bb =\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	352 1 4 9\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	353 @end group\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	354 @end example\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	355 \n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	356 Note that per default the output argument(s) are arrays of the same size as\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	357 the input arguments. Input arguments that are singleton (1x1) cells will be\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	358 automatically expanded to the size of the other arguments.\n\
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	359 \n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	360 If the parameter @qcode{\"UniformOutput\"} is set to true (the default),\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	361 then the function must return scalars which will be concatenated into the\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	362 return array(s). If @qcode{\"UniformOutput\"} is false, the outputs are\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	363 concatenated into a cell array (or cell arrays). For example:\n\
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	364 \n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	365 @example\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	366 @group\n\
12932 f951ffdd0133 doc: Document numel option to cellfun. Use fewer function handles in examples. Rik <octave@nomad.inbox5.com> parents: 12642 diff changeset	367 cellfun (\"tolower\", @{\"Foo\", \"Bar\", \"FooBar\"@},\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	368 \"UniformOutput\", false)\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	369 @result{} @{\"foo\", \"bar\", \"foobar\"@}\n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	370 @end group\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	371 @end example\n\
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	372 \n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	373 Given the parameter @qcode{\"ErrorHandler\"}, then @var{errfunc} defines a\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	374 function to call in case @var{func} generates an error. The form of the\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	375 function is\n\
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	376 \n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	377 @example\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	378 function [@dots{}] = errfunc (@var{s}, @dots{})\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	379 @end example\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	380 \n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	381 @noindent\n\
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	382 where there is an additional input argument to @var{errfunc} relative to\n\
9036 58604c45ca74 Cleanup of data types related documentation Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	383 @var{func}, given by @var{s}. This is a structure with the elements\n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	384 @qcode{\"identifier\"}, @qcode{\"message\"} and @qcode{\"index\"}, giving\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	385 respectively the error identifier, the error message, and the index into the\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	386 input arguments of the element that caused the error. For example:\n\
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	387 \n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	388 @example\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	389 @group\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	390 function y = foo (s, x), y = NaN; endfunction\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	391 cellfun (\"factorial\", @{-1,2@}, \"ErrorHandler\", @@foo)\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	392 @result{} [NaN 2]\n\
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	393 @end group\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	394 @end example\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	395 \n\
14119 94e2a76f1e5a doc: Final grammarcheck and spellcheck before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 14116 diff changeset	396 Use @code{cellfun} intelligently. The @code{cellfun} function is a\n\
94e2a76f1e5a doc: Final grammarcheck and spellcheck before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 14116 diff changeset	397 useful tool for avoiding loops. It is often used with anonymous\n\
14116 951eacaf9381 Initial documentation for broadcasting and general vectorization guidelines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14093 diff changeset	398 function handles; however, calling an anonymous function involves an\n\
951eacaf9381 Initial documentation for broadcasting and general vectorization guidelines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14093 diff changeset	399 overhead quite comparable to the overhead of an m-file function.\n\
951eacaf9381 Initial documentation for broadcasting and general vectorization guidelines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14093 diff changeset	400 Passing a handle to a built-in function is faster, because the\n\
14119 94e2a76f1e5a doc: Final grammarcheck and spellcheck before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 14116 diff changeset	401 interpreter is not involved in the internal loop. For example:\n\
14116 951eacaf9381 Initial documentation for broadcasting and general vectorization guidelines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14093 diff changeset	402 \n\
951eacaf9381 Initial documentation for broadcasting and general vectorization guidelines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14093 diff changeset	403 @example\n\
951eacaf9381 Initial documentation for broadcasting and general vectorization guidelines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14093 diff changeset	404 @group\n\
951eacaf9381 Initial documentation for broadcasting and general vectorization guidelines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14093 diff changeset	405 a = @{@dots{}@}\n\
14854 5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	406 v = cellfun (@@(x) det (x), a); # compute determinants\n\
14116 951eacaf9381 Initial documentation for broadcasting and general vectorization guidelines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14093 diff changeset	407 v = cellfun (@@det, a); # faster\n\
951eacaf9381 Initial documentation for broadcasting and general vectorization guidelines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14093 diff changeset	408 @end group\n\
951eacaf9381 Initial documentation for broadcasting and general vectorization guidelines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14093 diff changeset	409 @end example\n\
951eacaf9381 Initial documentation for broadcasting and general vectorization guidelines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14093 diff changeset	410 \n\
10687 a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10670 diff changeset	411 @seealso{arrayfun, structfun, spfun}\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5544 diff changeset	412 @end deftypefn")
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	413 {
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	414 octave_value_list retval;
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	415 int nargin = args.length ();
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	416 int nargout1 = (nargout < 1 ? 1 : nargout);
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	417
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	418 if (nargin < 2)
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	419 {
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 11590 diff changeset	420 error ("cellfun: function requires at least 2 arguments");
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5784 diff changeset	421 print_usage ();
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	422 return retval;
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	423 }
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	424
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	425 octave_value func = args(0);
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	426
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	427 if (! args(1).is_cell ())
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	428 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	429 error ("cellfun: C must be a cell array");
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	430
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	431 return retval;
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	432 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	433
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	434 if (func.is_string ())
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	435 {
17892 5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	436 retval = try_cellfun_internal_ops<boolNDArray,NDArray>(args, nargin);
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	437
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	438 if (! retval.empty ())
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	439 return retval;
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	440
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	441 // See if we can convert the string into a function.
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	442
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	443 std::string name = args(0).string_value ();
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	444
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	445 if (! valid_identifier (name))
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	446 {
18862 6825522c25e4 maint: Use names beginning and ending with "__" for internal only functions. Rik <rik@octave.org> parents: 18812 diff changeset	447 std::string fcn_name = unique_symbol_name ("__cellfun_fcn__");
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	448 std::string fname = "function y = " + fcn_name + "(x) y = ";
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	449
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	450 octave_function *ptr_func
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	451 = extract_function (args(0), "cellfun", fcn_name,
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	452 fname, "; endfunction");
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	453
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	454 if (ptr_func)
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	455 func = octave_value (ptr_func, true);
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	456 }
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	457 else
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	458 {
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	459 func = symbol_table::find_function (name);
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	460
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	461 if (func.is_undefined ())
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	462 error ("cellfun: invalid function NAME: %s", name.c_str ());
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	463 }
12949 d1db86336a49 cellfun.cc (cellfun): Small optimisation for function handles to built-ins Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12948 diff changeset	464
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	465 if (! retval.empty ())
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	466 return retval;
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	467 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	468
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	469 if (func.is_function_handle () \|\| func.is_inline_function ()
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	470 \|\| func.is_function ())
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	471 {
13960 ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	472
17892 5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	473 bool uniform_output = true;
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	474 octave_value error_handler;
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	475
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	476 get_mapper_fun_options (args, nargin, uniform_output, error_handler);
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	477
12949 d1db86336a49 cellfun.cc (cellfun): Small optimisation for function handles to built-ins Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12948 diff changeset	478 // The following is an optimisation because the symbol table can
d1db86336a49 cellfun.cc (cellfun): Small optimisation for function handles to built-ins Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12948 diff changeset	479 // give a more specific function class, so this can result in
d1db86336a49 cellfun.cc (cellfun): Small optimisation for function handles to built-ins Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12948 diff changeset	480 // fewer polymorphic function calls as the function gets called
d1db86336a49 cellfun.cc (cellfun): Small optimisation for function handles to built-ins Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12948 diff changeset	481 // for each value of the array.
13960 ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	482 {
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	483 if (func.is_function_handle ())
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	484 {
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	485 octave_fcn_handle* f = func.fcn_handle_value ();
12952 5a5cb2a4b71d cellfun: Fix a regression for function handles to overloaded functions Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12949 diff changeset	486
13960 ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	487 // Overloaded function handles need to check the type of the
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	488 // arguments for each element of the array, so they cannot
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	489 // be optimised this way.
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	490 if (f -> is_overloaded ())
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	491 goto nevermind;
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	492 }
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	493
13960 ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	494 std::string name = func.function_value () -> name ();
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	495 octave_value f = symbol_table::find_function (name);
13959 cf8cd43cdeb3 cellfun: further optimisations for the string vs function handle cases Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13928 diff changeset	496
13960 ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	497 if (f.is_defined ())
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	498 {
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	499 //Except for these two which are special cases...
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	500 if (name != "size" && name != "class")
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	501 {
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	502 //Try first the optimised code path for built-in functions
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	503 octave_value_list tmp_args = args;
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	504 tmp_args(0) = name;
17892 5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	505
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	506 if (uniform_output)
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	507 retval =
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	508 try_cellfun_internal_ops<boolNDArray, NDArray> (tmp_args,
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	509 nargin);
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	510 else
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	511 retval =
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	512 try_cellfun_internal_ops<Cell, Cell> (tmp_args, nargin);
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	513
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	514 if (! retval.empty ())
13960 ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	515 return retval;
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	516 }
13959 cf8cd43cdeb3 cellfun: further optimisations for the string vs function handle cases Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13928 diff changeset	517
13960 ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	518 //Okay, we tried, doesn't work, let's do the best we can
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	519 //instead and avoid polymorphic calls for each element of
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	520 //the array.
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	521 func = f;
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	522 }
ef96344a6e58 cellfun: get rid of unnecessary symbol_table_lookup flag Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13959 diff changeset	523 }
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	524
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	525 nevermind:
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	526
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	527 // Extract cell arguments.
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	528
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	529 octave_value_list inputlist (nargin, octave_value ());
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	530
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	531 OCTAVE_LOCAL_BUFFER (Cell, inputs, nargin);
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	532 OCTAVE_LOCAL_BUFFER (bool, mask, nargin);
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	533
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	534 // This is to prevent copy-on-write.
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	535 const Cell *cinputs = inputs;
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	536
9684 c5ff5f858cfd omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9683 diff changeset	537 octave_idx_type k = 1;
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	538
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	539 dim_vector fdims (1, 1);
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	540
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	541 // Collect arguments. Pre-fill scalar elements of inputlist
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	542 // array.
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	543
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	544 for (int j = 0; j < nargin; j++)
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	545 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	546 if (! args(j+1).is_cell ())
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	547 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	548 error ("cellfun: arguments must be cells");
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10044 diff changeset	549 return octave_value_list ();
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	550 }
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	551
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	552 inputs[j] = args(j+1).cell_value ();
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	553 mask[j] = inputs[j].numel () != 1;
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	554 if (! mask[j])
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	555 inputlist(j) = cinputs[j](0);
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	556 }
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	557
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	558 for (int j = 0; j < nargin; j++)
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	559 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	560 if (mask[j])
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	561 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	562 fdims = inputs[j].dims ();
9683 5b3b9dcfd59c fix crash in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	563 k = inputs[j].numel ();
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	564 for (int i = j+1; i < nargin; i++)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	565 {
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	566 if (mask[i] && inputs[i].dims () != fdims)
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	567 {
11590 4ced6b90fffb style fixes for warning and error messages in source files John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	568 error ("cellfun: dimensions mismatch");
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10044 diff changeset	569 return octave_value_list ();
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	570 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	571 }
9683 5b3b9dcfd59c fix crash in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	572 break;
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	573 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	574 }
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	575
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	576 unwind_protect frame;
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	577 frame.protect_var (buffer_error_messages);
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	578
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	579 if (error_handler.is_defined ())
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	580 buffer_error_messages++;
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	581
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	582 // Apply functions.
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	583
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	584 if (uniform_output)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	585 {
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	586 std::list<octave_value_list> idx_list (1);
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	587 idx_list.front ().resize (1);
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	588 std::string idx_type = "(";
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	589
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	590 OCTAVE_LOCAL_BUFFER (octave_value, retv, nargout1);
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	591
13231 20ed9548070f maint: style fixes for cellfun John W. Eaton <jwe@octave.org> parents: 13230 diff changeset	592 for (octave_idx_type count = 0; count < k; count++)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	593 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	594 for (int j = 0; j < nargin; j++)
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	595 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	596 if (mask[j])
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	597 inputlist.xelem (j) = cinputs[j](count);
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	598 }
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	599
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	600 const octave_value_list tmp
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	601 = get_output_list (count, nargout, inputlist, func,
983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	602 error_handler);
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	603
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	604 if (nargout > 0 && tmp.length () < nargout)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	605 {
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	606 error ("cellfun: function returned fewer than nargout values");
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	607 return retval;
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	608 }
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	609
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	610 if (nargout > 0
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	611 \|\| (nargout == 0
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	612 && tmp.length () > 0 && tmp(0).is_defined ()))
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	613 {
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	614 int num_to_copy = tmp.length ();
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	615
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	616 if (num_to_copy > nargout1)
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	617 num_to_copy = nargout1;
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	618
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	619 if (count == 0)
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	620 {
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	621 for (int j = 0; j < num_to_copy; j++)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	622 {
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	623 if (tmp(j).is_defined ())
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	624 {
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	625 octave_value val = tmp(j);
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	626
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	627 if (val.numel () == 1)
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	628 retv[j] = val.resize (fdims);
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	629 else
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	630 {
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	631 error ("cellfun: all values must be scalars when UniformOutput = true");
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	632 break;
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	633 }
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	634 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	635 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	636 }
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	637 else
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	638 {
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	639 for (int j = 0; j < num_to_copy; j++)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	640 {
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	641 if (tmp(j).is_defined ())
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	642 {
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	643 octave_value val = tmp(j);
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	644
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	645 if (! retv[j].fast_elem_insert (count, val))
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	646 {
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	647 if (val.numel () == 1)
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	648 {
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	649 idx_list.front ()(0) = count + 1.0;
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	650 retv[j].assign (octave_value::op_asn_eq,
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	651 idx_type, idx_list, val);
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	652 }
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	653 else
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	654 {
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	655 error ("cellfun: all values must be scalars when UniformOutput = true");
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	656 break;
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	657 }
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	658 }
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	659 }
8994 a8d30dc1beec cellfun optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8985 diff changeset	660 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	661 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	662 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	663 }
8994 a8d30dc1beec cellfun optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8985 diff changeset	664
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	665 retval.resize (nargout1);
13229 983720941822 maint: improve readability of cellfun John W. Eaton <jwe@octave.org> parents: 12952 diff changeset	666
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	667 for (int j = 0; j < nargout1; j++)
11457 33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	668 {
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	669 if (nargout > 0 && retv[j].is_undefined ())
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	670 retval(j) = NDArray (fdims);
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	671 else
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	672 retval(j) = retv[j];
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	673 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	674 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	675 else
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	676 {
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	677 OCTAVE_LOCAL_BUFFER (Cell, results, nargout1);
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	678
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	679 for (int j = 0; j < nargout1; j++)
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	680 results[j].resize (fdims, Matrix ());
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	681
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	682 bool have_some_output = false;
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	683
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	684 for (octave_idx_type count = 0; count < k; count++)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	685 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	686 for (int j = 0; j < nargin; j++)
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	687 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	688 if (mask[j])
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	689 inputlist.xelem (j) = cinputs[j](count);
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	690 }
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	691
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	692 const octave_value_list tmp
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	693 = get_output_list (count, nargout, inputlist, func,
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	694 error_handler);
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	695
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	696 if (nargout > 0 && tmp.length () < nargout)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	697 {
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	698 error ("cellfun: function returned fewer than nargout values");
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	699 return retval;
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	700 }
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	701
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	702 if (nargout > 0
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	703 \|\| (nargout == 0
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	704 && tmp.length () > 0 && tmp(0).is_defined ()))
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	705 {
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	706 int num_to_copy = tmp.length ();
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	707
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	708 if (num_to_copy > nargout1)
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	709 num_to_copy = nargout1;
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	710
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	711 if (num_to_copy > 0)
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	712 have_some_output = true;
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	713
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	714 for (int j = 0; j < num_to_copy; j++)
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	715 results[j](count) = tmp(j);
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	716 }
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	717 }
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	718
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	719 if (have_some_output \|\| fdims.any_zero ())
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	720 {
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	721 retval.resize (nargout1);
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	722
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	723 for (int j = 0; j < nargout1; j++)
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	724 retval(j) = results[j];
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	725 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	726 }
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	727 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	728 else
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	729 error ("cellfun: argument NAME must be a string or function handle");
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	730
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	731 return retval;
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	732 }
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	733
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	734 /*
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	735
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	736 %!function r = __f11 (x)
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	737 %! global __cellfun_test_num_outputs__;
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	738 %! __cellfun_test_num_outputs__ = nargout;
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	739 %! r = x;
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	740 %!endfunction
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	741
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	742 %!function __f01 (x)
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	743 %! global __cellfun_test_num_outputs__;
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	744 %! __cellfun_test_num_outputs__ = nargout;
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	745 %!endfunction
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	746
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	747 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	748 %! global __cellfun_test_num_outputs__;
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	749 %! cellfun (@__f11, {1});
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	750 %! assert (__cellfun_test_num_outputs__, 0);
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	751 %! x = cellfun (@__f11, {1});
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	752 %! assert (__cellfun_test_num_outputs__, 1);
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	753
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	754 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	755 %! global __cellfun_test_num_outputs__;
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	756 %! cellfun (@__f01, {1});
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	757 %! assert (__cellfun_test_num_outputs__, 0);
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	758
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	759 %!error x = cellfun (@__f01, {1, 2});
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	760
c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	761 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	762 %! assert (cellfun (@__f11, {1, 2}), [1, 2]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	763 %! assert (cellfun (@__f11, {1, 2}, 'uniformoutput', false), {1, 2});
13230 c73cc5b67feb fix nargout handling for functions called by cellfun John W. Eaton <jwe@octave.org> parents: 13229 diff changeset	764
11457 33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	765 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	766 %! [a,b] = cellfun (@(x) x, cell (2, 0));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	767 %! assert (a, zeros (2, 0));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	768 %! assert (b, zeros (2, 0));
11457 33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	769
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	770 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	771 %! [a,b] = cellfun (@(x) x, cell (2, 0), "uniformoutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	772 %! assert (a, cell (2, 0));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	773 %! assert (b, cell (2, 0));
11457 33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	774
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	775 %% Test function to check the "Errorhandler" option
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	776 %!function z = __cellfunerror (S, varargin)
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	777 %! z = S;
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	778 %!endfunction
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	779
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	780 %% First input argument can be a string, an inline function,
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	781 %% a function_handle or an anonymous function
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	782 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	783 %! A = cellfun ("islogical", {true, 0.1, false, i*2});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	784 %! assert (A, [true, false, true, false]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	785 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	786 %! A = cellfun (inline ("islogical (x)", "x"), {true, 0.1, false, i*2});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	787 %! assert (A, [true, false, true, false]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	788 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	789 %! A = cellfun (@islogical, {true, 0.1, false, i*2});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	790 %! assert (A, [true, false, true, false]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	791 %!test
14854 5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	792 %! A = cellfun (@(x) islogical (x), {true, 0.1, false, i*2});
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	793 %! assert (A, [true, false, true, false]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	794
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	795 %% First input argument can be the special string "isreal",
17002 dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	796 %% "isempty", "islogical", "isnumeric", "length", "ndims" or "prodofsize"
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	797 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	798 %! A = cellfun ("isreal", {true, 0.1, {}, i*2, [], "abc"});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	799 %! assert (A, [true, true, false, false, true, true]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	800 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	801 %! A = cellfun ("isempty", {true, 0.1, false, i*2, [], "abc"});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	802 %! assert (A, [false, false, false, false, true, false]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	803 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	804 %! A = cellfun ("islogical", {true, 0.1, false, i*2, [], "abc"});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	805 %! assert (A, [true, false, true, false, false, false]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	806 %!test
17002 dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	807 %! A = cellfun ("isnumeric", {true, 0.1, false, i*2, [], "abc"});
dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	808 %! assert (A, [false, true, false, true, true, false]);
dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	809 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	810 %! A = cellfun ("length", {true, 0.1, false, i*2, [], "abc"});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	811 %! assert (A, [1, 1, 1, 1, 0, 3]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	812 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	813 %! A = cellfun ("ndims", {[1, 2; 3, 4]; (cell (1,2,3,4))});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	814 %! assert (A, [2; 4]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	815 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	816 %! A = cellfun ("prodofsize", {[1, 2; 3, 4], (cell (1,2,3,4))});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	817 %! assert (A, [4, 24]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	818
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	819 %% Number of input and output arguments may not be limited to one
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	820 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	821 %! A = cellfun (@(x,y,z) x + y + z, {1, 1, 1}, {2, 2, 2}, {3, 4, 5});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	822 %! assert (A, [6, 7, 8]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	823 %!test
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	824 %! A = cellfun (@(x,y,z) x + y + z, {1, 1, 1}, {2, 2, 2}, {3, 4, 5}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	825 %! "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	826 %! assert (A, {6, 7, 8});
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	827 %!test %% Two input arguments of different types
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	828 %! A = cellfun (@(x,y) islogical (x) && ischar (y), {false, true}, {"a", 3});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	829 %! assert (A, [true, false]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	830 %!test %% Pass another variable to the anonymous function
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	831 %! y = true;
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	832 %! A = cellfun (@(x) islogical (x) && y, {false, 0.3});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	833 %! assert (A, [true, false]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	834 %!test %% Three ouptut arguments of different type
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	835 %! [A, B, C] = cellfun (@find, {10, 11; 0, 12}, "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	836 %! assert (isequal (A, {true, true; [], true}));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	837 %! assert (isequal (B, {true, true; [], true}));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	838 %! assert (isequal (C, {10, 11; [], 12}));
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	839
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	840 %% Input arguments can be of type cell array of logical
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	841 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	842 %! A = cellfun (@(x,y) x == y, {false, true}, {true, true});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	843 %! assert (A, [false, true]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	844 %!test
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	845 %! A = cellfun (@(x,y) x == y, {false; true}, {true; true}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	846 %! "UniformOutput", true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	847 %! assert (A, [false; true]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	848 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	849 %! A = cellfun (@(x) x, {false, true; false, true}, "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	850 %! assert (A, {false, true; false, true});
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	851 %!test %% Three ouptut arguments of same type
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	852 %! [A, B, C] = cellfun (@find, {true, false; false, true}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	853 %! "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	854 %! assert (isequal (A, {true, []; [], true}));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	855 %! assert (isequal (B, {true, []; [], true}));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	856 %! assert (isequal (C, {true, []; [], true}));
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	857 %!test
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	858 %! A = cellfun (@(x,y) cell2str (x,y), {true}, {true}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	859 %! "ErrorHandler", @__cellfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	860 %! assert (isfield (A, "identifier"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	861 %! assert (isfield (A, "message"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	862 %! assert (isfield (A, "index"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	863 %! assert (isempty (A.message), false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	864 %! assert (A.index, 1);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	865 %!test %% Overwriting setting of "UniformOutput" true
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	866 %! A = cellfun (@(x,y) cell2str (x,y), {true}, {true}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	867 %! "UniformOutput", true, "ErrorHandler", @__cellfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	868 %! assert (isfield (A, "identifier"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	869 %! assert (isfield (A, "message"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	870 %! assert (isfield (A, "index"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	871 %! assert (isempty (A.message), false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	872 %! assert (A.index, 1);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	873
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	874 %% Input arguments can be of type cell array of numeric
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	875 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	876 %! A = cellfun (@(x,y) x>y, {1.1, 4.2}, {3.1, 2+3*i});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	877 %! assert (A, [false, true]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	878 %!test
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	879 %! A = cellfun (@(x,y) x>y, {1.1, 4.2; 2, 4}, {3.1, 2; 2, 4+2*i}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	880 %! "UniformOutput", true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	881 %! assert (A, [false, true; false, false]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	882 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	883 %! A = cellfun (@(x,y) x:y, {1.1, 4}, {3.1, 6}, "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	884 %! assert (isequal (A{1}, [1.1, 2.1, 3.1]));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	885 %! assert (isequal (A{2}, [4, 5, 6]));
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	886 %!test %% Three ouptut arguments of different type
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	887 %! [A, B, C] = cellfun (@find, {10, 11; 0, 12}, "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	888 %! assert (isequal (A, {true, true; [], true}));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	889 %! assert (isequal (B, {true, true; [], true}));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	890 %! assert (isequal (C, {10, 11; [], 12}));
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	891 %!test
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	892 %! A = cellfun (@(x,y) cell2str (x,y), {1.1, 4}, {3.1, 6}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	893 %! "ErrorHandler", @__cellfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	894 %! B = isfield (A(1), "message") && isfield (A(1), "index");
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	895 %! assert ([(isfield (A(1), "identifier")), (isfield (A(2), "identifier"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	896 %! assert ([(isfield (A(1), "message")), (isfield (A(2), "message"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	897 %! assert ([(isfield (A(1), "index")), (isfield (A(2), "index"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	898 %! assert ([(isempty (A(1).message)), (isempty (A(2).message))], [false, false]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	899 %! assert ([A(1).index, A(2).index], [1, 2]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	900 %!test %% Overwriting setting of "UniformOutput" true
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	901 %! A = cellfun (@(x,y) cell2str (x,y), {1.1, 4}, {3.1, 6}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	902 %! "UniformOutput", true, "ErrorHandler", @__cellfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	903 %! B = isfield (A(1), "message") && isfield (A(1), "index");
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	904 %! assert ([(isfield (A(1), "identifier")), (isfield (A(2), "identifier"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	905 %! assert ([(isfield (A(1), "message")), (isfield (A(2), "message"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	906 %! assert ([(isfield (A(1), "index")), (isfield (A(2), "index"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	907 %! assert ([(isempty (A(1).message)), (isempty (A(2).message))], [false, false]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	908 %! assert ([A(1).index, A(2).index], [1, 2]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	909
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	910 %% Input arguments can be of type cell arrays of character or strings
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	911 %!error %% "UniformOutput" false should be used
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	912 %! A = cellfun (@(x,y) x>y, {"ad", "c", "ghi"}, {"cc", "d", "fgh"});
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	913 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	914 %! A = cellfun (@(x,y) x>y, {"a"; "f"}, {"c"; "d"}, "UniformOutput", true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	915 %! assert (A, [false; true]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	916 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	917 %! A = cellfun (@(x,y) x:y, {"a", "d"}, {"c", "f"}, "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	918 %! assert (A, {"abc", "def"});
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	919 %!test
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	920 %! A = cellfun (@(x,y) cell2str (x,y), {"a", "d"}, {"c", "f"}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	921 %! "ErrorHandler", @__cellfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	922 %! assert ([(isfield (A(1), "identifier")), (isfield (A(2), "identifier"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	923 %! assert ([(isfield (A(1), "message")), (isfield (A(2), "message"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	924 %! assert ([(isfield (A(1), "index")), (isfield (A(2), "index"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	925 %! assert ([(isempty (A(1).message)), (isempty (A(2).message))], [false, false]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	926 %! assert ([A(1).index, A(2).index], [1, 2]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	927 %!test %% Overwriting setting of "UniformOutput" true
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	928 %! A = cellfun (@(x,y) cell2str (x,y), {"a", "d"}, {"c", "f"}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	929 %! "UniformOutput", true, "ErrorHandler", @__cellfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	930 %! assert ([(isfield (A(1), "identifier")), (isfield (A(2), "identifier"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	931 %! assert ([(isfield (A(1), "message")), (isfield (A(2), "message"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	932 %! assert ([(isfield (A(1), "index")), (isfield (A(2), "index"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	933 %! assert ([(isempty (A(1).message)), (isempty (A(2).message))], [false, false]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	934 %! assert ([A(1).index, A(2).index], [1, 2]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	935
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	936 %% Structures cannot be handled by cellfun
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	937 %!error
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	938 %! vst1.a = 1.1; vst1.b = 4.2; vst2.a = 3.1; vst2.b = 2;
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	939 %! A = cellfun (@(x,y) (x.a < y.a) && (x.b > y.b), vst1, vst2);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	940
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	941 %% Input arguments can be of type cell array of cell arrays
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	942 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	943 %! A = cellfun (@(x,y) x{1} < y{1}, {{1.1}, {4.2}}, {{3.1}, {2}});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	944 %! assert (A, [1, 0], 1e-16);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	945 %!test
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	946 %! A = cellfun (@(x,y) x{1} < y{1}, {{1.1}; {4.2}}, {{3.1}; {2}}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	947 %! "UniformOutput", true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	948 %! assert (A, [1; 0], 1e-16);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	949 %!test
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	950 %! A = cellfun (@(x,y) x{1} < y{1}, {{1.1}, {4.2}}, {{3.1}, {2}}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	951 %! "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	952 %! assert (A, {true, false});
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	953 %!test
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	954 %! A = cellfun (@(x,y) mat2str (x,y), {{1.1}, {4.2}}, {{3.1}, {2}}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	955 %! "ErrorHandler", @__cellfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	956 %! assert ([(isfield (A(1), "identifier")), (isfield (A(2), "identifier"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	957 %! assert ([(isfield (A(1), "message")), (isfield (A(2), "message"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	958 %! assert ([(isfield (A(1), "index")), (isfield (A(2), "index"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	959 %! assert ([(isempty (A(1).message)), (isempty (A(2).message))], [false, false]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	960 %! assert ([A(1).index, A(2).index], [1, 2]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	961 %!test %% Overwriting setting of "UniformOutput" true
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	962 %! A = cellfun (@(x,y) mat2str (x,y), {{1.1}, {4.2}}, {{3.1}, {2}}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	963 %! "UniformOutput", true, "ErrorHandler", @__cellfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	964 %! assert ([(isfield (A(1), "identifier")), (isfield (A(2), "identifier"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	965 %! assert ([(isfield (A(1), "message")), (isfield (A(2), "message"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	966 %! assert ([(isfield (A(1), "index")), (isfield (A(2), "index"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	967 %! assert ([(isempty (A(1).message)), (isempty (A(2).message))], [false, false]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	968 %! assert ([A(1).index, A(2).index], [1, 2]);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	969
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	970 %% Input arguments can be of type cell array of structure arrays
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	971 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	972 %! a = struct ("a", 1, "b", 2); b = struct ("a", 1, "b", 3);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	973 %! A = cellfun (@(x,y) (x.a == y.a) && (x.b < y.b), {a}, {b});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	974 %! assert (A, true);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	975 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	976 %! a = struct ("a", 1, "b", 2); b = struct ("a", 1, "b", 3);
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	977 %! A = cellfun (@(x,y) (x.a == y.a) && (x.b < y.b) , {a}, {b}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	978 %! "UniformOutput", true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	979 %! assert (A, true);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	980 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	981 %! a = struct ("a", 1, "b", 2); b = struct ("a", 1, "b", 3);
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	982 %! A = cellfun (@(x,y) (x.a == y.a) && (x.b < y.b) , {a}, {b}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	983 %! "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	984 %! assert (A, {true});
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	985 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	986 %! a = struct ("a", 1, "b", 2); b = struct ("a", 1, "b", 3);
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	987 %! A = cellfun (@(x,y) cell2str (x.a, y.a), {a}, {b}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	988 %! "ErrorHandler", @__cellfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	989 %! assert (isfield (A, "identifier"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	990 %! assert (isfield (A, "message"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	991 %! assert (isfield (A, "index"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	992 %! assert (isempty (A.message), false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	993 %! assert (A.index, 1);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	994 %!test %% Overwriting setting of "UniformOutput" true
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	995 %! a = struct ("a", 1, "b", 2); b = struct ("a", 1, "b", 3);
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	996 %! A = cellfun (@(x,y) cell2str (x.a, y.a), {a}, {b}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	997 %! "UniformOutput", true, "ErrorHandler", @__cellfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	998 %! assert (isfield (A, "identifier"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	999 %! assert (isfield (A, "message"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1000 %! assert (isfield (A, "index"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1001 %! assert (isempty (A.message), false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1002 %! assert (A.index, 1);
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	1003
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	1004 %% A lot of other tests
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1005 %!assert (cellfun (@sin, {0,1}), sin ([0,1]))
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1006 %!assert (cellfun (inline ("sin (x)"), {0,1}), sin ([0,1]))
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1007 %!assert (cellfun ("sin", {0,1}), sin ([0,1]))
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1008 %!assert (cellfun ("isempty", {1,[]}), [false,true])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1009 %!assert (cellfun ("islogical", {false,pi}), [true,false])
17002 dd783018709b Add special case function "isnumeric" to cellfun.cc (bug #39387). Olaf Till <i7tiol@t-online.de> parents: 16047 diff changeset	1010 %!assert (cellfun ("isnumeric", {false,pi,struct()}), [false,true,false])
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1011 %!assert (cellfun ("isreal", {1i,1}), [false,true])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1012 %!assert (cellfun ("length", {zeros(2,2),1}), [2,1])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1013 %!assert (cellfun ("prodofsize", {zeros(2,2),1}), [4,1])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1014 %!assert (cellfun ("ndims", {zeros([2,2,2]),1}), [3,2])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1015 %!assert (cellfun ("isclass", {zeros([2,2,2]),"test"}, "double"), [true,false])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1016 %!assert (cellfun ("size", {zeros([1,2,3]),1}, 1), [1,1])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1017 %!assert (cellfun ("size", {zeros([1,2,3]),1}, 2), [2,1])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1018 %!assert (cellfun ("size", {zeros([1,2,3]),1}, 3), [3,1])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1019 %!assert (cellfun (@atan2, {1,1}, {1,2}), [atan2(1,1), atan2(1,2)])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1020 %!assert (cellfun (@atan2, {1,1}, {1,2},"UniformOutput", false), {atan2(1,1), atan2(1,2)})
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1021 %!assert (cellfun (@sin, {1,2;3,4}), sin ([1,2;3,4]))
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1022 %!assert (cellfun (@atan2, {1,1;1,1}, {1,2;1,2}), atan2 ([1,1;1,1],[1,2;1,2]))
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1023 %!error cellfun (@factorial, {-1,3})
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1024 %!assert (cellfun (@factorial,{-1,3},"ErrorHandler",@(x,y) NaN), [NaN,6])
16000 3f93cd251bdb fix ErrorHandler in cellfun (bug #38256) Stefan Mahr <dac922@gmx.de> parents: 15195 diff changeset	1025 %!assert (cellfun (@(x) x(2),{[1],[1,2]},"ErrorHandler",@(x,y) NaN), [NaN,2])
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	1026 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1027 %! [a,b,c] = cellfun (@fileparts, {fullfile("a","b","c.d"), fullfile("e","f","g.h")}, "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1028 %! assert (a, {fullfile("a","b"), fullfile("e","f")});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1029 %! assert (b, {"c", "g"});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1030 %! assert (c, {".d", ".h"});
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	1031
17892 5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	1032 ## Tests for bug #40467
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	1033 %!assert (cellfun (@isreal, {1 inf nan []}), [true, true, true, true]);
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	1034 %!assert (cellfun (@isreal, {1 inf nan []}, "UniformOutput", false), {true, true, true, true});
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	1035 %!assert (cellfun (@iscomplex, {1 inf nan []}), [false, false, false, false]);
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	1036 %!assert (cellfun (@iscomplex, {1 inf nan []}, "UniformOutput", false), {false, false, false, false});
5401637c3fa7 Make cellfun obey "UniformOutput" for optimised internal functions (bug #40467) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 17787 diff changeset	1037
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1038 %!error cellfun (1)
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1039 %!error cellfun ("isclass", 1)
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1040 %!error cellfun ("size", 1)
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1041 %!error cellfun (@sin, {[]}, "BadParam", false)
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1042 %!error cellfun (@sin, {[]}, "UniformOuput")
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1043 %!error cellfun (@sin, {[]}, "ErrorHandler")
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	1044 */
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	1045
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1046 // Arrayfun was originally a .m file written by Bill Denney and Jaroslav
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1047 // Hajek. It was converted to C++ by jwe so that it could properly
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1048 // handle the nargout = 0 case.
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1049
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	1050 DEFUN (arrayfun, args, nargout,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1051 "-- texinfo --\n\
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1052 @deftypefn {Function File} {} arrayfun (@var{func}, @var{A})\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1053 @deftypefnx {Function File} {@var{x} =} arrayfun (@var{func}, @var{A})\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1054 @deftypefnx {Function File} {@var{x} =} arrayfun (@var{func}, @var{A}, @var{b}, @dots{})\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1055 @deftypefnx {Function File} {[@var{x}, @var{y}, @dots{}] =} arrayfun (@var{func}, @var{A}, @dots{})\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1056 @deftypefnx {Function File} {} arrayfun (@dots{}, \"UniformOutput\", @var{val})\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1057 @deftypefnx {Function File} {} arrayfun (@dots{}, \"ErrorHandler\", @var{errfunc})\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1058 \n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1059 Execute a function on each element of an array.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1060 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1061 This is useful for functions that do not accept array arguments. If the\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1062 function does accept array arguments it is better to call the function\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1063 directly.\n\
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1064 \n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1065 The first input argument @var{func} can be a string, a function\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1066 handle, an inline function, or an anonymous function. The input\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1067 argument @var{A} can be a logic array, a numeric array, a string\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1068 array, a structure array, or a cell array. By a call of the function\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1069 @command{arrayfun} all elements of @var{A} are passed on to the named\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1070 function @var{func} individually.\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1071 \n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1072 The named function can also take more than two input arguments, with\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1073 the input arguments given as third input argument @var{b}, fourth\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1074 input argument @var{c}, @dots{} If given more than one array input\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1075 argument then all input arguments must have the same sizes, for\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1076 example:\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1077 \n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1078 @example\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1079 @group\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1080 arrayfun (@@atan2, [1, 0], [0, 1])\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1081 @result{} [ 1.5708 0.0000 ]\n\
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1082 @end group\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1083 @end example\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1084 \n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1085 If the parameter @var{val} after a further string input argument\n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	1086 @qcode{\"UniformOutput\"} is set @code{true} (the default), then the named\n\
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1087 function @var{func} must return a single element which then will be\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1088 concatenated into the return value and is of type matrix. Otherwise,\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1089 if that parameter is set to @code{false}, then the outputs are\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1090 concatenated in a cell array. For example:\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1091 \n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1092 @example\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1093 @group\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1094 arrayfun (@@(x,y) x:y, \"abc\", \"def\", \"UniformOutput\", false)\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1095 @result{}\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1096 @{\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1097 [1,1] = abcd\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1098 [1,2] = bcde\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1099 [1,3] = cdef\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1100 @}\n\
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1101 @end group\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1102 @end example\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1103 \n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1104 If more than one output arguments are given then the named function\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1105 must return the number of return values that also are expected, for\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1106 example:\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1107 \n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1108 @example\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1109 @group\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1110 [A, B, C] = arrayfun (@@find, [10; 0], \"UniformOutput\", false)\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1111 @result{}\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1112 A =\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1113 @{\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1114 [1,1] = 1\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1115 [2,1] = [](0x0)\n\
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1116 @}\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1117 B =\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1118 @{\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1119 [1,1] = 1\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1120 [2,1] = [](0x0)\n\
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1121 @}\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1122 C =\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1123 @{\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1124 [1,1] = 10\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1125 [2,1] = [](0x0)\n\
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1126 @}\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1127 @end group\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1128 @end example\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1129 \n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1130 If the parameter @var{errfunc} after a further string input argument\n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	1131 @qcode{\"ErrorHandler\"} is another string, a function handle, an inline\n\
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1132 function, or an anonymous function, then @var{errfunc} defines a\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1133 function to call in the case that @var{func} generates an error.\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1134 The definition of the function must be of the form\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1135 \n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1136 @example\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1137 function [@dots{}] = errfunc (@var{s}, @dots{})\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1138 @end example\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1139 \n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1140 @noindent\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1141 where there is an additional input argument to @var{errfunc}\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1142 relative to @var{func}, given by @var{s}. This is a structure with\n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	1143 the elements @qcode{\"identifier\"}, @qcode{\"message\"}, and\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	1144 @qcode{\"index\"} giving, respectively, the error identifier, the error\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	1145 message, and the index of the array elements that caused the error. The\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	1146 size of the output argument of @var{errfunc} must have the same size as the\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17245 diff changeset	1147 output argument of @var{func}, otherwise a real error is thrown. For\n\
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1148 example:\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1149 \n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1150 @example\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1151 @group\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1152 function y = ferr (s, x), y = \"MyString\"; endfunction\n\
14093 050bc580cb60 doc: Various docstring improvements before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 14085 diff changeset	1153 arrayfun (@@str2num, [1234],\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1154 \"UniformOutput\", false, \"ErrorHandler\", @@ferr)\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1155 @result{}\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1156 @{\n\
14093 050bc580cb60 doc: Various docstring improvements before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 14085 diff changeset	1157 [1,1] = MyString\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1158 @}\n\
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1159 @end group\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1160 @end example\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1161 \n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1162 @seealso{spfun, cellfun, structfun}\n\
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1163 @end deftypefn")
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1164 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1165 octave_value_list retval;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1166 int nargin = args.length ();
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1167 int nargout1 = (nargout < 1 ? 1 : nargout);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1168
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1169 if (nargin < 2)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1170 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1171 error_with_id ("Octave:invalid-fun-call",
16010 c5d548e4101f * cellfun.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16004 diff changeset	1172 "arrayfun: function requires at least 2 arguments");
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1173 print_usage ();
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1174 return retval;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1175 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1176
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1177 octave_value func = args(0);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1178 bool symbol_table_lookup = false;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1179
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1180 if (func.is_string ())
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1181 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1182 // See if we can convert the string into a function.
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1183
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1184 std::string name = args(0).string_value ();
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1185
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1186 if (! valid_identifier (name))
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1187 {
18862 6825522c25e4 maint: Use names beginning and ending with "__" for internal only functions. Rik <rik@octave.org> parents: 18812 diff changeset	1188 std::string fcn_name = unique_symbol_name ("__arrayfun_fcn__");
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1189 std::string fname = "function y = " + fcn_name + "(x) y = ";
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1190
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1191 octave_function *ptr_func
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1192 = extract_function (args(0), "arrayfun", fcn_name,
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1193 fname, "; endfunction");
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1194
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1195 if (ptr_func)
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1196 func = octave_value (ptr_func, true);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1197 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1198 else
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1199 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1200 func = symbol_table::find_function (name);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1201
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1202 if (func.is_undefined ())
16003 3b3321f9db9f arrayfun: adding IDs to error messages in accordance with error_ids. Juan Pablo Carbajal <ajuanpi+dev@gmail.com> parents: 15195 diff changeset	1203 error_with_id ("Octave:invalid-input-arg",
16010 c5d548e4101f * cellfun.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16004 diff changeset	1204 "arrayfun: invalid function NAME: %s",
c5d548e4101f * cellfun.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16004 diff changeset	1205 name.c_str ());
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1206
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1207 symbol_table_lookup = true;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1208 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1209 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1210
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1211 if (func.is_function_handle () \|\| func.is_inline_function ()
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1212 \|\| func.is_function ())
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1213 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1214 // The following is an optimisation because the symbol table can
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1215 // give a more specific function class, so this can result in
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1216 // fewer polymorphic function calls as the function gets called
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1217 // for each value of the array.
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1218
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18112 diff changeset	1219 if (! symbol_table_lookup)
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1220 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1221 if (func.is_function_handle ())
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1222 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1223 octave_fcn_handle* f = func.fcn_handle_value ();
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1224
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1225 // Overloaded function handles need to check the type of
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1226 // the arguments for each element of the array, so they
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1227 // cannot be optimised this way.
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1228
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1229 if (f -> is_overloaded ())
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1230 goto nevermind;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1231 }
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1232 octave_value f
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1233 = symbol_table::find_function (func.function_value () -> name ());
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	1234
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1235 if (f.is_defined ())
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1236 func = f;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1237 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1238
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1239 nevermind:
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1240
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1241 bool uniform_output = true;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1242 octave_value error_handler;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1243
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1244 get_mapper_fun_options (args, nargin, uniform_output, error_handler);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1245
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1246 octave_value_list inputlist (nargin, octave_value ());
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1247
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1248 OCTAVE_LOCAL_BUFFER (octave_value, inputs, nargin);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1249 OCTAVE_LOCAL_BUFFER (bool, mask, nargin);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1250
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1251 octave_idx_type k = 1;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1252
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1253 dim_vector fdims (1, 1);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1254
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1255 // Collect arguments. Pre-fill scalar elements of inputlist
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1256 // array.
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1257
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1258 for (int j = 0; j < nargin; j++)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1259 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1260 inputs[j] = args(j+1);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1261 mask[j] = inputs[j].numel () != 1;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1262
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1263 if (! mask[j])
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1264 inputlist(j) = inputs[j];
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1265 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1266
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1267 for (int j = 0; j < nargin; j++)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1268 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1269 if (mask[j])
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1270 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1271 fdims = inputs[j].dims ();
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1272 k = inputs[j].numel ();
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1273
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1274 for (int i = j+1; i < nargin; i++)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1275 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1276 if (mask[i] && inputs[i].dims () != fdims)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1277 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1278 error_with_id ("Octave:invalid-input-arg",
16010 c5d548e4101f * cellfun.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16004 diff changeset	1279 "arrayfun: dimensions mismatch");
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1280 return retval;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1281 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1282 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1283 break;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1284 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1285 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1286
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1287
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1288 unwind_protect frame;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1289 frame.protect_var (buffer_error_messages);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1290
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1291 if (error_handler.is_defined ())
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1292 buffer_error_messages++;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1293
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1294 // Apply functions.
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1295
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1296 if (uniform_output)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1297 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1298 std::list<octave_value_list> idx_list (1);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1299 idx_list.front ().resize (1);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1300 std::string idx_type = "(";
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1301
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1302 OCTAVE_LOCAL_BUFFER (octave_value, retv, nargout1);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1303
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1304 for (octave_idx_type count = 0; count < k; count++)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1305 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1306 idx_list.front ()(0) = count + 1.0;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1307
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1308 for (int j = 0; j < nargin; j++)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1309 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1310 if (mask[j])
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1311 inputlist.xelem (j) = inputs[j].do_index_op (idx_list);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1312 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1313
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1314 const octave_value_list tmp
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1315 = get_output_list (count, nargout, inputlist, func,
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1316 error_handler);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1317
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1318 if (nargout > 0 && tmp.length () < nargout)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1319 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1320 error_with_id ("Octave:invalid-fun-call",
16010 c5d548e4101f * cellfun.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16004 diff changeset	1321 "arrayfun: function returned fewer than nargout values");
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1322 return retval;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1323 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1324
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1325 if (nargout > 0
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1326 \|\| (nargout == 0
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1327 && tmp.length () > 0 && tmp(0).is_defined ()))
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1328 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1329 int num_to_copy = tmp.length ();
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1330
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1331 if (num_to_copy > nargout1)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1332 num_to_copy = nargout1;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1333
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1334 if (count == 0)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1335 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1336 for (int j = 0; j < num_to_copy; j++)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1337 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1338 if (tmp(j).is_defined ())
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1339 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1340 octave_value val = tmp(j);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1341
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1342 if (val.numel () == 1)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1343 retv[j] = val.resize (fdims);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1344 else
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1345 {
16003 3b3321f9db9f arrayfun: adding IDs to error messages in accordance with error_ids. Juan Pablo Carbajal <ajuanpi+dev@gmail.com> parents: 15195 diff changeset	1346 error_with_id ("Octave:invalid-fun-call",
16010 c5d548e4101f * cellfun.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16004 diff changeset	1347 "arrayfun: all values must be scalars when UniformOutput = true");
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1348 break;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1349 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1350 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1351 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1352 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1353 else
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1354 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1355 for (int j = 0; j < num_to_copy; j++)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1356 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1357 if (tmp(j).is_defined ())
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1358 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1359 octave_value val = tmp(j);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1360
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1361 if (! retv[j].fast_elem_insert (count, val))
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1362 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1363 if (val.numel () == 1)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1364 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1365 idx_list.front ()(0) = count + 1.0;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1366 retv[j].assign (octave_value::op_asn_eq,
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1367 idx_type, idx_list, val);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1368 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1369 else
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1370 {
16003 3b3321f9db9f arrayfun: adding IDs to error messages in accordance with error_ids. Juan Pablo Carbajal <ajuanpi+dev@gmail.com> parents: 15195 diff changeset	1371 error_with_id ("Octave:invalid-fun-call",
16010 c5d548e4101f * cellfun.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16004 diff changeset	1372 "arrayfun: all values must be scalars when UniformOutput = true");
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1373 break;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1374 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1375 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1376 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1377 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1378 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1379 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1380 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1381
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1382 retval.resize (nargout1);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1383
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1384 for (int j = 0; j < nargout1; j++)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1385 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1386 if (nargout > 0 && retv[j].is_undefined ())
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1387 retval(j) = NDArray (fdims);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1388 else
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1389 retval(j) = retv[j];
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1390 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1391 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1392 else
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1393 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1394 std::list<octave_value_list> idx_list (1);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1395 idx_list.front ().resize (1);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1396 std::string idx_type = "(";
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1397
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1398 OCTAVE_LOCAL_BUFFER (Cell, results, nargout1);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1399
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1400 for (int j = 0; j < nargout1; j++)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1401 results[j].resize (fdims, Matrix ());
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1402
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1403 bool have_some_output = false;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1404
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1405 for (octave_idx_type count = 0; count < k; count++)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1406 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1407 idx_list.front ()(0) = count + 1.0;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1408
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1409 for (int j = 0; j < nargin; j++)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1410 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1411 if (mask[j])
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1412 inputlist.xelem (j) = inputs[j].do_index_op (idx_list);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1413 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1414
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1415 const octave_value_list tmp
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1416 = get_output_list (count, nargout, inputlist, func,
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1417 error_handler);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1418
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1419 if (nargout > 0 && tmp.length () < nargout)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1420 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1421 error_with_id ("Octave:invalid-fun-call",
16010 c5d548e4101f * cellfun.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16004 diff changeset	1422 "arrayfun: function returned fewer than nargout values");
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1423 return retval;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1424 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1425
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1426 if (nargout > 0
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1427 \|\| (nargout == 0
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1428 && tmp.length () > 0 && tmp(0).is_defined ()))
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1429 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1430 int num_to_copy = tmp.length ();
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1431
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1432 if (num_to_copy > nargout1)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1433 num_to_copy = nargout1;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1434
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1435 if (num_to_copy > 0)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1436 have_some_output = true;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1437
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1438 for (int j = 0; j < num_to_copy; j++)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1439 results[j](count) = tmp(j);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1440 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1441 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1442
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1443 if (have_some_output \|\| fdims.any_zero ())
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1444 {
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1445 retval.resize (nargout1);
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1446
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1447 for (int j = 0; j < nargout1; j++)
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1448 retval(j) = results[j];
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1449 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1450 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1451 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1452 else
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1453 error_with_id ("Octave:invalid-fun-call",
16010 c5d548e4101f * cellfun.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16004 diff changeset	1454 "arrayfun: argument NAME must be a string or function handle");
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1455
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1456 return retval;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1457 }
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1458
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1459 /*
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	1460 %!function r = __f11 (x)
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1461 %! global __arrayfun_test_num_outputs__;
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1462 %! __arrayfun_test_num_outputs__ = nargout;
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1463 %! r = x;
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	1464 %!endfunction
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1465
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	1466 %!function __f01 (x)
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1467 %! global __arrayfun_test_num_outputs__;
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1468 %! __arrayfun_test_num_outputs__ = nargout;
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	1469 %!endfunction
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1470
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1471 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1472 %! global __arrayfun_test_num_outputs__;
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	1473 %! arrayfun (@__f11, {1});
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1474 %! assert (__arrayfun_test_num_outputs__, 0);
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	1475 %! x = arrayfun (@__f11, {1});
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1476 %! assert (__arrayfun_test_num_outputs__, 1);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1477
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1478 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1479 %! global __arrayfun_test_num_outputs__;
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	1480 %! arrayfun (@__f01, {1});
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1481 %! assert (__arrayfun_test_num_outputs__, 0);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1482
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	1483 %!error x = arrayfun (@__f01, [1, 2]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1484
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1485 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1486 %! assert (arrayfun (@__f11, [1, 2]), [1, 2]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1487 %! assert (arrayfun (@__f11, [1, 2], "uniformoutput", false), {1, 2});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1488 %! assert (arrayfun (@__f11, {1, 2}), {1, 2});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1489 %! assert (arrayfun (@__f11, {1, 2}, "uniformoutput", false), {{1}, {2}});
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1490
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1491 %!assert (arrayfun (@ones, 1, [2,3], "uniformoutput", false), {[1,1], [1,1,1]})
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1492
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1493 %% Test function to check the "Errorhandler" option
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1494 %!function z = __arrayfunerror (S, varargin)
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1495 %! z = S;
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 14076 diff changeset	1496 %!endfunction
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1497 %% First input argument can be a string, an inline function, a
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1498 %% function_handle or an anonymous function
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1499 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1500 %! arrayfun (@isequal, [false, true], [true, true]); %% No output argument
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1501 %!error
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1502 %! arrayfun (@isequal); %% One or less input arguments
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1503 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1504 %! A = arrayfun ("isequal", [false, true], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1505 %! assert (A, [false, true]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1506 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1507 %! A = arrayfun (inline ("(x == y)", "x", "y"), [false, true], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1508 %! assert (A, [false, true]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1509 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1510 %! A = arrayfun (@isequal, [false, true], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1511 %! assert (A, [false, true]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1512 %!test
14854 5ae9f0f77635 maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1513 %! A = arrayfun (@(x,y) isequal (x,y), [false, true], [true, true]);
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1514 %! assert (A, [false, true]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1515
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1516 %% Number of input and output arguments may be greater than one
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1517 %#!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1518 %! A = arrayfun (@(x) islogical (x), false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1519 %! assert (A, true);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1520 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1521 %! A = arrayfun (@(x,y,z) x + y + z, [1, 1, 1], [2, 2, 2], [3, 4, 5]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1522 %! assert (A, [6, 7, 8], 1e-16);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1523 %!test %% Two input arguments of different types
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1524 %! A = arrayfun (@(x,y) islogical (x) && ischar (y), false, "a");
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1525 %! assert (A, true);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1526 %!test %% Pass another variable to the anonymous function
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1527 %! y = true;
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1528 %! A = arrayfun (@(x) islogical (x && y), false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1529 %! assert (A, true);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1530 %!test %% Three ouptut arguments of different type
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1531 %! [A, B, C] = arrayfun (@find, [10, 11; 0, 12], "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1532 %! assert (isequal (A, {true, true; [], true}));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1533 %! assert (isequal (B, {true, true; [], true}));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1534 %! assert (isequal (C, {10, 11; [], 12}));
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1535
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1536 %% Input arguments can be of type logical
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1537 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1538 %! A = arrayfun (@(x,y) x == y, [false, true], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1539 %! assert (A, [false, true]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1540 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1541 %! A = arrayfun (@(x,y) x == y, [false; true], [true; true], "UniformOutput", true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1542 %! assert (A, [false; true]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1543 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1544 %! A = arrayfun (@(x) x, [false, true, false, true], "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1545 %! assert (A, {false, true, false, true});
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1546 %!test %% Three ouptut arguments of same type
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1547 %! [A, B, C] = arrayfun (@find, [true, false; false, true], "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1548 %! assert (isequal (A, {true, []; [], true}));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1549 %! assert (isequal (B, {true, []; [], true}));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1550 %! assert (isequal (C, {true, []; [], true}));
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1551 %!test
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	1552 %! A = arrayfun (@(x,y) array2str (x,y), true, true, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1553 %! "ErrorHandler", @__arrayfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1554 %! assert (isfield (A, "identifier"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1555 %! assert (isfield (A, "message"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1556 %! assert (isfield (A, "index"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1557 %! assert (isempty (A.message), false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1558 %! assert (A.index, 1);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1559 %!test %% Overwriting setting of "UniformOutput" true
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	1560 %! A = arrayfun (@(x,y) array2str (x,y), true, true, "UniformOutput", true, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1561 %! "ErrorHandler", @__arrayfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1562 %! assert (isfield (A, "identifier"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1563 %! assert (isfield (A, "message"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1564 %! assert (isfield (A, "index"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1565 %! assert (isempty (A.message), false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1566 %! assert (A.index, 1);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1567
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1568 %% Input arguments can be of type numeric
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1569 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1570 %! A = arrayfun (@(x,y) x>y, [1.1, 4.2], [3.1, 2+3*i]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1571 %! assert (A, [false, true]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1572 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1573 %! A = arrayfun (@(x,y) x>y, [1.1, 4.2; 2, 4], [3.1, 2; 2, 4+2*i], "UniformOutput", true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1574 %! assert (A, [false, true; false, false]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1575 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1576 %! A = arrayfun (@(x,y) x:y, [1.1, 4], [3.1, 6], "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1577 %! assert (isequal (A{1}, [1.1, 2.1, 3.1]));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1578 %! assert (isequal (A{2}, [4, 5, 6]));
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1579 %!test %% Three ouptut arguments of different type
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1580 %! [A, B, C] = arrayfun (@find, [10, 11; 0, 12], "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1581 %! assert (isequal (A, {true, true; [], true}));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1582 %! assert (isequal (B, {true, true; [], true}));
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1583 %! assert (isequal (C, {10, 11; [], 12}));
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1584 %!test
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	1585 %! A = arrayfun (@(x,y) array2str (x,y), {1.1, 4}, {3.1, 6}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1586 %! "ErrorHandler", @__arrayfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1587 %! B = isfield (A(1), "message") && isfield (A(1), "index");
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1588 %! assert ([(isfield (A(1), "identifier")), (isfield (A(2), "identifier"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1589 %! assert ([(isfield (A(1), "message")), (isfield (A(2), "message"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1590 %! assert ([(isfield (A(1), "index")), (isfield (A(2), "index"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1591 %! assert ([(isempty (A(1).message)), (isempty (A(2).message))], [false, false]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1592 %! assert ([A(1).index, A(2).index], [1, 2]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1593 %!test %% Overwriting setting of "UniformOutput" true
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	1594 %! A = arrayfun (@(x,y) array2str (x,y), {1.1, 4}, {3.1, 6}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1595 %! "UniformOutput", true, "ErrorHandler", @__arrayfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1596 %! B = isfield (A(1), "message") && isfield (A(1), "index");
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1597 %! assert ([(isfield (A(1), "identifier")), (isfield (A(2), "identifier"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1598 %! assert ([(isfield (A(1), "message")), (isfield (A(2), "message"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1599 %! assert ([(isfield (A(1), "index")), (isfield (A(2), "index"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1600 %! assert ([(isempty (A(1).message)), (isempty (A(2).message))], [false, false]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1601 %! assert ([A(1).index, A(2).index], [1, 2]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1602
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1603 %% Input arguments can be of type character or strings
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1604 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1605 %! A = arrayfun (@(x,y) x>y, ["ad", "c", "ghi"], ["cc", "d", "fgh"]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1606 %! assert (A, [false, true, false, true, true, true]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1607 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1608 %! A = arrayfun (@(x,y) x>y, ["a"; "f"], ["c"; "d"], "UniformOutput", true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1609 %! assert (A, [false; true]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1610 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1611 %! A = arrayfun (@(x,y) x:y, ["a", "d"], ["c", "f"], "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1612 %! assert (A, {"abc", "def"});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1613 %!test
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	1614 %! A = arrayfun (@(x,y) cell2str (x,y), ["a", "d"], ["c", "f"], ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1615 %! "ErrorHandler", @__arrayfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1616 %! B = isfield (A(1), "identifier") && isfield (A(1), "message") && isfield (A(1), "index");
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1617 %! assert (B, true);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1618
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1619 %% Input arguments can be of type structure
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1620 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1621 %! a = struct ("a", 1.1, "b", 4.2); b = struct ("a", 3.1, "b", 2);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1622 %! A = arrayfun (@(x,y) (x.a < y.a) && (x.b > y.b), a, b);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1623 %! assert (A, true);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1624 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1625 %! a = struct ("a", 1.1, "b", 4.2); b = struct ("a", 3.1, "b", 2);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1626 %! A = arrayfun (@(x,y) (x.a < y.a) && (x.b > y.b), a, b, "UniformOutput", true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1627 %! assert (A, true);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1628 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1629 %! a = struct ("a", 1.1, "b", 4.2); b = struct ("a", 3.1, "b", 2);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1630 %! A = arrayfun (@(x,y) x.a:y.a, a, b, "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1631 %! assert (isequal (A, {[1.1, 2.1, 3.1]}));
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1632 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1633 %! A = arrayfun (@(x) mat2str(x), "a", "ErrorHandler", @__arrayfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1634 %! assert (isfield (A, "identifier"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1635 %! assert (isfield (A, "message"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1636 %! assert (isfield (A, "index"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1637 %! assert (isempty (A.message), false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1638 %! assert (A.index, 1);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1639 %!test %% Overwriting setting of "UniformOutput" true
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	1640 %! A = arrayfun (@(x) mat2str(x), "a", "UniformOutput", true, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1641 %! "ErrorHandler", @__arrayfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1642 %! assert (isfield (A, "identifier"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1643 %! assert (isfield (A, "message"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1644 %! assert (isfield (A, "index"), true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1645 %! assert (isempty (A.message), false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1646 %! assert (A.index, 1);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1647
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1648 %% Input arguments can be of type cell array
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1649 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1650 %! A = arrayfun (@(x,y) x{1} < y{1}, {1.1, 4.2}, {3.1, 2});
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1651 %! assert (A, [true, false]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1652 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1653 %! A = arrayfun (@(x,y) x{1} < y{1}, {1.1; 4.2}, {3.1; 2}, "UniformOutput", true);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1654 %! assert (A, [true; false]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1655 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1656 %! A = arrayfun (@(x,y) x{1} < y{1}, {1.1, 4.2}, {3.1, 2}, "UniformOutput", false);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1657 %! assert (A, {true, false});
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1658 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1659 %! A = arrayfun (@(x,y) num2str(x,y), {1.1, 4.2}, {3.1, 2}, "ErrorHandler", @__arrayfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1660 %! assert ([(isfield (A(1), "identifier")), (isfield (A(2), "identifier"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1661 %! assert ([(isfield (A(1), "message")), (isfield (A(2), "message"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1662 %! assert ([(isfield (A(1), "index")), (isfield (A(2), "index"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1663 %! assert ([(isempty (A(1).message)), (isempty (A(2).message))], [false, false]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1664 %! assert ([A(1).index, A(2).index], [1, 2]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1665 %!test
17245 7babcdb9bc13 Use ... instead of \ for line continuation marker. Stefan Mahr <dac922@gmx.de> parents: 17199 diff changeset	1666 %! A = arrayfun (@(x,y) num2str (x,y), {1.1, 4.2}, {3.1, 2}, ...
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1667 %! "UniformOutput", true, "ErrorHandler", @__arrayfunerror);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1668 %! assert ([(isfield (A(1), "identifier")), (isfield (A(2), "identifier"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1669 %! assert ([(isfield (A(1), "message")), (isfield (A(2), "message"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1670 %! assert ([(isfield (A(1), "index")), (isfield (A(2), "index"))], [true, true]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1671 %! assert ([(isempty (A(1).message)), (isempty (A(2).message))], [false, false]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1672 %! assert ([A(1).index, A(2).index], [1, 2]);
13234 e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1673 */
e066d173aae6 improve compatibility of arrayfun for nargout = 0 case John W. Eaton <jwe@octave.org> parents: 13231 diff changeset	1674
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1675 static void
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1676 do_num2cell_helper (const dim_vector& dv,
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1677 const Array<int>& dimv,
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1678 dim_vector& celldv, dim_vector& arraydv,
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1679 Array<int>& perm)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1680 {
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20172 diff changeset	1681 int dvl = dimv.numel ();
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1682 int maxd = dv.length ();
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1683 celldv = dv;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1684 for (int i = 0; i < dvl; i++)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1685 maxd = std::max (maxd, dimv(i));
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1686 if (maxd > dv.length ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1687 celldv.resize (maxd, 1);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1688 arraydv = celldv;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1689
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1690 OCTAVE_LOCAL_BUFFER_INIT (bool, sing, maxd, false);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1691
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10291 diff changeset	1692 perm.clear (maxd, 1);
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1693 for (int i = 0; i < dvl; i++)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1694 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1695 int k = dimv(i) - 1;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1696 if (k < 0)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1697 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1698 error ("num2cell: dimension indices must be positive");
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1699 return;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1700 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1701 else if (i > 0 && k < dimv(i-1) - 1)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1702 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1703 error ("num2cell: dimension indices must be strictly increasing");
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1704 return;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1705 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1706
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1707 sing[k] = true;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1708 perm(i) = k;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1709 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1710
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1711 for (int k = 0, i = dvl; k < maxd; k++)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1712 if (! sing[k])
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1713 perm(i++) = k;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1714
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1715 for (int i = 0; i < maxd; i++)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1716 if (sing[i])
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1717 celldv(i) = 1;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1718 else
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1719 arraydv(i) = 1;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1720 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1721
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1722 template<class NDA>
10756 d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1723 static inline typename NDA::element_type
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1724 do_num2cell_elem (const NDA& array, octave_idx_type i)
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1725 { return array(i); }
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1726
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1727 static inline Cell
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1728 do_num2cell_elem (const Cell& array, octave_idx_type i)
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1729 { return Cell (array(i)); }
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1730
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1731
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1732 template<class NDA>
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1733 static Cell
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1734 do_num2cell (const NDA& array, const Array<int>& dimv)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1735 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1736 if (dimv.is_empty ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1737 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1738 Cell retval (array.dims ());
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1739 octave_idx_type nel = array.numel ();
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1740 for (octave_idx_type i = 0; i < nel; i++)
10756 d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1741 retval.xelem (i) = do_num2cell_elem (array, i);
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1742
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1743 return retval;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1744 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1745 else
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1746 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1747 dim_vector celldv, arraydv;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1748 Array<int> perm;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1749 do_num2cell_helper (array.dims (), dimv, celldv, arraydv, perm);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1750
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1751 NDA parray = array.permute (perm);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1752
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17893 diff changeset	1753 octave_idx_type nela = arraydv.numel ();
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17893 diff changeset	1754 octave_idx_type nelc = celldv.numel ();
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1755 parray = parray.reshape (dim_vector (nela, nelc));
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1756
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1757 Cell retval (celldv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1758 for (octave_idx_type i = 0; i < nelc; i++)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1759 {
9731 7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	1760 retval.xelem (i) = NDA (parray.column (i).reshape (arraydv));
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1761 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1762
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1763 return retval;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1764 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1765 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1766
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1767 // FIXME: this is a mess, but if a size method for the object exists,
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1768 // we have to call it to get the size of the object instead of using the
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1769 // internal dims method.
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1770
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1771 static dim_vector
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1772 get_object_dims (octave_value& obj)
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1773 {
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1774 dim_vector retval;
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1775
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1776 Matrix m = obj.size ();
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1777
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1778 int n = m.numel ();
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1779
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1780 retval.resize (n);
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1781
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1782 for (int i = 0; i < n; i++)
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1783 retval(i) = m(i);
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1784
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1785 return retval;
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1786 }
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1787
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1788 static Cell
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1789 do_object2cell (const octave_value& obj, const Array<int>& dimv)
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1790 {
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1791 Cell retval;
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1792
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1793 // FIXME: this copy is only needed because the octave_value::size
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1794 // method is not const.
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1795 octave_value array = obj;
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1796
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1797 if (dimv.is_empty ())
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1798 {
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1799 dim_vector dv = get_object_dims (array);
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1800
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1801 retval.resize (dv);
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1802
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1803 octave_value_list idx (1);
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1804
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1805 for (octave_idx_type i = 0; i < dv.numel (); i++)
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1806 {
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1807 octave_quit ();
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1808
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1809 idx(0) = double (i+1);
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1810
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1811 retval.xelem (i) = array.single_subsref ("(", idx);
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1812 }
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1813 }
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1814 else
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1815 {
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1816 error ("num2cell (A, dim) not implemented for class objects");
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1817 }
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1818
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1819 return retval;
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1820 }
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1821
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	1822 DEFUN (num2cell, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1823 "-- texinfo --\n\
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	1824 @deftypefn {Built-in Function} {@var{C} =} num2cell (@var{A})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	1825 @deftypefnx {Built-in Function} {@var{C} =} num2cell (@var{A}, @var{dim})\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1826 Convert the numeric matrix @var{A} to a cell array.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1827 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1828 If @var{dim} is defined, the value @var{C} is of dimension 1 in this\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1829 dimension and the elements of @var{A} are placed into @var{C} in slices.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	1830 For example:\n\
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	1831 \n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	1832 @example\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	1833 @group\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1834 num2cell ([1,2;3,4])\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1835 @result{}\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1836 @{\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1837 [1,1] = 1\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1838 [2,1] = 3\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1839 [1,2] = 2\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1840 [2,2] = 4\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1841 @}\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1842 num2cell ([1,2;3,4],1)\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1843 @result{}\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1844 @{\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1845 [1,1] =\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1846 1\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1847 3\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1848 [1,2] =\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1849 2\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1850 4\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1851 @}\n\
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	1852 @end group\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	1853 @end example\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	1854 \n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5544 diff changeset	1855 @seealso{mat2cell}\n\
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1856 @end deftypefn")
5451 ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1857 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14501 diff changeset	1858 int nargin = args.length ();
5451 ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1859 octave_value retval;
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1860
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1861 if (nargin < 1 \|\| nargin > 2)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5784 diff changeset	1862 print_usage ();
5451 ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1863 else
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1864 {
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1865 octave_value array = args(0);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1866 Array<int> dimv;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1867 if (nargin > 1)
18112 b560bac0fca2 maint: Don't use space between 'args' and '(' when doing indexing. Rik <rik@octave.org> parents: 18100 diff changeset	1868 dimv = args(1).int_vector_value (true);
5451 ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1869
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1870 if (array.is_bool_type ())
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1871 retval = do_num2cell (array.bool_array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1872 else if (array.is_char_matrix ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1873 retval = do_num2cell (array.char_array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1874 else if (array.is_numeric_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1875 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1876 if (array.is_integer_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1877 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1878 if (array.is_int8_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1879 retval = do_num2cell (array.int8_array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1880 else if (array.is_int16_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1881 retval = do_num2cell (array.int16_array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1882 else if (array.is_int32_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1883 retval = do_num2cell (array.int32_array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1884 else if (array.is_int64_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1885 retval = do_num2cell (array.int64_array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1886 else if (array.is_uint8_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1887 retval = do_num2cell (array.uint8_array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1888 else if (array.is_uint16_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1889 retval = do_num2cell (array.uint16_array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1890 else if (array.is_uint32_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1891 retval = do_num2cell (array.uint32_array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1892 else if (array.is_uint64_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1893 retval = do_num2cell (array.uint64_array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1894 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1895 else if (array.is_complex_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1896 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1897 if (array.is_single_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1898 retval = do_num2cell (array.float_complex_array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1899 else
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1900 retval = do_num2cell (array.complex_array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1901 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1902 else
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1903 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1904 if (array.is_single_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1905 retval = do_num2cell (array.float_array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1906 else
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1907 retval = do_num2cell (array.array_value (), dimv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1908 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1909 }
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1910 else if (array.is_object ())
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1911 retval = do_object2cell (array, dimv);
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1912 else if (array.is_map ())
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13329 diff changeset	1913 retval = do_num2cell (array.map_value (), dimv);
10756 d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1914 else if (array.is_cell ())
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1915 retval = do_num2cell (array.cell_value (), dimv);
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1916 else
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1917 gripe_wrong_type_arg ("num2cell", array);
5451 ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1918 }
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1919
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1920 return retval;
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1921 }
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1922
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	1923 /*
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1924 %!assert (num2cell ([1,2;3,4]), {1,2;3,4})
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1925 %!assert (num2cell ([1,2;3,4], 1), {[1;3],[2;4]})
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	1926 %!assert (num2cell ([1,2;3,4], 2), {[1,2];[3,4]})
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	1927 */
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	1928
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1929 static bool
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1930 mat2cell_mismatch (const dim_vector& dv,
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1931 const Array<octave_idx_type> *d, int nd)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1932 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1933 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1934 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1935 octave_idx_type s = 0;
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20172 diff changeset	1936 for (octave_idx_type j = 0; j < d[i].numel (); j++)
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1937 s += d[i](j);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1938
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1939 octave_idx_type r = i < dv.length () ? dv(i) : 1;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1940
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1941 if (s != r)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1942 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1943 error ("mat2cell: mismatch on %d-th dimension (%d != %d)",
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1944 i+1, r, s);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1945 return true;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1946 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1947 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1948
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1949 return false;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1950 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1951
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1952 template<class container>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1953 static void
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1954 prepare_idx (container *idx, int idim, int nd,
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1955 const Array<octave_idx_type>* d)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1956 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1957 octave_idx_type nidx = idim < nd ? d[idim].numel () : 1;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1958 if (nidx == 1)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1959 idx[0] = idx_vector::colon;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1960 else
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1961 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1962 octave_idx_type l = 0;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1963 for (octave_idx_type i = 0; i < nidx; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1964 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1965 octave_idx_type u = l + d[idim](i);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1966 idx[i] = idx_vector (l, u);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1967 l = u;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1968 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1969 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1970 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1971
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1972 // 2D specialization, works for Array, Sparse and octave_map.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1973 // Uses 1D or 2D indexing.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1974
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1975 template <class Array2D>
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1976 static Cell
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1977 do_mat2cell_2d (const Array2D& a, const Array<octave_idx_type> *d, int nd)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1978 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1979 NoAlias<Cell> retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1980 assert (nd == 1 \|\| nd == 2);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1981 assert (a.ndims () == 2);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1982
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1983 if (mat2cell_mismatch (a.dims (), d, nd))
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1984 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1985
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20172 diff changeset	1986 octave_idx_type nridx = d[0].numel ();
a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20172 diff changeset	1987 octave_idx_type ncidx = nd == 1 ? 1 : d[1].numel ();
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1988 retval.clear (nridx, ncidx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1989
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1990 int ivec = -1;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1991 if (a.rows () > 1 && a.cols () == 1 && ncidx == 1)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1992 ivec = 0;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1993 else if (a.rows () == 1 && nridx == 1 && nd == 2)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1994 ivec = 1;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1995
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1996 if (ivec >= 0)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1997 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1998 // Vector split. Use 1D indexing.
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17893 diff changeset	1999 octave_idx_type l = 0;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17893 diff changeset	2000 octave_idx_type nidx = (ivec == 0 ? nridx : ncidx);
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2001 for (octave_idx_type i = 0; i < nidx; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2002 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2003 octave_idx_type u = l + d[ivec](i);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2004 retval(i) = a.index (idx_vector (l, u));
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2005 l = u;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2006 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2007 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2008 else
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2009 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2010 // General 2D case. Use 2D indexing.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2011 OCTAVE_LOCAL_BUFFER (idx_vector, ridx, nridx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2012 prepare_idx (ridx, 0, nd, d);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2013
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2014 OCTAVE_LOCAL_BUFFER (idx_vector, cidx, ncidx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2015 prepare_idx (cidx, 1, nd, d);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2016
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2017 for (octave_idx_type j = 0; j < ncidx; j++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2018 for (octave_idx_type i = 0; i < nridx; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2019 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2020 octave_quit ();
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2021
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2022 retval(i,j) = a.index (ridx[i], cidx[j]);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2023 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2024 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2025
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2026 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2027 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2028
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2029 // Nd case. Works for Arrays and octave_map.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2030 // Uses Nd indexing.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2031
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2032 template <class ArrayND>
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2033 Cell
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2034 do_mat2cell_nd (const ArrayND& a, const Array<octave_idx_type> *d, int nd)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2035 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2036 NoAlias<Cell> retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2037 assert (nd >= 1);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2038
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2039 if (mat2cell_mismatch (a.dims (), d, nd))
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2040 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2041
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2042 dim_vector rdv = dim_vector::alloc (nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2043 OCTAVE_LOCAL_BUFFER (octave_idx_type, nidx, nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2044 octave_idx_type idxtot = 0;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2045 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2046 {
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20172 diff changeset	2047 rdv(i) = nidx[i] = d[i].numel ();
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2048 idxtot += nidx[i];
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2049 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2050
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2051 retval.clear (rdv);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2052
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2053 OCTAVE_LOCAL_BUFFER (idx_vector, xidx, idxtot);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2054 OCTAVE_LOCAL_BUFFER (idx_vector *, idx, nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2055
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2056 idxtot = 0;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2057 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2058 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2059 idx[i] = xidx + idxtot;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2060 prepare_idx (idx[i], i, nd, d);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2061 idxtot += nidx[i];
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2062 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2063
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2064 OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, ridx, nd, 0);
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	2065 NoAlias< Array<idx_vector> > ra_idx
57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	2066 (dim_vector (1, std::max (nd, a.ndims ())), idx_vector::colon);
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2067
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2068 for (octave_idx_type j = 0; j < retval.numel (); j++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2069 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2070 octave_quit ();
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2071
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2072 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2073 ra_idx(i) = idx[i][ridx[i]];
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2074
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2075 retval(j) = a.index (ra_idx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2076
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2077 rdv.increment_index (ridx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2078 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2079
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2080 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2081 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2082
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2083 // Dispatcher.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2084 template <class ArrayND>
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2085 Cell
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2086 do_mat2cell (const ArrayND& a, const Array<octave_idx_type> *d, int nd)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2087 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2088 if (a.ndims () == 2 && nd <= 2)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2089 return do_mat2cell_2d (a, d, nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2090 else
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2091 return do_mat2cell_nd (a, d, nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2092 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2093
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2094 // General case. Works for any class supporting do_index_op.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2095 // Uses Nd indexing.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2096
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2097 Cell
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2098 do_mat2cell (octave_value& a, const Array<octave_idx_type> *d, int nd)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2099 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2100 NoAlias<Cell> retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2101 assert (nd >= 1);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2102
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2103 if (mat2cell_mismatch (a.dims (), d, nd))
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2104 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2105
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2106 dim_vector rdv = dim_vector::alloc (nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2107 OCTAVE_LOCAL_BUFFER (octave_idx_type, nidx, nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2108 octave_idx_type idxtot = 0;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2109 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2110 {
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20172 diff changeset	2111 rdv(i) = nidx[i] = d[i].numel ();
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2112 idxtot += nidx[i];
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2113 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2114
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2115 retval.clear (rdv);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2116
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2117 OCTAVE_LOCAL_BUFFER (octave_value, xidx, idxtot);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2118 OCTAVE_LOCAL_BUFFER (octave_value *, idx, nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2119
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2120 idxtot = 0;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2121 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2122 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2123 idx[i] = xidx + idxtot;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2124 prepare_idx (idx[i], i, nd, d);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2125 idxtot += nidx[i];
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2126 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2127
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2128 OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, ridx, nd, 0);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	2129 octave_value_list ra_idx (std::max (nd, a.ndims ()),
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2130 octave_value::magic_colon_t);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2131
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2132 for (octave_idx_type j = 0; j < retval.numel (); j++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2133 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2134 octave_quit ();
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2135
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2136 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2137 ra_idx(i) = idx[i][ridx[i]];
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2138
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2139 retval(j) = a.do_index_op (ra_idx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2140
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2141 rdv.increment_index (ridx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2142 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2143
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2144 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2145 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2146
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	2147 DEFUN (mat2cell, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2148 "-- texinfo --\n\
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	2149 @deftypefn {Built-in Function} {@var{C} =} mat2cell (@var{A}, @var{m}, @var{n})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	2150 @deftypefnx {Built-in Function} {@var{C} =} mat2cell (@var{A}, @var{d1}, @var{d2}, @dots{})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	2151 @deftypefnx {Built-in Function} {@var{C} =} mat2cell (@var{A}, @var{r})\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	2152 Convert the matrix @var{A} to a cell array.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	2153 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	2154 If @var{A} is 2-D, then it is required that\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	2155 @code{sum (@var{m}) == size (@var{A}, 1)} and\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	2156 @code{sum (@var{n}) == size (@var{A}, 2)}. Similarly, if @var{A} is\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	2157 multi-dimensional and the number of dimensional arguments is equal to the\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	2158 dimensions of @var{A}, then it is required that\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	2159 @code{sum (@var{di}) == size (@var{A}, i)}.\n\
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2160 \n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2161 Given a single dimensional argument @var{r}, the other dimensional\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	2162 arguments are assumed to equal @code{size (@var{A},@var{i})}.\n\
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2163 \n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2164 An example of the use of mat2cell is\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2165 \n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2166 @example\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2167 mat2cell (reshape (1:16,4,4), [3,1], [3,1])\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2168 @result{}\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2169 @{\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2170 [1,1] =\n\
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2171 \n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2172 1 5 9\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2173 2 6 10\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2174 3 7 11\n\
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2175 \n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2176 [2,1] =\n\
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2177 \n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2178 4 8 12\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2179 \n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2180 [1,2] =\n\
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2181 \n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2182 13\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2183 14\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2184 15\n\
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2185 \n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2186 [2,2] = 16\n\
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2187 @}\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2188 @end example\n\
5829 93785a1b0f97 [project @ 2006-05-23 18:34:10 by jwe] jwe parents: 5823 diff changeset	2189 @seealso{num2cell, cell2mat}\n\
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2190 @end deftypefn")
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2191 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14501 diff changeset	2192 int nargin = args.length ();
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2193 octave_value retval;
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2194
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2195 if (nargin < 2)
7038 4482ba9814b7 [project @ 2007-10-19 16:05:48 by jwe] jwe parents: 7017 diff changeset	2196 print_usage ();
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2197 else
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2198 {
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2199 // Prepare indices.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2200 OCTAVE_LOCAL_BUFFER (Array<octave_idx_type>, d, nargin-1);
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2201
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2202 for (int i = 1; i < nargin; i++)
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2203 d[i-1] = args(i).octave_idx_type_vector_value (true);
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2204
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2205 octave_value a = args(0);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2206 bool sparse = a.is_sparse_type ();
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2207 if (sparse && nargin > 3)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2208 {
17199 9deb214ae9d5 Use 2-D, not 2D, in error messages. Rik <rik@octave.org> parents: 17170 diff changeset	2209 error ("mat2cell: sparse arguments only support 2-D indexing");
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2210 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2211 }
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2212
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2213 switch (a.builtin_type ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10125 diff changeset	2214 {
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2215 case btyp_double:
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2216 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2217 if (sparse)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2218 retval = do_mat2cell_2d (a.sparse_matrix_value (), d, nargin-1);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2219 else
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2220 retval = do_mat2cell (a.array_value (), d, nargin - 1);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2221 break;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2222 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2223 case btyp_complex:
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2224 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2225 if (sparse)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2226 retval = do_mat2cell_2d (a.sparse_complex_matrix_value (), d,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2227 nargin-1);
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2228 else
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2229 retval = do_mat2cell (a.complex_array_value (), d, nargin - 1);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2230 break;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2231 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2232 #define BTYP_BRANCH(X,Y) \
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2233 case btyp_ ## X: \
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2234 retval = do_mat2cell (a.Y ## _value (), d, nargin - 1); \
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2235 break
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2236
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2237 BTYP_BRANCH (float, float_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2238 BTYP_BRANCH (float_complex, float_complex_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2239 BTYP_BRANCH (bool, bool_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2240 BTYP_BRANCH (char, char_array);
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2241
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2242 BTYP_BRANCH (int8, int8_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2243 BTYP_BRANCH (int16, int16_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2244 BTYP_BRANCH (int32, int32_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2245 BTYP_BRANCH (int64, int64_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2246 BTYP_BRANCH (uint8, uint8_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2247 BTYP_BRANCH (uint16, uint16_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2248 BTYP_BRANCH (uint32, uint32_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2249 BTYP_BRANCH (uint64, uint64_array);
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2250
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2251 BTYP_BRANCH (cell, cell);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2252 BTYP_BRANCH (struct, map);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2253 #undef BTYP_BRANCH
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2254
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2255 case btyp_func_handle:
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2256 gripe_wrong_type_arg ("mat2cell", a);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2257 break;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2258 default:
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	2259 retval = do_mat2cell (a, d, nargin-1);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10125 diff changeset	2260 }
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2261 }
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2262
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2263 return retval;
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2264 }
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2265
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2266 /*
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	2267 %!test
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	2268 %! x = reshape (1:20, 5, 4);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	2269 %! c = mat2cell (x, [3,2], [3,1]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	2270 %! assert (c, {[1,6,11;2,7,12;3,8,13],[16;17;18];[4,9,14;5,10,15],[19;20]});
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2271
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2272 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	2273 %! x = "abcdefghij";
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	2274 %! c = mat2cell (x, 1, [0,4,2,0,4,0]);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	2275 %! empty1by0str = resize ("", 1, 0);
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	2276 %! assert (c, {empty1by0str,"abcd","ef",empty1by0str,"ghij",empty1by0str});
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	2277 */
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2278
9740 78ac37d73557 fix cellslices to handle empty ranges with non-positive bounds Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2279 // FIXME: it would be nice to allow ranges being handled without a conversion.
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2280 template <class NDA>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	2281 static Cell
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	2282 do_cellslices_nda (const NDA& array,
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	2283 const Array<octave_idx_type>& lb,
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2284 const Array<octave_idx_type>& ub,
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2285 int dim = -1)
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2286 {
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20172 diff changeset	2287 octave_idx_type n = lb.numel ();
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2288 Cell retval (1, n);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	2289 if (array.is_vector () && (dim == -1
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	2290 \|\| (dim == 0 && array.columns () == 1)
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2291 \|\| (dim == 1 && array.rows () == 1)))
9057 8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	2292 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2293 for (octave_idx_type i = 0; i < n; i++)
9740 78ac37d73557 fix cellslices to handle empty ranges with non-positive bounds Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2294 retval(i) = array.index (idx_vector (lb(i) - 1, ub(i)));
9057 8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	2295 }
8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	2296 else
8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	2297 {
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2298 const dim_vector dv = array.dims ();
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2299 int ndims = dv.length ();
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2300 if (dim < 0)
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2301 dim = dv.first_non_singleton ();
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2302 ndims = std::max (ndims, dim + 1);
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2303
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	2304 Array<idx_vector> idx (dim_vector (ndims, 1), idx_vector::colon);
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2305
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2306 for (octave_idx_type i = 0; i < n; i++)
9057 8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	2307 {
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2308 idx(dim) = idx_vector (lb(i) - 1, ub(i));
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2309 retval(i) = array.index (idx);
9057 8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	2310 }
8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	2311 }
8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	2312
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2313 return retval;
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2314 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2315
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	2316 DEFUN (cellslices, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2317 "-- texinfo --\n\
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	2318 @deftypefn {Built-in Function} {@var{sl} =} cellslices (@var{x}, @var{lb}, @var{ub}, @var{dim})\n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	2319 Given an array @var{x}, this function produces a cell array of slices from\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	2320 the array determined by the index vectors @var{lb}, @var{ub}, for lower and\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	2321 upper bounds, respectively.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	2322 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	2323 In other words, it is equivalent to the following code:\n\
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2324 \n\
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2325 @example\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 9057 diff changeset	2326 @group\n\
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2327 n = length (lb);\n\
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2328 sl = cell (1, n);\n\
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2329 for i = 1:length (lb)\n\
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2330 sl@{i@} = x(:,@dots{},lb(i):ub(i),@dots{},:);\n\
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2331 endfor\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 9057 diff changeset	2332 @end group\n\
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2333 @end example\n\
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2334 \n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	2335 The position of the index is determined by @var{dim}. If not specified,\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	2336 slicing is done along the first non-singleton dimension.\n\
13928 2892fd834446 doc: Update seealso references for cellslices and cellindexmat Rik <octave@nomad.inbox5.com> parents: 13695 diff changeset	2337 @seealso{cell2mat, cellindexmat, cellfun}\n\
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2338 @end deftypefn")
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2339 {
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2340 octave_value retval;
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2341 int nargin = args.length ();
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2342 if (nargin == 3 \|\| nargin == 4)
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2343 {
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2344 octave_value x = args(0);
9740 78ac37d73557 fix cellslices to handle empty ranges with non-positive bounds Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2345 Array<octave_idx_type> lb = args(1).octave_idx_type_vector_value ();
78ac37d73557 fix cellslices to handle empty ranges with non-positive bounds Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2346 Array<octave_idx_type> ub = args(2).octave_idx_type_vector_value ();
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2347 int dim = -1;
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2348 if (nargin == 4)
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2349 {
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2350 dim = args(3).int_value () - 1;
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2351 if (dim < 0)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	2352 error ("cellslices: DIM must be a valid dimension");
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2353 }
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2354
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2355 if (lb.numel () != ub.numel ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2356 error ("cellslices: the lengths of LB and UB must match");
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2357 else
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2358 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2359 Cell retcell;
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2360 if (! x.is_sparse_type () && x.is_matrix_type ())
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2361 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2362 // specialize for some dense arrays.
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2363 if (x.is_bool_type ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2364 retcell = do_cellslices_nda (x.bool_array_value (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2365 lb, ub, dim);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2366 else if (x.is_char_matrix ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2367 retcell = do_cellslices_nda (x.char_array_value (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2368 lb, ub, dim);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2369 else if (x.is_integer_type ())
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2370 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2371 if (x.is_int8_type ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2372 retcell = do_cellslices_nda (x.int8_array_value (),
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2373 lb, ub, dim);
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2374 else if (x.is_int16_type ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2375 retcell = do_cellslices_nda (x.int16_array_value (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2376 lb, ub, dim);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2377 else if (x.is_int32_type ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2378 retcell = do_cellslices_nda (x.int32_array_value (),
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2379 lb, ub, dim);
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2380 else if (x.is_int64_type ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2381 retcell = do_cellslices_nda (x.int64_array_value (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2382 lb, ub, dim);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2383 else if (x.is_uint8_type ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2384 retcell = do_cellslices_nda (x.uint8_array_value (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2385 lb, ub, dim);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2386 else if (x.is_uint16_type ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2387 retcell = do_cellslices_nda (x.uint16_array_value (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2388 lb, ub, dim);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2389 else if (x.is_uint32_type ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2390 retcell = do_cellslices_nda (x.uint32_array_value (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2391 lb, ub, dim);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2392 else if (x.is_uint64_type ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2393 retcell = do_cellslices_nda (x.uint64_array_value (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2394 lb, ub, dim);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2395 }
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2396 else if (x.is_complex_type ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2397 {
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2398 if (x.is_single_type ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2399 retcell = do_cellslices_nda (x.float_complex_array_value (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2400 lb, ub, dim);
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2401 else
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2402 retcell = do_cellslices_nda (x.complex_array_value (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2403 lb, ub, dim);
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2404 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2405 else
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2406 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2407 if (x.is_single_type ())
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2408 retcell = do_cellslices_nda (x.float_array_value (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2409 lb, ub, dim);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2410 else
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2411 retcell = do_cellslices_nda (x.array_value (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2412 lb, ub, dim);
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2413 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2414 }
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2415 else
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2416 {
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2417 // generic code.
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2418 octave_idx_type n = lb.numel ();
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2419 retcell = Cell (1, n);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2420 const dim_vector dv = x.dims ();
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2421 int ndims = dv.length ();
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2422 if (dim < 0)
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2423 dim = dv.first_non_singleton ();
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2424 ndims = std::max (ndims, dim + 1);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2425 octave_value_list idx (ndims, octave_value::magic_colon_t);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2426 for (octave_idx_type i = 0; i < n; i++)
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2427 {
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2428 idx(dim) = Range (lb(i), ub(i));
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2429 retcell(i) = x.do_index_op (idx);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2430 }
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2431 }
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2432
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2433 retval = retcell;
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2434 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2435 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2436 else
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2437 print_usage ();
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2438
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2439 return retval;
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	2440 }
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	2441
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	2442 /*
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	2443 %!test
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	2444 %! m = [1, 2, 3, 4; 5, 6, 7, 8; 9, 10, 11, 12];
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	2445 %! c = cellslices (m, [1, 2], [2, 3], 2);
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	2446 %! assert (c, {[1, 2; 5, 6; 9, 10], [2, 3; 6, 7; 10, 11]});
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	2447 */
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2448
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	2449 DEFUN (cellindexmat, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2450 "-- texinfo --\n\
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14854 diff changeset	2451 @deftypefn {Built-in Function} {@var{y} =} cellindexmat (@var{x}, @var{varargin})\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	2452 Perform indexing of matrices in a cell array.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19861 diff changeset	2453 \n\
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2454 Given a cell array of matrices @var{x}, this function computes\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	2455 \n\
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2456 @example\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	2457 @group\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2458 Y = cell (size (X));\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2459 for i = 1:numel (X)\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2460 Y@{i@} = X@{i@}(varargin@{:@});\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2461 endfor\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	2462 @end group\n\
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2463 @end example\n\
13928 2892fd834446 doc: Update seealso references for cellslices and cellindexmat Rik <octave@nomad.inbox5.com> parents: 13695 diff changeset	2464 @seealso{cellslices, cellfun}\n\
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2465 @end deftypefn")
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2466 {
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2467 octave_value retval;
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2468
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2469 if (args.length () >= 1)
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2470 {
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	2471 const Cell x = args(0).xcell_value ("cellindexmat: X must be a cell");
20584 eef93a493ce3 use new cell_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2472 NoAlias<Cell> y(x.dims ());
eef93a493ce3 use new cell_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2473 octave_idx_type nel = x.numel ();
eef93a493ce3 use new cell_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2474 octave_value_list idx = args.slice (1, args.length () - 1);
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2475
20584 eef93a493ce3 use new cell_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2476 for (octave_idx_type i = 0; i < nel; i++)
eef93a493ce3 use new cell_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2477 {
eef93a493ce3 use new cell_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2478 octave_quit ();
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2479
20584 eef93a493ce3 use new cell_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2480 octave_value tmp = x(i);
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2481
20584 eef93a493ce3 use new cell_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2482 y(i) = tmp.do_index_op (idx);
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2483 }
20584 eef93a493ce3 use new cell_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2484
eef93a493ce3 use new cell_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	2485 retval = y;
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2486 }
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2487 else
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2488 print_usage ();
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2489
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2490 return retval;
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	2491 }

Mercurial > octave

annotate libinterp/corefcn/cellfun.cc @ 20756:200ae1d650b7