octave-nkf: src/DLD-FUNCTIONS/cellfun.cc annotate

annotate src/DLD-FUNCTIONS/cellfun.cc @ 13960:ef96344a6e58

cellfun: get rid of unnecessary symbol_table_lookup flag

author	Jordi Gutiérrez Hermoso <jordigh@octave.org>
date	Tue, 29 Nov 2011 12:16:49 -0500
parents	cf8cd43cdeb3
children	9aff66860e03

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

Mercurial > octave-nkf

annotate src/DLD-FUNCTIONS/cellfun.cc @ 13960:ef96344a6e58