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

annotate src/DLD-FUNCTIONS/cellfun.cc @ 11570:57632dea2446

attempt better backward compatibility for Array constructors

author	John W. Eaton <jwe@octave.org>
date	Wed, 19 Jan 2011 17:55:56 -0500
parents	01f703952eff
children	12df7854fa7c

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
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	4 Copyright (C) 2009 Jaroslav Hajek
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10428 diff changeset	5 Copyright (C) 2010 VZLU Prague
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	6
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	7 This file is part of Octave.
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	8
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	9 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	10 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	11 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	12 option) any later version.
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	13
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	14 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	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	16 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	17 for more details.
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	18
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	19 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	20 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	21 <http://www.gnu.org/licenses/>.
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	22
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 #ifdef HAVE_CONFIG_H
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	26 #include <config.h>
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	27 #endif
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	28
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	29 #include <string>
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	30 #include <vector>
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	31 #include <list>
8994 a8d30dc1beec cellfun optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8985 diff changeset	32 #include <memory>
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	33
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	34 #include "lo-mappers.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8373 diff changeset	35 #include "oct-locbuf.h"
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	36
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	37 #include "Cell.h"
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	38 #include "oct-map.h"
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	39 #include "defun-dld.h"
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	40 #include "parse.h"
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	41 #include "variables.h"
5451 ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	42 #include "ov-colon.h"
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	43 #include "unwind-prot.h"
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	44 #include "gripes.h"
9728 70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	45 #include "utils.h"
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	46
10044 2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	47 #include "ov-scalar.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	48 #include "ov-float.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	49 #include "ov-complex.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	50 #include "ov-flt-complex.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	51 #include "ov-bool.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	52 #include "ov-int8.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	53 #include "ov-int16.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	54 #include "ov-int32.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	55 #include "ov-int64.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	56 #include "ov-uint8.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	57 #include "ov-uint16.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	58 #include "ov-uint32.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	59 #include "ov-uint64.h"
2d7a8c227713 rewrite uniformoutput optimization in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10043 diff changeset	60
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	61 static octave_value_list
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	62 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	63 const octave_value_list& inputlist,
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	64 octave_value& func,
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	65 octave_value& error_handler)
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	66 {
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	67 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	68
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	69 if (error_state)
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 if (error_handler.is_defined ())
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	72 {
11046 14993c9e857e amd.cc, cellfun.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10964 diff changeset	73 octave_scalar_map msg;
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	74 msg.assign ("identifier", last_error_id ());
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	75 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	76 msg.assign ("index", static_cast<double> (count + static_cast<octave_idx_type>(1)));
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	77 octave_value_list errlist = inputlist;
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	78 errlist.prepend (msg);
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	79 buffer_error_messages--;
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	80 error_state = 0;
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	81 tmp = error_handler.do_multi_index_op (nargout, errlist);
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	82 buffer_error_messages++;
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	83
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	84 if (error_state)
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	85 tmp.clear ();
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	86 }
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	87 else
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	88 tmp.clear ();
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	89 }
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	90
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	91 return tmp;
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
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	94 DEFUN_DLD (cellfun, args, nargout,
8715 954b6f69f51d doc fixes John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	95 "-- texinfo --\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	96 @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	97 @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	98 @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	99 @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	100 @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	101 @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	102 @deftypefnx {Loadable Function} {} cellfun (@dots{}, 'ErrorHandler', @var{errfunc})\n\
364765c17648 [project @ 2007-09-01 00:03:10 by dbateman] dbateman parents: 6704 diff changeset	103 @deftypefnx {Loadable Function} {} cellfun (@dots{}, 'UniformOutput', @var{val})\n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	104 \n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	105 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	106 @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	107 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	108 \n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	109 @table @code\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	110 @item isempty\n\
5543 4d52e637a72a [project @ 2005-11-21 16:13:47 by jwe] jwe parents: 5451 diff changeset	111 Return 1 for empty elements.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	112 \n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	113 @item islogical\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	114 Return 1 for logical elements.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	115 \n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	116 @item isreal\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	117 Return 1 for real elements.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	118 \n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	119 @item length\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	120 Return a vector of the lengths of cell elements.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	121 \n\
5543 4d52e637a72a [project @ 2005-11-21 16:13:47 by jwe] jwe parents: 5451 diff changeset	122 @item ndims\n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	123 Return the number of dimensions of each element.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	124 \n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	125 @item prodofsize\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	126 Return the product of dimensions of each element.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	127 \n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	128 @item size\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	129 Return the size along the @var{k}-th dimension.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	130 \n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	131 @item isclass\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	132 Return 1 for elements of @var{class}.\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	133 @end table\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	134 \n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	135 Additionally, @code{cellfun} accepts an arbitrary function @var{func}\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	136 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	137 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	138 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	139 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	140 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	141 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	142 \n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	143 @example\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	144 @group\n\
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	145 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	146 @result{}ans = [1.57080 0.00000]\n\
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	147 @end group\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	148 @end example\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	149 \n\
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	150 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	151 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	152 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	153 \n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	154 @example\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	155 @group\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	156 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	157 a = x;\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	158 b = x*x;\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	159 endfunction\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	160 [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	161 @result{}\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	162 aa = \n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	163 1 2 3\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	164 bb =\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	165 1 4 9\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	166 @end group\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	167 @end example\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10791 diff changeset	168 \n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	169 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	170 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	171 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	172 \n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	173 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	174 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	175 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	176 cell array (or cell arrays). For example:\n\
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	177 \n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	178 @example\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	179 @group\n\
6623 545847da3b88 [project @ 2007-05-15 02:23:08 by jwe] jwe parents: 6550 diff changeset	180 cellfun (\"tolower(x)\", @{\"Foo\", \"Bar\", \"FooBar\"@},\n\
545847da3b88 [project @ 2007-05-15 02:23:08 by jwe] jwe parents: 6550 diff changeset	181 \"UniformOutput\",false)\n\
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	182 @result{} ans = @{\"foo\", \"bar\", \"foobar\"@}\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	183 @end group\n\
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	184 @end example\n\
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	185 \n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	186 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	187 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	188 \n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	189 @example\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	190 function [@dots{}] = errfunc (@var{s}, @dots{})\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	191 @end example\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	192 \n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	193 @noindent\n\
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	194 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	195 @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	196 'identifier', 'message' and 'index', giving respectively the error\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	197 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	198 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	199 \n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	200 @example\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	201 @group\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	202 function y = foo (s, x), y = NaN; endfunction\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	203 cellfun (@@factorial, @{-1,2@},'ErrorHandler',@@foo)\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	204 @result{} ans = [NaN 2]\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	205 @end group\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	206 @end example\n\
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	207 \n\
10687 a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10670 diff changeset	208 @seealso{arrayfun, structfun, spfun}\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5544 diff changeset	209 @end deftypefn")
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	210 {
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	211 octave_value_list retval;
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	212 int nargin = args.length ();
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	213 int nargout1 = (nargout < 1 ? 1 : nargout);
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	214
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	215 if (nargin < 2)
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	216 {
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	217 error ("cellfun: you must supply at least 2 arguments");
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5784 diff changeset	218 print_usage ();
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	219 return retval;
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	220 }
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	221
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	222 octave_value func = args(0);
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	223
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	224 if (! args(1).is_cell ())
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	225 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	226 error ("cellfun: C must be a cell array");
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	227
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	228 return retval;
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	229 }
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	230
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	231 if (func.is_string ())
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	232 {
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	233 const Cell f_args = args(1).cell_value ();
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	234
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	235 octave_idx_type k = f_args.numel ();
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	236
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	237 std::string name = func.string_value ();
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	238
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	239 if (name == "isempty")
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	240 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	241 boolNDArray result (f_args.dims ());
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	242 for (octave_idx_type count = 0; count < k ; count++)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	243 result(count) = f_args.elem(count).is_empty ();
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	244 retval(0) = result;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	245 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	246 else if (name == "islogical")
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	247 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	248 boolNDArray result (f_args.dims ());
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	249 for (octave_idx_type count= 0; count < k ; count++)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	250 result(count) = f_args.elem(count).is_bool_type ();
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	251 retval(0) = result;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	252 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	253 else if (name == "isreal")
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	254 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	255 boolNDArray result (f_args.dims ());
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	256 for (octave_idx_type count= 0; count < k ; count++)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	257 result(count) = f_args.elem(count).is_real_type ();
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	258 retval(0) = result;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	259 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	260 else if (name == "length")
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	261 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	262 NDArray result (f_args.dims ());
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	263 for (octave_idx_type count= 0; count < k ; count++)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	264 result(count) = static_cast<double> (f_args.elem(count).length ());
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	265 retval(0) = result;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	266 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	267 else if (name == "ndims")
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	268 {
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	269 NDArray result (f_args.dims ());
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	270 for (octave_idx_type count = 0; count < k ; count++)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	271 result(count) = static_cast<double> (f_args.elem(count).ndims ());
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	272 retval(0) = result;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	273 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	274 else if (name == "prodofsize" \|\| name == "numel")
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	275 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	276 NDArray result (f_args.dims ());
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	277 for (octave_idx_type count = 0; count < k ; count++)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	278 result(count) = static_cast<double> (f_args.elem(count).numel ());
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	279 retval(0) = result;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	280 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	281 else if (name == "size")
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	282 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	283 if (nargin == 3)
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	284 {
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	285 int d = args(2).nint_value () - 1;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	286
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	287 if (d < 0)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	288 error ("cellfun: K must be a positive integer");
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	289
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	290 if (! error_state)
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	291 {
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	292 NDArray result (f_args.dims ());
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	293 for (octave_idx_type count = 0; count < k ; count++)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	294 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	295 dim_vector dv = f_args.elem(count).dims ();
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	296 if (d < dv.length ())
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	297 result(count) = static_cast<double> (dv(d));
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	298 else
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	299 result(count) = 1.0;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	300 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	301 retval(0) = result;
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	302 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	303 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	304 else
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	305 error ("cellfun: not enough arguments for \"size\"");
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	306 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	307 else if (name == "isclass")
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	308 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	309 if (nargin == 3)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	310 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	311 std::string class_name = args(2).string_value();
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	312 boolNDArray result (f_args.dims ());
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	313 for (octave_idx_type count = 0; count < k ; count++)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	314 result(count) = (f_args.elem(count).class_name() == class_name);
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	315
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	316 retval(0) = result;
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	317 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	318 else
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	319 error ("cellfun: not enough arguments for \"isclass\"");
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	320 }
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	321 else
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	322 {
9728 70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	323 if (! valid_identifier (name))
70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	324 {
70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	325
70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	326 std::string fcn_name = unique_symbol_name ("__cellfun_fcn_");
70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	327 std::string fname = "function y = ";
70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	328 fname.append (fcn_name);
70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	329 fname.append ("(x) y = ");
70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	330 octave_function *ptr_func = extract_function (args(0), "cellfun",
70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	331 fcn_name, fname, "; endfunction");
70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	332 if (ptr_func && ! error_state)
70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	333 func = octave_value (ptr_func, true);
70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9684 diff changeset	334 }
10428 fb8c9db4a39c fix parsing of function names in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	335 else
fb8c9db4a39c fix parsing of function names in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	336 {
fb8c9db4a39c fix parsing of function names in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	337 func = symbol_table::find_function (name);
fb8c9db4a39c fix parsing of function names in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	338 if (func.is_undefined ())
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	339 error ("cellfun: invalid function NAME: %s", name.c_str ());
10428 fb8c9db4a39c fix parsing of function names in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	340 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	341 }
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	342 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	343
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	344 if (error_state \|\| ! retval.empty ())
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	345 return retval;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	346
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	347 if (func.is_function_handle () \|\| func.is_inline_function ()
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	348 \|\| func.is_function ())
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	349 {
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10044 diff changeset	350 unwind_protect frame;
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10044 diff changeset	351 frame.protect_var (buffer_error_messages);
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	352
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	353 bool uniform_output = true;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	354 octave_value error_handler;
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	355
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	356 while (nargin > 3 && args(nargin-2).is_string())
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	357 {
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	358 std::string arg = args(nargin-2).string_value();
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	359
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	360 std::transform (arg.begin (), arg.end (),
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	361 arg.begin (), tolower);
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	362
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	363 if (arg == "uniformoutput")
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	364 uniform_output = args(nargin-1).bool_value();
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	365 else if (arg == "errorhandler")
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	366 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	367 if (args(nargin-1).is_function_handle () \|\|
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	368 args(nargin-1).is_inline_function ())
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	369 {
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	370 error_handler = args(nargin-1);
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	371 }
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	372 else if (args(nargin-1).is_string ())
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	373 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	374 std::string err_name = args(nargin-1).string_value ();
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	375 error_handler = symbol_table::find_function (err_name);
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	376 if (error_handler.is_undefined ())
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	377 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	378 error ("cellfun: invalid function NAME: %s", err_name.c_str ());
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	379 break;
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	380 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	381 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	382 else
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	383 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	384 error ("cellfun: invalid value for 'ErrorHandler' function");
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	385 break;
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	386 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	387 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	388 else
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	389 {
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	390 error ("cellfun: unrecognized parameter %s",
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	391 arg.c_str());
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	392 break;
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	393 }
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	394
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	395 nargin -= 2;
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	396 }
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	397
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	398 nargin -= 1;
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	399
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	400 octave_value_list inputlist (nargin, octave_value ());
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	401
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	402 OCTAVE_LOCAL_BUFFER (Cell, inputs, nargin);
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	403 OCTAVE_LOCAL_BUFFER (bool, mask, nargin);
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	404
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	405 // This is to prevent copy-on-write.
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	406 const Cell *cinputs = inputs;
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	407
9684 c5ff5f858cfd omission from last patch Jaroslav Hajek <highegg@gmail.com> parents: 9683 diff changeset	408 octave_idx_type k = 1;
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	409
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	410 dim_vector fdims (1, 1);
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	411
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	412 if (error_state)
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10044 diff changeset	413 return octave_value_list ();
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	414
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	415 for (int j = 0; j < nargin; j++)
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	416 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	417 if (! args(j+1).is_cell ())
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	418 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	419 error ("cellfun: arguments must be cells");
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10044 diff changeset	420 return octave_value_list ();
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	421 }
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	422
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	423 inputs[j] = args(j+1).cell_value ();
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	424 mask[j] = inputs[j].numel () != 1;
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	425 if (! mask[j])
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	426 inputlist(j) = cinputs[j](0);
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	427 }
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	428
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	429 for (int j = 0; j < nargin; j++)
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	430 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	431 if (mask[j])
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	432 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	433 fdims = inputs[j].dims ();
9683 5b3b9dcfd59c fix crash in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	434 k = inputs[j].numel ();
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	435 for (int i = j+1; i < nargin; i++)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	436 {
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	437 if (mask[i] && inputs[i].dims () != fdims)
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	438 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	439 error ("cellfun: Dimensions mismatch.");
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10044 diff changeset	440 return octave_value_list ();
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	441 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	442 }
9683 5b3b9dcfd59c fix crash in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	443 break;
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	444 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	445 }
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	446
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	447 if (error_handler.is_defined ())
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	448 buffer_error_messages++;
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	449
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	450 if (uniform_output)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	451 {
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	452 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	453 idx_list.front ().resize (1);
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	454 std::string idx_type = "(";
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	455
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	456 OCTAVE_LOCAL_BUFFER (octave_value, retv, nargout1);
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	457
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	458 for (octave_idx_type count = 0; count < k ; count++)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	459 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	460 for (int j = 0; j < nargin; j++)
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	461 {
40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	462 if (mask[j])
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	463 inputlist.xelem (j) = cinputs[j](count);
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	464 }
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	465
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	466 const octave_value_list tmp = get_output_list (count, nargout, inputlist,
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	467 func, error_handler);
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	468
9459 cb0b21f34abc avoid double error messages in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	469 if (error_state)
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	470 return retval;
9459 cb0b21f34abc avoid double error messages in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	471
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	472 if (tmp.length () < nargout1)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	473 {
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	474 if (tmp.length () < nargout)
76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	475 {
76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	476 error ("cellfun: too many output arguments");
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10044 diff changeset	477 return octave_value_list ();
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	478 }
76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	479 else
76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	480 nargout1 = 0;
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	481 }
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	482
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	483 if (count == 0)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	484 {
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	485 for (int j = 0; j < nargout1; j++)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	486 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	487 octave_value val = tmp(j);
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	488
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	489 if (val.numel () == 1)
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	490 retv[j] = val.resize (fdims);
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	491 else
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	492 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	493 error ("cellfun: all values must be scalars when UniformOutput = true");
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	494 break;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	495 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	496 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	497 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	498 else
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	499 {
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	500 for (int j = 0; j < nargout1; j++)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	501 {
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	502 octave_value val = tmp(j);
5989 e049385342f6 [project @ 2006-09-14 02:10:46 by jwe] jwe parents: 5988 diff changeset	503
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	504 if (! retv[j].fast_elem_insert (count, val))
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	505 {
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	506 if (val.numel () == 1)
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	507 {
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	508 idx_list.front ()(0) = count + 1.0;
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	509 retv[j].assign (octave_value::op_asn_eq,
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	510 idx_type, idx_list, val);
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	511
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	512 if (error_state)
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	513 break;
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	514 }
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	515 else
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	516 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	517 error ("cellfun: all values must be scalars when UniformOutput = true");
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	518 break;
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	519 }
8994 a8d30dc1beec cellfun optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8985 diff changeset	520 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	521 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	522 }
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	523
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	524 if (error_state)
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	525 break;
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	526 }
8994 a8d30dc1beec cellfun optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8985 diff changeset	527
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	528 retval.resize (nargout1);
76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	529 for (int j = 0; j < nargout1; j++)
11457 33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	530 {
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	531 if (nargout > 0 && retv[j].is_undefined ())
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	532 retval(j) = NDArray (fdims);
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	533 else
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	534 retval(j) = retv[j];
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	535 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	536 }
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	537 else
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	538 {
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	539 OCTAVE_LOCAL_BUFFER (Cell, results, nargout1);
76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	540 for (int j = 0; j < nargout1; j++)
9465 40de4692c860 auto-expanding scalar cells in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9459 diff changeset	541 results[j].resize (fdims);
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	542
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	543 for (octave_idx_type count = 0; count < k ; count++)
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
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	551 const octave_value_list tmp = get_output_list (count, nargout, inputlist,
a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	552 func, error_handler);
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	553
9459 cb0b21f34abc avoid double error messages in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	554 if (error_state)
10181 a668fbd32e34 improve cellfun & avoid undefined values from builtins Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	555 return retval;
9459 cb0b21f34abc avoid double error messages in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	556
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	557 if (tmp.length () < nargout1)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	558 {
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	559 if (tmp.length () < nargout)
76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	560 {
76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	561 error ("cellfun: too many output arguments");
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10044 diff changeset	562 return octave_value_list ();
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	563 }
76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	564 else
76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	565 nargout1 = 0;
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	566 }
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	567
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	568
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	569 for (int j = 0; j < nargout1; j++)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	570 results[j](count) = tmp(j);
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	571 }
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	572
9988 76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	573 retval.resize(nargout1);
76cf4aec34e9 allow functions returning no value in cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9740 diff changeset	574 for (int j = 0; j < nargout1; j++)
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	575 retval(j) = results[j];
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	576 }
5205 59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	577 }
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	578 else
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	579 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	580
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	581 return retval;
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	582 }
59592dcbb5d8 [project @ 2005-03-15 16:04:56 by jwe] jwe parents: diff changeset	583
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	584 /*
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	585
11457 33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	586 %!test
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	587 %! [a,b] = cellfun (@(x) x, cell (2, 0));
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	588 %! assert (a, zeros (2, 0));
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	589 %! assert (b, zeros (2, 0));
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	590
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	591 %!test
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	592 %! [a,b] = cellfun (@(x) x, cell (2, 0), "uniformoutput", false);
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	593 %! assert (a, cell (2, 0));
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	594 %! assert (b, cell (2, 0));
33f6384d2b78 cellfun compatibility fix John W. Eaton <jwe@octave.org> parents: 11046 diff changeset	595
8373 63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	596 %% Test function to check the "Errorhandler" option
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	597 %!function [z] = cellfunerror (S, varargin)
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	598 %! z = S;
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	599 %! endfunction
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	600
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	601 %% 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	602 %% a function_handle or an anonymous function
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	603 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	604 %! 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	605 %! assert (A, [true, false, true, false]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	606 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	607 %! 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	608 %! assert (A, [true, false, true, false]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	609 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	610 %! 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	611 %! assert (A, [true, false, true, false]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	612 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	613 %! 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	614 %! assert (A, [true, false, true, false]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	615
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	616 %% 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	617 %% "isempty", "islogical", "length", "ndims" or "prodofsize"
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	618 %!test
10291 fc879f361bda make isreal matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10181 diff changeset	619 %! A = cellfun ("isreal", {true, 0.1, {}, i*2, [], "abc"});
fc879f361bda make isreal matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10181 diff changeset	620 %! 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	621 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	622 %! 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	623 %! assert (A, [false, false, false, false, true, false]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	624 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	625 %! 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	626 %! assert (A, [true, false, true, false, false, false]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	627 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	628 %! 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	629 %! assert (A, [1, 1, 1, 1, 0, 3]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	630 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	631 %! 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	632 %! assert (A, [2; 4]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	633 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	634 %! 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	635 %! assert (A, [4, 24]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	636
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	637 %% 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	638 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	639 %! 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	640 %! assert (A, [6, 7, 8]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	641 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	642 %! 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	643 %! "UniformOutput", false);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	644 %! assert (A, {6, 7, 8});
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	645 %!test %% Two input arguments of different types
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	646 %! 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	647 %! assert (A, [true, false]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	648 %!test %% Pass another variable to the anonymous function
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	649 %! 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	650 %! assert (A, [true, false]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	651 %!test %% Three ouptut arguments of different type
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	652 %! [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	653 %! assert (isequal (A, {true, true; [], true}));
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	654 %! assert (isequal (B, {true, true; [], true}));
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	655 %! assert (isequal (C, {10, 11; [], 12}));
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	656
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	657 %% 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	658 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	659 %! 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	660 %! assert (A, [false, true]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	661 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	662 %! 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	663 %! "UniformOutput", true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	664 %! assert (A, [false; true]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	665 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	666 %! 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	667 %! assert (A, {false, true; false, true});
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	668 %!test %% Three ouptut arguments of same type
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	669 %! [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	670 %! "UniformOutput", false);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	671 %! assert (isequal (A, {true, []; [], true}));
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	672 %! assert (isequal (B, {true, []; [], true}));
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	673 %! assert (isequal (C, {true, []; [], true}));
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	674 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	675 %! 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	676 %! "ErrorHandler", @cellfunerror);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	677 %! assert (isfield (A, "identifier"), true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	678 %! assert (isfield (A, "message"), true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	679 %! assert (isfield (A, "index"), true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	680 %! assert (isempty (A.message), false);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	681 %! assert (A.index, 1);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	682 %!test %% Overwriting setting of "UniformOutput" true
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	683 %! 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	684 %! "UniformOutput", true, "ErrorHandler", @cellfunerror);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	685 %! assert (isfield (A, "identifier"), true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	686 %! assert (isfield (A, "message"), true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	687 %! assert (isfield (A, "index"), true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	688 %! assert (isempty (A.message), false);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	689 %! assert (A.index, 1);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	690
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	691 %% 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	692 %!test
9622 40cbcdf12b54 fix broken tests Jaroslav Hajek <highegg@gmail.com> parents: 9465 diff changeset	693 %! 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	694 %! assert (A, [false, true]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	695 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	696 %! 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	697 %! "UniformOutput", true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	698 %! assert (A, [false, true; false, false]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	699 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	700 %! 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	701 %! 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	702 %! assert (isequal (A{2}, [4, 5, 6]));
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	703 %!test %% Three ouptut arguments of different type
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	704 %! [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	705 %! assert (isequal (A, {true, true; [], true}));
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	706 %! assert (isequal (B, {true, true; [], true}));
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	707 %! assert (isequal (C, {10, 11; [], 12}));
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	708 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	709 %! 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	710 %! "ErrorHandler", @cellfunerror);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	711 %! 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	712 %! 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	713 %! 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	714 %! 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	715 %! 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	716 %! 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	717 %!test %% Overwriting setting of "UniformOutput" true
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	718 %! 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	719 %! "UniformOutput", true, "ErrorHandler", @cellfunerror);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	720 %! 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	721 %! 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	722 %! 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	723 %! 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	724 %! 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	725 %! 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	726
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	727 %% 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	728 %!error %% "UniformOutput" false should be used
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	729 %! 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	730 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	731 %! 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	732 %! assert (A, [false; true]);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	733 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	734 %! 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	735 %! assert (A, {"abc", "def"});
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	736 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	737 %! 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	738 %! "ErrorHandler", @cellfunerror);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	739 %! 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	740 %! 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	741 %! 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	742 %! 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	743 %! 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	744 %!test %% Overwriting setting of "UniformOutput" true
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	745 %! 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	746 %! "UniformOutput", true, "ErrorHandler", @cellfunerror);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	747 %! 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	748 %! 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	749 %! 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	750 %! 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	751 %! 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	752
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	753 %% Structures cannot be handled by cellfun
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	754 %!error
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	755 %! 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	756 %! 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	757
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	758 %% 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	759 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	760 %! 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	761 %! assert (A, [1, 0], 1e-16);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	762 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	763 %! 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	764 %! "UniformOutput", true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	765 %! assert (A, [1; 0], 1e-16);
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 (@(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	768 %! "UniformOutput", false);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	769 %! assert (A, {true, false});
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	770 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	771 %! 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	772 %! "ErrorHandler", @cellfunerror);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	773 %! 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	774 %! 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	775 %! 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	776 %! 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	777 %! 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	778 %!test %% Overwriting setting of "UniformOutput" true
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	779 %! 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	780 %! "UniformOutput", true, "ErrorHandler", @cellfunerror);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	781 %! 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	782 %! 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	783 %! 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	784 %! 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	785 %! 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	786
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	787 %% 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	788 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	789 %! 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	790 %! 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	791 %! assert (A, true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	792 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	793 %! 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	794 %! 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	795 %! "UniformOutput", true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	796 %! assert (A, true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	797 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	798 %! 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	799 %! 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	800 %! "UniformOutput", false);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	801 %! assert (A, {true});
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	802 %!test
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	803 %! 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	804 %! 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	805 %! "ErrorHandler", @cellfunerror);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	806 %! assert (isfield (A, "identifier"), true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	807 %! assert (isfield (A, "message"), true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	808 %! assert (isfield (A, "index"), true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	809 %! assert (isempty (A.message), false);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	810 %! assert (A.index, 1);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	811 %!test %% Overwriting setting of "UniformOutput" true
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	812 %! 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	813 %! 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	814 %! "UniformOutput", true, "ErrorHandler", @cellfunerror);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	815 %! assert (isfield (A, "identifier"), true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	816 %! assert (isfield (A, "message"), true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	817 %! assert (isfield (A, "index"), true);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	818 %! assert (isempty (A.message), false);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	819 %! assert (A.index, 1);
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	820
63fe023d7898 Added more tests for cellfun. Thomas Treichl <Thomas.Treichl@gmx.net> parents: 8347 diff changeset	821 %% A lot of other tests
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	822 %!error(cellfun(1))
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	823 %!error(cellfun('isclass',1))
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	824 %!error(cellfun('size',1))
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	825 %!error(cellfun(@sin,{[]},'BadParam',false))
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	826 %!error(cellfun(@sin,{[]},'UniformOuput'))
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	827 %!error(cellfun(@sin,{[]},'ErrorHandler'))
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	828 %!assert(cellfun(@sin,{0,1}),sin([0,1]))
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	829 %!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	830 %!assert(cellfun('sin',{0,1}),sin([0,1]))
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	831 %!assert(cellfun('isempty',{1,[]}),[false,true])
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	832 %!assert(cellfun('islogical',{false,pi}),[true,false])
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	833 %!assert(cellfun('isreal',{1i,1}),[false,true])
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	834 %!assert(cellfun('length',{zeros(2,2),1}),[2,1])
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	835 %!assert(cellfun('prodofsize',{zeros(2,2),1}),[4,1])
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	836 %!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	837 %!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	838 %!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	839 %!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	840 %!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	841 %!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	842 %!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	843 %!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	844 %!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	845 %!error(cellfun(@factorial,{-1,3}))
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	846 %!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	847 %!test
6704 781777998927 [project @ 2007-06-13 05:23:56 by jwe] jwe parents: 6623 diff changeset	848 %! [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	849 %! assert(a,{fullfile("a","b"),fullfile("e","f")})
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	850 %! assert(b,{'c','g'})
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	851 %! assert(c,{'.d','.h'})
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	852
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	853 */
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	854
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	855 static void
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	856 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	857 const Array<int>& dimv,
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	858 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	859 Array<int>& perm)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	860 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	861 int dvl = dimv.length ();
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	862 int maxd = dv.length ();
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	863 celldv = dv;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	864 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	865 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	866 if (maxd > dv.length ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	867 celldv.resize (maxd, 1);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	868 arraydv = celldv;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	869
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	870 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	871
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10291 diff changeset	872 perm.clear (maxd, 1);
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	873 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	874 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	875 int k = dimv(i) - 1;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	876 if (k < 0)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	877 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	878 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	879 return;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	880 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	881 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	882 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	883 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	884 return;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	885 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	886
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	887 sing[k] = true;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	888 perm(i) = k;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	889 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	890
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	891 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	892 if (! sing[k])
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	893 perm(i++) = k;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	894
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	895 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	896 if (sing[i])
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	897 celldv(i) = 1;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	898 else
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	899 arraydv(i) = 1;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	900 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	901
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	902 template<class NDA>
10756 d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	903 static inline typename NDA::element_type
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	904 do_num2cell_elem (const NDA& array, octave_idx_type i)
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	905 { return array(i); }
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	906
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	907 static inline Cell
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	908 do_num2cell_elem (const Cell& array, octave_idx_type i)
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	909 { return Cell (array(i)); }
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	910
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	911
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	912 template<class NDA>
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	913 static Cell
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	914 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	915 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	916 if (dimv.is_empty ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	917 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	918 Cell retval (array.dims ());
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	919 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	920 for (octave_idx_type i = 0; i < nel; i++)
10756 d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	921 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	922
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	923 return retval;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	924 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	925 else
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	926 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	927 dim_vector celldv, arraydv;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	928 Array<int> perm;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	929 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	930 if (error_state)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	931 return Cell ();
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	932
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	933 NDA parray = array.permute (perm);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	934
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	935 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	936 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	937
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	938 Cell retval (celldv);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	939 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	940 {
9731 7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	941 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	942 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	943
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	944 return retval;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	945 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	946 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	947
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	948
5451 ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	949 DEFUN_DLD (num2cell, args, ,
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	950 "-- texinfo --\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	951 @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	952 @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	953 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	954 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	955 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	956 \n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	957 @example\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	958 @group\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	959 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	960 @result{} ans =\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	961 @{\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	962 [1,1] = 1\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	963 [2,1] = 3\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	964 [1,2] = 2\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	965 [2,2] = 4\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	966 @}\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	967 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	968 @result{} ans =\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	969 @{\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	970 [1,1] =\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	971 1\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	972 3\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	973 [1,2] =\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	974 2\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	975 4\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	976 @}\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	977 @end group\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	978 @end example\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	979 \n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5544 diff changeset	980 @seealso{mat2cell}\n\
2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5544 diff changeset	981 @end deftypefn")
5451 ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	982 {
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	983 int nargin = args.length();
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	984 octave_value retval;
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	985
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	986 if (nargin < 1 \|\| nargin > 2)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5784 diff changeset	987 print_usage ();
5451 ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	988 else
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	989 {
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	990 octave_value array = args(0);
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	991 Array<int> dimv;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	992 if (nargin > 1)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	993 dimv = args (1).int_vector_value (true);
5451 ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	994
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	995 if (error_state)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	996 ;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	997 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	998 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	999 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	1000 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	1001 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	1002 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1003 if (array.is_integer_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1004 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1005 if (array.is_int8_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1006 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	1007 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	1008 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	1009 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	1010 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	1011 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	1012 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	1013 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	1014 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	1015 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	1016 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	1017 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	1018 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	1019 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	1020 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	1021 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1022 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	1023 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1024 if (array.is_single_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1025 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	1026 else
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1027 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	1028 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1029 else
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1030 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1031 if (array.is_single_type ())
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1032 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	1033 else
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1034 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	1035 }
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1036 }
10756 d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1037 else if (array.is_map ())
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1038 retval = do_num2cell (array.map_value (), dimv);
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1039 else if (array.is_cell ())
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10711 diff changeset	1040 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	1041 else
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1042 gripe_wrong_type_arg ("num2cell", array);
5451 ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1043 }
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1044
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1045 return retval;
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1046 }
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	1047
5988 d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	1048 /*
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	1049
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	1050 %!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	1051 %!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	1052 %!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	1053
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	1054 */
d9ce802628e6 [project @ 2006-09-12 21:31:41 by dbateman] dbateman parents: 5829 diff changeset	1055
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1056 static bool
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1057 mat2cell_mismatch (const dim_vector& dv,
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1058 const Array<octave_idx_type> *d, int nd)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1059 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1060 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1061 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1062 octave_idx_type s = 0;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1063 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	1064 s += d[i](j);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1065
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1066 octave_idx_type r = i < dv.length () ? dv(i) : 1;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1067
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1068 if (s != r)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1069 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1070 error ("mat2cell: mismatch on %d-th dimension (%d != %d)",
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1071 i+1, r, s);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1072 return true;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1073 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1074 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1075
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1076 return false;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1077 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1078
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1079 template<class container>
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1080 static void
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1081 prepare_idx (container *idx, int idim, int nd,
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1082 const Array<octave_idx_type>* d)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1083 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1084 octave_idx_type nidx = idim < nd ? d[idim].numel () : 1;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1085 if (nidx == 1)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1086 idx[0] = idx_vector::colon;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1087 else
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1088 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1089 octave_idx_type l = 0;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1090 for (octave_idx_type i = 0; i < nidx; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1091 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1092 octave_idx_type u = l + d[idim](i);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1093 idx[i] = idx_vector (l, u);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1094 l = u;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1095 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1096 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1097 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1098
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1099 // 2D specialization, works for Array, Sparse and octave_map.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1100 // Uses 1D or 2D indexing.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1101
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1102 template <class Array2D>
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1103 static Cell
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1104 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	1105 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1106 NoAlias<Cell> retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1107 assert (nd == 1 \|\| nd == 2);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1108 assert (a.ndims () == 2);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1109
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1110 if (mat2cell_mismatch (a.dims (), d, nd))
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1111 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1112
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1113 octave_idx_type nridx = d[0].length ();
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1114 octave_idx_type ncidx = nd == 1 ? 1 : d[1].length ();
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1115 retval.clear (nridx, ncidx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1116
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1117 int ivec = -1;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1118 if (a.rows () > 1 && a.cols () == 1 && ncidx == 1)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1119 ivec = 0;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1120 else if (a.rows () == 1 && nridx == 1 && nd == 2)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1121 ivec = 1;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1122
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1123 if (ivec >= 0)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1124 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1125 // Vector split. Use 1D indexing.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1126 octave_idx_type l = 0, nidx = (ivec == 0 ? nridx : ncidx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1127 for (octave_idx_type i = 0; i < nidx; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1128 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1129 octave_idx_type u = l + d[ivec](i);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1130 retval(i) = a.index (idx_vector (l, u));
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1131 l = u;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1132 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1133 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1134 else
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1135 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1136 // General 2D case. Use 2D indexing.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1137 OCTAVE_LOCAL_BUFFER (idx_vector, ridx, nridx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1138 prepare_idx (ridx, 0, nd, d);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1139
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1140 OCTAVE_LOCAL_BUFFER (idx_vector, cidx, ncidx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1141 prepare_idx (cidx, 1, nd, d);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1142
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1143 for (octave_idx_type j = 0; j < ncidx; j++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1144 for (octave_idx_type i = 0; i < nridx; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1145 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1146 octave_quit ();
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1147
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1148 retval(i,j) = a.index (ridx[i], cidx[j]);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1149 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1150 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1151
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1152 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1153 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1154
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1155 // Nd case. Works for Arrays and octave_map.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1156 // Uses Nd indexing.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1157
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1158 template <class ArrayND>
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1159 Cell
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1160 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	1161 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1162 NoAlias<Cell> retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1163 assert (nd >= 1);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1164
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1165 if (mat2cell_mismatch (a.dims (), d, nd))
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1166 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1167
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1168 dim_vector rdv = dim_vector::alloc (nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1169 OCTAVE_LOCAL_BUFFER (octave_idx_type, nidx, nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1170 octave_idx_type idxtot = 0;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1171 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1172 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1173 rdv(i) = nidx[i] = d[i].length ();
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1174 idxtot += nidx[i];
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1175 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1176
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1177 retval.clear (rdv);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1178
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1179 OCTAVE_LOCAL_BUFFER (idx_vector, xidx, idxtot);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1180 OCTAVE_LOCAL_BUFFER (idx_vector *, idx, nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1181
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1182 idxtot = 0;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1183 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1184 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1185 idx[i] = xidx + idxtot;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1186 prepare_idx (idx[i], i, nd, d);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1187 idxtot += nidx[i];
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1188 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1189
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1190 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	1191 NoAlias< Array<idx_vector> > ra_idx
57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	1192 (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	1193
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1194 for (octave_idx_type j = 0; j < retval.numel (); j++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1195 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1196 octave_quit ();
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1197
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1198 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1199 ra_idx(i) = idx[i][ridx[i]];
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1200
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1201 retval(j) = a.index (ra_idx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1202
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1203 rdv.increment_index (ridx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1204 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1205
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1206 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1207 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1208
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1209 // Dispatcher.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1210 template <class ArrayND>
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1211 Cell
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1212 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	1213 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1214 if (a.ndims () == 2 && nd <= 2)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1215 return do_mat2cell_2d (a, d, nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1216 else
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1217 return do_mat2cell_nd (a, d, nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1218 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1219
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1220 // General case. Works for any class supporting do_index_op.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1221 // Uses Nd indexing.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1222
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1223 Cell
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1224 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	1225 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1226 NoAlias<Cell> retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1227 assert (nd >= 1);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1228
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1229 if (mat2cell_mismatch (a.dims (), d, nd))
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1230 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1231
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1232 dim_vector rdv = dim_vector::alloc (nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1233 OCTAVE_LOCAL_BUFFER (octave_idx_type, nidx, nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1234 octave_idx_type idxtot = 0;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1235 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1236 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1237 rdv(i) = nidx[i] = d[i].length ();
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1238 idxtot += nidx[i];
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1239 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1240
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1241 retval.clear (rdv);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1242
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1243 OCTAVE_LOCAL_BUFFER (octave_value, xidx, idxtot);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1244 OCTAVE_LOCAL_BUFFER (octave_value *, idx, nd);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1245
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1246 idxtot = 0;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1247 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1248 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1249 idx[i] = xidx + idxtot;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1250 prepare_idx (idx[i], i, nd, d);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1251 idxtot += nidx[i];
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1252 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1253
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1254 OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, ridx, nd, 0);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1255 octave_value_list ra_idx (std::max (nd, a.ndims ()),
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1256 octave_value::magic_colon_t);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1257
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1258 for (octave_idx_type j = 0; j < retval.numel (); j++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1259 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1260 octave_quit ();
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1261
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1262 for (int i = 0; i < nd; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1263 ra_idx(i) = idx[i][ridx[i]];
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1264
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1265 retval(j) = a.do_index_op (ra_idx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1266
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1267 if (error_state)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1268 break;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1269
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1270 rdv.increment_index (ridx);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1271 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1272
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1273 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1274 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1275
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1276 DEFUN_DLD (mat2cell, args, ,
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1277 "-- texinfo --\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	1278 @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	1279 @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	1280 @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	1281 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	1282 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	1283 @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	1284 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	1285 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	1286 == size (@var{A}, i)}.\n\
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1287 \n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1288 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	1289 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	1290 \n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1291 An example of the use of mat2cell is\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1292 \n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1293 @example\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1294 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	1295 @result{} @{\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1296 [1,1] =\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1297 \n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1298 1 5 9\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1299 2 6 10\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1300 3 7 11\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1301 \n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1302 [2,1] =\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1303 \n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1304 4 8 12\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1305 \n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1306 [1,2] =\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1307 \n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1308 13\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1309 14\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1310 15\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1311 \n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1312 [2,2] = 16\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1313 @}\n\
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1314 @end example\n\
5829 93785a1b0f97 [project @ 2006-05-23 18:34:10 by jwe] jwe parents: 5823 diff changeset	1315 @seealso{num2cell, cell2mat}\n\
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1316 @end deftypefn")
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1317 {
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1318 int nargin = args.length();
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1319 octave_value retval;
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1320
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1321 if (nargin < 2)
7038 4482ba9814b7 [project @ 2007-10-19 16:05:48 by jwe] jwe parents: 7017 diff changeset	1322 print_usage ();
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1323 else
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1324 {
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1325 // Prepare indices.
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1326 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	1327
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1328 for (int i = 1; i < nargin; i++)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1329 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1330 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	1331 if (error_state)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1332 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1333 }
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1334
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1335 octave_value a = args(0);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1336 bool sparse = a.is_sparse_type ();
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1337 if (sparse && nargin > 3)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1338 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1339 error ("mat2cell: sparse arguments only support 2D indexing");
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1340 return retval;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1341 }
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1342
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1343 switch (a.builtin_type ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10125 diff changeset	1344 {
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1345 case btyp_double:
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1346 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1347 if (sparse)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1348 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	1349 else
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1350 retval = do_mat2cell (a.array_value (), d, nargin - 1);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1351 break;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1352 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1353 case btyp_complex:
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1354 {
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1355 if (sparse)
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1356 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	1357 else
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1358 retval = do_mat2cell (a.complex_array_value (), d, nargin - 1);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1359 break;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1360 }
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1361 #define BTYP_BRANCH(X,Y) \
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1362 case btyp_ ## X: \
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1363 retval = do_mat2cell (a.Y ## _value (), d, nargin - 1); \
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1364 break
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1365
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1366 BTYP_BRANCH (float, float_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1367 BTYP_BRANCH (float_complex, float_complex_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1368 BTYP_BRANCH (bool, bool_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1369 BTYP_BRANCH (char, char_array);
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1370
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1371 BTYP_BRANCH (int8, int8_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1372 BTYP_BRANCH (int16, int16_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1373 BTYP_BRANCH (int32, int32_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1374 BTYP_BRANCH (int64, int64_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1375 BTYP_BRANCH (uint8, uint8_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1376 BTYP_BRANCH (uint16, uint16_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1377 BTYP_BRANCH (uint32, uint32_array);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1378 BTYP_BRANCH (uint64, uint64_array);
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1379
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1380 BTYP_BRANCH (cell, cell);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1381 BTYP_BRANCH (struct, map);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1382 #undef BTYP_BRANCH
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1383
10786 146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1384 case btyp_func_handle:
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1385 gripe_wrong_type_arg ("mat2cell", a);
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1386 break;
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1387 default:
146a97c3bc97 some optimizations for mat2cell Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	1388 retval = do_mat2cell (a, d, nargin-1);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10125 diff changeset	1389 }
5784 70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1390 }
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1391
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1392 return retval;
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1393 }
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1394
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1395 /*
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1396
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1397 %!test
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1398 %! x = reshape(1:20,5,4);
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1399 %! c = mat2cell(x,[3,2],[3,1]);
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1400 %! 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	1401
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1402 %!test
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1403 %! x = 'abcdefghij';
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1404 %! 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	1405 %! empty1by0str = resize('',1,0);
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1406 %! assert(c,{empty1by0str,'abcd','ef',empty1by0str,'ghij',empty1by0str})
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1407
70f7659d0fb9 [project @ 2006-05-03 05:55:56 by dbateman] dbateman parents: 5642 diff changeset	1408 */
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1409
9740 78ac37d73557 fix cellslices to handle empty ranges with non-positive bounds Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	1410 // 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	1411 template <class NDA>
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1412 static Cell
9740 78ac37d73557 fix cellslices to handle empty ranges with non-positive bounds Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	1413 do_cellslices_nda (const NDA& array,
78ac37d73557 fix cellslices to handle empty ranges with non-positive bounds Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	1414 const Array<octave_idx_type>& lb,
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1415 const Array<octave_idx_type>& ub,
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1416 int dim = -1)
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1417 {
9740 78ac37d73557 fix cellslices to handle empty ranges with non-positive bounds Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	1418 octave_idx_type n = lb.length ();
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1419 Cell retval (1, n);
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1420 if (array.is_vector () && (dim == -1
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1421 \|\| (dim == 0 && array.columns () == 1)
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1422 \|\| (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	1423 {
8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	1424 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	1425 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	1426 }
8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	1427 else
8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	1428 {
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1429 const dim_vector dv = array.dims ();
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1430 int ndims = dv.length ();
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1431 if (dim < 0)
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1432 dim = dv.first_non_singleton ();
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1433 ndims = std::max (ndims, dim + 1);
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1434
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	1435 Array<idx_vector> idx (dim_vector (ndims, 1), idx_vector::colon);
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1436
9057 8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	1437 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	1438 {
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1439 idx(dim) = idx_vector (lb(i) - 1, ub(i));
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1440 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	1441 }
8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	1442 }
8b263623d0f3 have cellslices index the last dim of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9042 diff changeset	1443
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1444 return retval;
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1445 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1446
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1447 DEFUN_DLD (cellslices, args, ,
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1448 "-- texinfo --\n\
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1449 @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	1450 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	1451 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	1452 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	1453 following code:\n\
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1454 \n\
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1455 @example\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 9057 diff changeset	1456 @group\n\
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1457 n = length (lb);\n\
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1458 sl = cell (1, n);\n\
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1459 for i = 1:length (lb)\n\
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1460 sl@{i@} = x(:,@dots{},lb(i):ub(i),@dots{},:);\n\
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1461 endfor\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 9057 diff changeset	1462 @end group\n\
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1463 @end example\n\
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1464 \n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	1465 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	1466 slicing is done along the first non-singleton dimension.\n\
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1467 @end deftypefn")
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1468 {
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1469 octave_value retval;
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1470 int nargin = args.length ();
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1471 if (nargin == 3 \|\| nargin == 4)
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1472 {
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1473 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	1474 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	1475 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	1476 int dim = -1;
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1477 if (nargin == 4)
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1478 {
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1479 dim = args(3).int_value () - 1;
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1480 if (dim < 0)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	1481 error ("cellslices: DIM must be a valid dimension");
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1482 }
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1483
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1484 if (! error_state)
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1485 {
9740 78ac37d73557 fix cellslices to handle empty ranges with non-positive bounds Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	1486 if (lb.length () != ub.length ())
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	1487 error ("cellslices: the lengths of LB and UB must match");
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1488 else
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1489 {
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1490 Cell retcell;
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1491 if (! x.is_sparse_type () && x.is_matrix_type ())
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1492 {
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1493 // specialize for some dense arrays.
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1494 if (x.is_bool_type ())
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1495 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	1496 else if (x.is_char_matrix ())
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1497 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	1498 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	1499 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9622 diff changeset	1500 if (x.is_int8_type ())
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1501 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	1502 else if (x.is_int16_type ())
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1503 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	1504 else if (x.is_int32_type ())
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1505 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	1506 else if (x.is_int64_type ())
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1507 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	1508 else if (x.is_uint8_type ())
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1509 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	1510 else if (x.is_uint16_type ())
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1511 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	1512 else if (x.is_uint32_type ())
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1513 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	1514 else if (x.is_uint64_type ())
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1515 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	1516 }
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1517 else if (x.is_complex_type ())
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1518 {
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1519 if (x.is_single_type ())
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1520 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	1521 else
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1522 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	1523 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1524 else
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1525 {
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1526 if (x.is_single_type ())
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1527 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	1528 else
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1529 retcell = do_cellslices_nda (x.array_value (), lb, ub, dim);
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1530 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1531 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1532 else
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1533 {
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1534 // generic code.
9740 78ac37d73557 fix cellslices to handle empty ranges with non-positive bounds Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	1535 octave_idx_type n = lb.length ();
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1536 retcell = Cell (1, n);
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1537 const dim_vector dv = x.dims ();
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1538 int ndims = dv.length ();
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1539 if (dim < 0)
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1540 dim = dv.first_non_singleton ();
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1541 ndims = std::max (ndims, dim + 1);
82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1542 octave_value_list idx (ndims, octave_value::magic_colon_t);
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1543 for (octave_idx_type i = 0; i < n && ! error_state; i++)
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1544 {
10125 82ed1b4c3011 improve cellslices Jaroslav Hajek <highegg@gmail.com> parents: 10122 diff changeset	1545 idx(dim) = Range (lb(i), ub(i));
8985 193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1546 retcell(i) = x.do_index_op (idx);
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1547 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1548 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1549 if (! error_state)
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1550 retval = retcell;
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1551 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1552 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1553 }
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1554 else
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1555 print_usage ();
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1556
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1557 return retval;
193804a4f82f add cellslices function Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1558 }
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	1559
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	1560 /*
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	1561 %!test
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10075 diff changeset	1562 %! 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	1563 %! 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	1564 %! 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	1565 */
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1566
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1567 DEFUN_DLD (cellindexmat, args, ,
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1568 "-- texinfo --\n\
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1569 @deftypefn {Loadable Function} {@var{y} =} cellindexmat (@var{x}, @var{varargin})\n\
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1570 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	1571 \n\
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1572 @example\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	1573 @group\n\
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1574 Y = cell (size (X));\n\
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1575 for i = 1:numel (X)\n\
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1576 Y@{i@} = X@{i@}(varargin@{:@});\n\
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1577 endfor\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	1578 @end group\n\
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1579 @end example\n\
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1580 @seealso{cellfun, cellslices}\n\
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1581 @end deftypefn")
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1582 {
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1583 octave_value retval;
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1584 if (args.length () >= 1)
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1585 {
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1586 if (args(0).is_cell ())
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1587 {
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1588 const Cell x = args(0).cell_value ();
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1589 NoAlias<Cell> y(x.dims ());
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1590 octave_idx_type nel = x.numel ();
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1591 octave_value_list idx = args.slice (1, args.length () - 1);
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1592
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1593 for (octave_idx_type i = 0; i < nel; i++)
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1594 {
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1595 octave_quit ();
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1596 octave_value tmp = x(i);
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1597 y(i) = tmp.do_index_op (idx);
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1598 if (error_state)
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1599 break;
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1600 }
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1601
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1602 retval = y;
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1603 }
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1604 else
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	1605 error ("cellindexmat: X must be a cell");
10963 0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1606 }
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1607 else
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1608 print_usage ();
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1609
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1610 return retval;
0d7624852beb implement cellindexmat function Jaroslav Hajek <highegg@gmail.com> parents: 10846 diff changeset	1611 }

Mercurial > hg > octave-nkf

annotate src/DLD-FUNCTIONS/cellfun.cc @ 11570:57632dea2446