octave: scripts/general/accumarray.m annotate

annotate scripts/general/accumarray.m @ 30893:e1788b1a315f

maint: Use "fcn" as preferred abbreviation for "function" in m-files. * accumarray.m, accumdim.m, quadl.m, quadv.m, randi.m, structfun.m, __is_function__.m, uigetfile.m, uimenu.m, uiputfile.m, doc_cache_create.m, colorspace_conversion_input_check.m, imageIO.m, argnames.m, vectorize.m, vectorize.m, normest1.m, inputname.m, nthargout.m, display_info_file.m, decic.m, ode15i.m, ode15s.m, ode23.m, ode23s.m, ode45.m, odeset.m, check_default_input.m, integrate_adaptive.m, ode_event_handler.m, runge_kutta_23.m, runge_kutta_23s.m, runge_kutta_45_dorpri.m, runge_kutta_interpolate.m, starting_stepsize.m, __all_opts__.m, fminbnd.m, fminsearch.m, fminunc.m, fsolve.m, fzero.m, sqp.m, fplot.m, plotyy.m, __bar__.m, __ezplot__.m, flat_entry.html, profexport.m, movfun.m, bicg.m, bicgstab.m, cgs.m, eigs.m, gmres.m, pcg.m, __alltohandles__.m, __sprand__.m, qmr.m, tfqmr.m, dump_demos.m: Replace "func", "fun", "fn" in documentation and variable names with "fcn".

author	Rik <rik@octave.org>
date	Mon, 04 Apr 2022 18:14:56 -0700
parents	5d3faba0342e
children	597f3ee61a48

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ########################################################################
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 ##
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3 ## Copyright (C) 2007-2022 The Octave Project Developers
27918 b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	4 ##
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 ## See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 ## distribution or <https://octave.org/copyright/>.
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	7 ##
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	8 ## This file is part of Octave.
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	9 ##
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24266 diff changeset	10 ## Octave is free software: you can redistribute it and/or modify it
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	11 ## under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24266 diff changeset	12 ## the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22489 diff changeset	13 ## (at your option) any later version.
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	14 ##
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	15 ## Octave is distributed in the hope that it will be useful, but
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	16 ## WITHOUT ANY WARRANTY; without even the implied warranty of
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22489 diff changeset	17 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22489 diff changeset	18 ## GNU General Public License for more details.
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	19 ##
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	20 ## You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	21 ## along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24266 diff changeset	22 ## <https://www.gnu.org/licenses/>.
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 ##
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ########################################################################
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	25
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	26 ## -- texinfo --
30875 5d3faba0342e doc: Ensure documentation lists output argument when it exists for all m-files. Rik <rik@octave.org> parents: 30564 diff changeset	27 ## @deftypefn {} {@var{A} =} accumarray (@var{subs}, @var{vals})
5d3faba0342e doc: Ensure documentation lists output argument when it exists for all m-files. Rik <rik@octave.org> parents: 30564 diff changeset	28 ## @deftypefnx {} {@var{A} =} accumarray (@var{subs}, @var{vals}, @var{sz})
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	29 ## @deftypefnx {} {@var{A} =} accumarray (@var{subs}, @var{vals}, @var{sz}, @var{fcn})
e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	30 ## @deftypefnx {} {@var{A} =} accumarray (@var{subs}, @var{vals}, @var{sz}, @var{fcn}, @var{fillval})
e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	31 ## @deftypefnx {} {@var{A} =} accumarray (@var{subs}, @var{vals}, @var{sz}, @var{fcn}, @var{fillval}, @var{issparse})
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	32 ##
7186 800f1fd3ffb8 [project @ 2007-11-26 19:16:07 by jwe] jwe parents: 7016 diff changeset	33 ## Create an array by accumulating the elements of a vector into the
20158 7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19865 diff changeset	34 ## positions defined by their subscripts.
7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19865 diff changeset	35 ##
7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19865 diff changeset	36 ## The subscripts are defined by the rows of the matrix @var{subs} and the
7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19865 diff changeset	37 ## values by @var{vals}. Each row of @var{subs} corresponds to one of the
7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19865 diff changeset	38 ## values in @var{vals}. If @var{vals} is a scalar, it will be used for each
7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19865 diff changeset	39 ## of the row of @var{subs}. If @var{subs} is a cell array of vectors, all
7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19865 diff changeset	40 ## vectors must be of the same length, and the subscripts in the @var{k}th
14113 dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	41 ## vector must correspond to the @var{k}th dimension of the result.
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	42 ##
13152 8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	43 ## The size of the matrix will be determined by the subscripts
14119 94e2a76f1e5a doc: Final grammarcheck and spellcheck before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 14115 diff changeset	44 ## themselves. However, if @var{sz} is defined it determines the matrix
94e2a76f1e5a doc: Final grammarcheck and spellcheck before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 14115 diff changeset	45 ## size. The length of @var{sz} must correspond to the number of columns
13929 9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13788 diff changeset	46 ## in @var{subs}. An exception is if @var{subs} has only one column, in
14115 0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	47 ## which case @var{sz} may be the dimensions of a vector and the
0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	48 ## subscripts of @var{subs} are taken as the indices into it.
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	49 ##
13152 8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	50 ## The default action of @code{accumarray} is to sum the elements with
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	51 ## the same subscripts. This behavior can be modified by defining the
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	52 ## @var{fcn} function. This should be a function or function handle
13152 8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	53 ## that accepts a column vector and returns a scalar. The result of the
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	54 ## function should not depend on the order of the subscripts.
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	55 ##
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	56 ## The elements of the returned array that have no subscripts associated
13929 9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13788 diff changeset	57 ## with them are set to zero. Defining @var{fillval} to some other value
13931 9de488c6c59c doc: Spellcheck documentation before 3.6.0 release Rik <octave@nomad.inbox5.com> parents: 13929 diff changeset	58 ## allows these values to be defined. This behavior changes, however,
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	59 ## for certain values of @var{fcn}. If @var{fcn} is @code{@@min}
24264 ec4ec2f7029d accumarray.m: Add '@' to function handles in docstring (bug #52418). Rik <rik@octave.org> parents: 23219 diff changeset	60 ## (respectively, @code{@@max}) then the result will be filled with the
13787 8bb7bdbe9c69 Clarify max/min in accumarray and uniformise its behaviour Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13175 diff changeset	61 ## minimum (respectively, maximum) integer if @var{vals} is of integral
8bb7bdbe9c69 Clarify max/min in accumarray and uniformise its behaviour Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13175 diff changeset	62 ## type, logical false (respectively, logical true) if @var{vals} is of
8bb7bdbe9c69 Clarify max/min in accumarray and uniformise its behaviour Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13175 diff changeset	63 ## logical type, zero if @var{fillval} is zero and all values are
13931 9de488c6c59c doc: Spellcheck documentation before 3.6.0 release Rik <octave@nomad.inbox5.com> parents: 13929 diff changeset	64 ## non-positive (respectively, non-negative), and NaN otherwise.
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	65 ##
13152 8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	66 ## By default @code{accumarray} returns a full matrix. If
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	67 ## @var{issparse} is logically true, then a sparse matrix is returned
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	68 ## instead.
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	69 ##
13152 8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	70 ## The following @code{accumarray} example constructs a frequency table
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	71 ## that in the first column counts how many occurrences each number in
13929 9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13788 diff changeset	72 ## the second column has, taken from the vector @var{x}. Note the usage
13152 8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	73 ## of @code{unique} for assigning to all repeated elements of @var{x}
28959 5394d688d456 doc: Use @code{} within alternate text for @xref,@pxref macros for better Info display. Rik <rik@octave.org> parents: 28930 diff changeset	74 ## the same index (@pxref{XREFunique,,@code{unique}}).
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	75 ##
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	76 ## @example
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	77 ## @group
14122 c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	78 ## @var{x} = [91, 92, 90, 92, 90, 89, 91, 89, 90, 100, 100, 100];
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	79 ## [@var{u}, ~, @var{j}] = unique (@var{x});
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	80 ## [accumarray(@var{j}', 1), @var{u}']
14327 4d917a6a858b doc: Use Octave coding conventions in @example blocks of docstrings. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	81 ## @result{} 2 89
4d917a6a858b doc: Use Octave coding conventions in @example blocks of docstrings. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	82 ## 3 90
4d917a6a858b doc: Use Octave coding conventions in @example blocks of docstrings. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	83 ## 2 91
4d917a6a858b doc: Use Octave coding conventions in @example blocks of docstrings. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	84 ## 2 92
4d917a6a858b doc: Use Octave coding conventions in @example blocks of docstrings. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	85 ## 3 100
13152 8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	86 ## @end group
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	87 ## @end example
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	88 ##
13929 9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13788 diff changeset	89 ## Another example, where the result is a multi-dimensional 3-D array and
13152 8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	90 ## the default value (zero) appears in the output:
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	91 ##
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	92 ## @example
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	93 ## @group
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	94 ## accumarray ([1, 1, 1;
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	95 ## 2, 1, 2;
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	96 ## 2, 3, 2;
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	97 ## 2, 1, 2;
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	98 ## 2, 3, 2], 101:105)
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	99 ## @result{} ans(:,:,1) = [101, 0, 0; 0, 0, 0]
14327 4d917a6a858b doc: Use Octave coding conventions in @example blocks of docstrings. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	100 ## @result{} ans(:,:,2) = [0, 0, 0; 206, 0, 208]
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	101 ## @end group
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	102 ## @end example
10275 19f2107d1fdd document accumarray complexity Jaroslav Hajek <highegg@gmail.com> parents: 10274 diff changeset	103 ##
14122 c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	104 ## The sparse option can be used as an alternative to the @code{sparse}
28959 5394d688d456 doc: Use @code{} within alternate text for @xref,@pxref macros for better Info display. Rik <rik@octave.org> parents: 28930 diff changeset	105 ## constructor (@pxref{XREFsparse,,@code{sparse}}). Thus
14122 c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	106 ##
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	107 ## @example
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	108 ## sparse (@var{i}, @var{j}, @var{sv})
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	109 ## @end example
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	110 ##
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	111 ## @noindent
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	112 ## can be written with @code{accumarray} as
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	113 ##
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	114 ## @example
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	115 ## accumarray ([@var{i}, @var{j}], @var{sv}', [], [], 0, true)
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	116 ## @end example
13152 8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	117 ##
14122 c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	118 ## @noindent
14366 b76f0740940e doc: Periodic grammar check of documentation. Rik <octave@nomad.inbox5.com> parents: 14363 diff changeset	119 ## For repeated indices, @code{sparse} adds the corresponding value. To
14124 4b07db9dd976 accumarray.m: Fix trivial typo in docstring. Ben Abbott <bpabbott@mac.com> parents: 14122 diff changeset	120 ## take the minimum instead, use @code{min} as an accumulator function:
14122 c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	121 ##
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	122 ## @example
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	123 ## accumarray ([@var{i}, @var{j}], @var{sv}', [], @@min, 0, true)
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	124 ## @end example
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	125 ##
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	126 ## The complexity of accumarray in general for the non-sparse case is
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	127 ## generally O(M+N), where N is the number of subscripts and M is the
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	128 ## maximum subscript (linearized in multi-dimensional case). If
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	129 ## @var{fcn} is one of @code{@@sum} (default), @code{@@max},
14122 c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	130 ## @code{@@min} or @code{@@(x) @{x@}}, an optimized code path is used.
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	131 ## Note that for general reduction function the interpreter overhead can
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	132 ## play a major part and it may be more efficient to do multiple
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	133 ## accumarray calls and compute the results in a vectorized manner.
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	134 ##
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	135 ## @seealso{accumdim, unique, sparse}
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	136 ## @end deftypefn
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	137
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	138 function A = accumarray (subs, vals, sz = [], fcn = [], fillval = [], issparse = [])
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	139
28789 28de41192f3c Eliminate unneeded verification of nargin, nargout in m-files. Rik <rik@octave.org> parents: 27923 diff changeset	140 if (nargin < 2)
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	141 print_usage ();
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	142 endif
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	143
14113 dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	144 lenvals = length (vals);
dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	145
7186 800f1fd3ffb8 [project @ 2007-11-26 19:16:07 by jwe] jwe parents: 7016 diff changeset	146 if (iscell (subs))
14113 dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	147 subs = cellfun (@vec, subs, "uniformoutput", false);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	148 ndims = numel (subs);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	149 if (ndims == 1)
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	150 subs = subs{1};
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	151 endif
14113 dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	152
dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	153 lensubs = cellfun (@length, subs);
dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	154
19865 e9f89866074c maint: Cleanup some .m files to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19700 diff changeset	155 if (any (lensubs != lensubs(1)) \|\| (lenvals > 1 && lenvals != lensubs(1)))
14113 dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	156 error ("accumarray: dimension mismatch");
dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	157 endif
dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	158
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	159 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	160 ndims = columns (subs);
14113 dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	161 if (lenvals > 1 && lenvals != rows (subs))
15202 f3b5cadfd6d5 fix missing semicolons in various .m files John W. Eaton <jwe@octave.org> parents: 14868 diff changeset	162 error ("accumarray: dimension mismatch");
14113 dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	163 endif
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	164 endif
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	165
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	166 if (isempty (fcn))
e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	167 fcn = @sum;
e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	168 elseif (! is_function_handle (fcn))
e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	169 error ("accumarray: FCN must be a function handle");
23493 bf063fafeca5 accumarray.m: check if func is a function handle Carnë Draug <carandraug@octave.org> parents: 23220 diff changeset	170 endif
bf063fafeca5 accumarray.m: check if func is a function handle Carnë Draug <carandraug@octave.org> parents: 23220 diff changeset	171
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	172 if (isempty (fillval))
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	173 fillval = 0;
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	174 endif
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	175
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	176 if (isempty (issparse))
c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	177 issparse = false;
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	178 endif
7186 800f1fd3ffb8 [project @ 2007-11-26 19:16:07 by jwe] jwe parents: 7016 diff changeset	179
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	180 if (issparse)
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	181
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21580 diff changeset	182 ## Sparse case.
b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21580 diff changeset	183 ## Avoid linearizing the subscripts, because it could overflow.
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	184
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	185 if (fillval != 0)
11472 1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done. Rik <octave@nomad.inbox5.com> parents: 11469 diff changeset	186 error ("accumarray: FILLVAL must be zero in the sparse case");
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	187 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	188
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	189 ## Ensure subscripts are a two-column matrix.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	190 if (iscell (subs))
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	191 subs = [subs{:}];
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	192 endif
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	193
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	194 ## Validate dimensions.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	195 if (ndims == 1)
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	196 subs(:,2) = 1;
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	197 elseif (ndims != 2)
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	198 error ("accumarray: in the sparse case, needs 1 or 2 subscripts");
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	199 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	200
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	201 if (isnumeric (vals) \|\| islogical (vals))
c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	202 vals = double (vals);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	203 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	204 error ("accumarray: in the sparse case, values must be numeric or logical");
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	205 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	206
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	207 if (fcn != @sum)
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	208
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21580 diff changeset	209 ## Reduce values. This is not needed if we're about to sum them,
14115 0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	210 ## because "sparse" can do that.
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	211
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	212 ## Sort indices.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	213 [subs, idx] = sortrows (subs);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	214 n = rows (subs);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	215 ## Identify runs.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	216 jdx = find (any (diff (subs, 1, 1), 2));
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	217 jdx = [jdx; n];
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	218
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	219 vals = cellfun (fcn, mat2cell (vals(:)(idx), diff ([0; jdx])));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	220 subs = subs(jdx, :);
10283 b178769f31ca more small improvements in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	221 mode = "unique";
b178769f31ca more small improvements in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	222 else
b178769f31ca more small improvements in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	223 mode = "sum";
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	224 endif
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	225
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	226 ## Form the sparse matrix.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	227 if (isempty (sz))
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	228 A = sparse (subs(:,1), subs(:,2), vals, mode);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	229 elseif (length (sz) == 2)
13788 9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	230
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	231 ## Row vector case
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	232 if (sz(1) == 1)
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	233 [i, j] = deal (subs(:,2), subs(:,1));
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	234 else
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	235 [i, j] = deal (subs(:,1), subs(:,2));
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	236 endif
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	237 A = sparse (i, j, vals, sz(1), sz(2), mode);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	238 else
11589 b0084095098e missing semicolons in script files John W. Eaton <jwe@octave.org> parents: 11587 diff changeset	239 error ("accumarray: dimensions mismatch");
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	240 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	241
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	242 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	243
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	244 ## Linearize subscripts.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	245 if (ndims > 1)
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	246 if (isempty (sz))
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	247 if (iscell (subs))
12931 cefd568ea073 Replace function handles with function names in cellfun calls for 15% speedup. Rik <octave@nomad.inbox5.com> parents: 12214 diff changeset	248 sz = cellfun ("max", subs);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	249 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	250 sz = max (subs, [], 1);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	251 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	252 elseif (ndims != length (sz))
11589 b0084095098e missing semicolons in script files John W. Eaton <jwe@octave.org> parents: 11587 diff changeset	253 error ("accumarray: dimensions mismatch");
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	254 endif
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	255
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	256 ## Convert multidimensional subscripts.
19700 00e31f316a3a Fix Matlab incompatibility of "ismatrix" (bug #42422). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19697 diff changeset	257 if (isnumeric (subs))
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	258 subs = num2cell (subs, 1);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	259 endif
10274 db613bccd992 take advantage of new sort optimization in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10271 diff changeset	260 subs = sub2ind (sz, subs{:}); # creates index cache
10271 297996005012 1 more small fix in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10269 diff changeset	261 elseif (! isempty (sz) && length (sz) < 2)
10269 217d36560dfa small fixes to accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10268 diff changeset	262 error ("accumarray: needs at least 2 dimensions");
10274 db613bccd992 take advantage of new sort optimization in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10271 diff changeset	263 elseif (! isindex (subs)) # creates index cache
db613bccd992 take advantage of new sort optimization in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10271 diff changeset	264 error ("accumarray: indices must be positive integers");
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	265 endif
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	266
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	267
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	268 ## Some built-in reductions handled efficiently.
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	269
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	270 if (fcn == @sum)
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	271 ## Fast summation.
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	272 if (isempty (sz))
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	273 A = __accumarray_sum__ (subs, vals);
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	274 else
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	275 A = __accumarray_sum__ (subs, vals, prod (sz));
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	276 ## set proper shape.
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	277 A = reshape (A, sz);
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	278 endif
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	279
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	280 ## we fill in nonzero fill value.
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	281 if (fillval != 0)
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	282 mask = true (size (A));
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	283 mask(subs) = false;
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	284 A(mask) = fillval;
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	285 endif
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	286 elseif (fcn == @max)
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	287 ## Fast maximization.
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	288
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	289 if (isinteger (vals))
26056 df3f2e119944 Expand intmax/intmin to accept an integer variable as input. Rik <rik@octave.org> parents: 25054 diff changeset	290 zero = intmin (vals);
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	291 elseif (islogical (vals))
10269 217d36560dfa small fixes to accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10268 diff changeset	292 zero = false;
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	293 elseif (fillval == 0 && all (vals(:) >= 0))
14115 0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	294 ## This is a common case - fillval is zero, all numbers
0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	295 ## nonegative.
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	296 zero = 0;
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	297 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	298 zero = NaN; # Neutral value.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	299 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	300
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	301 if (isempty (sz))
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	302 A = __accumarray_max__ (subs, vals, zero);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	303 else
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	304 A = __accumarray_max__ (subs, vals, zero, prod (sz));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	305 A = reshape (A, sz);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	306 endif
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	307
10775 6892c5562950 fix bug in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10283 diff changeset	308 if (fillval != zero && ! (isnan (fillval) \|\| isnan (zero)))
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	309 mask = true (size (A));
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	310 mask(subs) = false;
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	311 A(mask) = fillval;
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	312 endif
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	313 elseif (fcn == @min)
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	314 ## Fast minimization.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	315
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	316 if (isinteger (vals))
26056 df3f2e119944 Expand intmax/intmin to accept an integer variable as input. Rik <rik@octave.org> parents: 25054 diff changeset	317 zero = intmax (vals);
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	318 elseif (islogical (vals))
10269 217d36560dfa small fixes to accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10268 diff changeset	319 zero = true;
13787 8bb7bdbe9c69 Clarify max/min in accumarray and uniformise its behaviour Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13175 diff changeset	320 elseif (fillval == 0 && all (vals(:) <= 0))
14115 0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	321 ## This is a common case - fillval is zero, all numbers
0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	322 ## non-positive.
13787 8bb7bdbe9c69 Clarify max/min in accumarray and uniformise its behaviour Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13175 diff changeset	323 zero = 0;
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	324 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	325 zero = NaN; # Neutral value.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	326 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	327
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	328 if (isempty (sz))
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	329 A = __accumarray_min__ (subs, vals, zero);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	330 else
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	331 A = __accumarray_min__ (subs, vals, zero, prod (sz));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	332 A = reshape (A, sz);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	333 endif
8820 89b95972e178 fix previously introduced problem in octave_sort, improve design Jaroslav Hajek <highegg@gmail.com> parents: 8507 diff changeset	334
10775 6892c5562950 fix bug in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10283 diff changeset	335 if (fillval != zero && ! (isnan (fillval) \|\| isnan (zero)))
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	336 mask = true (size (A));
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	337 mask(subs) = false;
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	338 A(mask) = fillval;
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	339 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	340 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	341
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21580 diff changeset	342 ## The general case. Reduce values.
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	343 n = rows (subs);
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	344 if (numel (vals) == 1)
c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	345 vals = vals(ones (1, n), 1);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	346 else
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	347 vals = vals(:);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	348 endif
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	349
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	350 ## Sort indices.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	351 [subs, idx] = sort (subs);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	352 ## Identify runs.
10283 b178769f31ca more small improvements in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	353 jdx = find (subs(1:n-1) != subs(2:n));
21401 2f402f7c1a0b accumarray: fix general case for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21400 diff changeset	354 if (n != 0) # bug #47287
2f402f7c1a0b accumarray: fix general case for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21400 diff changeset	355 jdx = [jdx; n];
2f402f7c1a0b accumarray: fix general case for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21400 diff changeset	356 endif
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	357 vals = mat2cell (vals(idx), diff ([0; jdx]));
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21580 diff changeset	358 ## Optimize the case when function is @(x) {x}, i.e., we just want
14115 0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	359 ## to collect the values to cells.
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	360 persistent simple_cell_str = func2str (@(x) {x});
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	361 if (! strcmp (func2str (fcn), simple_cell_str))
e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	362 vals = cellfun (fcn, vals);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	363 endif
21401 2f402f7c1a0b accumarray: fix general case for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21400 diff changeset	364
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	365 subs = subs(jdx);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	366
14114 da67f032a712 accumarray.m: Handle the case of empty size argument for functions besides @sum Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14113 diff changeset	367 if (isempty (sz))
da67f032a712 accumarray.m: Handle the case of empty size argument for functions besides @sum Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14113 diff changeset	368 sz = max (subs);
21402 8cfc50637511 accumarray: fix default output size for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21401 diff changeset	369 ## If subs is empty, sz will be too, and length will be 0, hence "<= 1"
8cfc50637511 accumarray: fix default output size for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21401 diff changeset	370 if (length (sz) <= 1)
14114 da67f032a712 accumarray.m: Handle the case of empty size argument for functions besides @sum Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14113 diff changeset	371 sz(2) = 1;
da67f032a712 accumarray.m: Handle the case of empty size argument for functions besides @sum Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14113 diff changeset	372 endif
da67f032a712 accumarray.m: Handle the case of empty size argument for functions besides @sum Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14113 diff changeset	373 endif
da67f032a712 accumarray.m: Handle the case of empty size argument for functions besides @sum Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14113 diff changeset	374
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	375 ## Construct matrix of fillvals.
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	376 if (iscell (vals))
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	377 A = cell (sz);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	378 elseif (fillval == 0)
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	379 A = zeros (sz, class (vals));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	380 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	381 A = repmat (fillval, sz);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	382 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	383
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	384 ## Set the reduced values.
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	385 A(subs) = vals;
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	386 endif
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	387 endif
21758 ffad2baa90f7 maint: Use newlines to make code more readable. Rik <rik@octave.org> parents: 21751 diff changeset	388
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	389 endfunction
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	390
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14327 diff changeset	391
21400 00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	392 %!assert (accumarray ([1; 2; 4; 2; 4], 101:105), [101; 206; 0; 208])
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	393 %!assert (accumarray ([1 1 1; 2 1 2; 2 3 2; 2 1 2; 2 3 2], 101:105),
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	394 %! cat (3, [101 0 0; 0 0 0], [0 0 0; 206 0 208]))
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	395
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	396 %!assert (accumarray ([1 1 1; 2 1 2; 2 3 2; 2 1 2; 2 3 2], 101:105, [], @(x) sin (sum (x))),
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	397 %! sin (cat (3, [101,0,0;0,0,0],[0,0,0;206,0,208])))
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	398
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	399 %!assert (accumarray ({[1 3 3 2 3 1 2 2 3 3 1 2], [3 4 2 1 4 3 4 2 2 4 3 4], [1 1 2 2 1 1 2 1 1 1 2 2]}, 101:112),
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	400 %! cat (3, [0 0 207 0; 0 108 0 0; 0 109 0 317], [0 0 111 0; 104 0 0 219; 0 103 0 0]))
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	401
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	402 %!assert (accumarray ([1 1; 2 1; 2 3; 2 1; 2 3], 101:105, [2 4], @max, NaN),
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	403 %! [101 NaN NaN NaN; 104 NaN 105 NaN])
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	404
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	405 %!assert (accumarray ([1 1; 2 1; 2 3; 2 1; 2 3], 101:105, [], @prod),
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	406 %! [101 0 0; 10608 0 10815])
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	407 %!assert (accumarray ([1 1; 2 1; 2 3; 2 1; 2 3], 101:105, [2 4], @prod, 0, true),
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	408 %! sparse ([1 2 2], [1 1 3], [101 10608 10815], 2, 4))
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	409 %!assert (accumarray ([1 1; 2 1; 2 3; 2 1; 2 3], 1, [2 4]), [1 0 0 0; 2 0 2 0])
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	410 %!assert (accumarray ([1 1; 2 1; 2 3; 2 1; 2 3], 101:105, [2 4], @(x) length (x) > 1),
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	411 %! [false false false false; true false true false])
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	412
13788 9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	413 %!assert (accumarray ([1; 2], [3; 4], [2, 1], @min, [], 0), [3; 4])
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	414 %!assert (accumarray ([1; 2], [3; 4], [2, 1], @min, [], 1), sparse ([3; 4]))
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	415 %!assert (accumarray ([1; 2], [3; 4], [1, 2], @min, [], 0), [3, 4])
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	416 %!assert (accumarray ([1; 2], [3; 4], [1, 2], @min, [], 1), sparse ([3, 4]))
21400 00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	417
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	418 %!test
21400 00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	419 %! A = accumarray ([1 1; 2 1; 2 3; 2 1; 2 3], 101:105, [2,4], @(x) {x});
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21402 diff changeset	420 %! assert (A{2},[102; 104]);
21400 00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	421
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	422 %!test
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	423 %! subs = ceil (rand (2000, 3)*10);
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	424 %! vals = rand (2000, 1);
21400 00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	425 %! assert (accumarray (subs, vals, [], @max),
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21402 diff changeset	426 %! accumarray (subs, vals, [], @(x) max (x)));
21400 00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	427
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	428 %!test
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	429 %! subs = ceil (rand (2000, 1)*100);
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	430 %! vals = rand (2000, 1);
21400 00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	431 %! assert (accumarray (subs, vals, [100, 1], @min, NaN),
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21402 diff changeset	432 %! accumarray (subs, vals, [100, 1], @(x) min (x), NaN));
21400 00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	433
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	434 %!test
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	435 %! subs = ceil (rand (2000, 2)*30);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	436 %! subsc = num2cell (subs, 1);
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	437 %! vals = rand (2000, 1);
21400 00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	438 %! assert (accumarray (subsc, vals, [], [], 0, true),
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21402 diff changeset	439 %! accumarray (subs, vals, [], [], 0, true));
21400 00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	440
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	441 %!test
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	442 %! subs = ceil (rand (2000, 3)*10);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	443 %! subsc = num2cell (subs, 1);
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	444 %! vals = rand (2000, 1);
21400 00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	445 %! assert (accumarray (subsc, vals, [], @max),
00960129ebf4 accumarray.m: edit tests to follow coding guidelines. Carnë Draug <carandraug@octave.org> parents: 20852 diff changeset	446 %! accumarray (subs, vals, [], @max));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	447
28930 2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests. Rik <rik@octave.org> parents: 28789 diff changeset	448 %!error accumarray (1:5)
2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests. Rik <rik@octave.org> parents: 28789 diff changeset	449 %!error accumarray ([1,2,3],1:2)
21401 2f402f7c1a0b accumarray: fix general case for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21400 diff changeset	450
22489 93ea313301f9 test: Add bug ids (<#####>) to BIST tests. Rik <rik@octave.org> parents: 22323 diff changeset	451 ## Handle empty arrays
23573 1b4f4ec53b4a use new script to tag fixed bugs in tests John W. Eaton <jwe@octave.org> parents: 23572 diff changeset	452 %!test <*47287>
21401 2f402f7c1a0b accumarray: fix general case for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21400 diff changeset	453 %! ## min, max, and sum are special cases within accumarray so test them.
2f402f7c1a0b accumarray: fix general case for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21400 diff changeset	454 %! funcs = {@(x) length (x) > 1, @min, @max, @sum};
2f402f7c1a0b accumarray: fix general case for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21400 diff changeset	455 %! for idx = 1:numel (funcs)
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21402 diff changeset	456 %! assert (accumarray (zeros (0, 1), [], [0 1] , funcs{idx}), zeros (0, 1));
ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21402 diff changeset	457 %! assert (accumarray (zeros (0, 1), [], [1 0] , funcs{idx}), zeros (1, 0));
ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21402 diff changeset	458 %! assert (accumarray (zeros (0, 1), [], [] , funcs{idx}), zeros (0, 1));
21401 2f402f7c1a0b accumarray: fix general case for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21400 diff changeset	459 %! endfor
2f402f7c1a0b accumarray: fix general case for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21400 diff changeset	460
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	461 ## Matlab returns an array of doubles even though FCN returns cells. In
21401 2f402f7c1a0b accumarray: fix general case for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21400 diff changeset	462 ## Octave, we do not have that bug, at least for this case.
2f402f7c1a0b accumarray: fix general case for empty list of subscripts (bug #47287) Carnë Draug <carandraug@octave.org> parents: 21400 diff changeset	463 %!assert (accumarray (zeros (0, 1), [], [0 1] , @(x) {x}), cell (0, 1))
23493 bf063fafeca5 accumarray.m: check if func is a function handle Carnë Draug <carandraug@octave.org> parents: 23220 diff changeset	464
30893 e1788b1a315f maint: Use "fcn" as preferred abbreviation for "function" in m-files. Rik <rik@octave.org> parents: 30875 diff changeset	465 %!error <FCN must be a function handle>
23493 bf063fafeca5 accumarray.m: check if func is a function handle Carnë Draug <carandraug@octave.org> parents: 23220 diff changeset	466 %! accumarray ([1; 2; 3], [1; 2; 3], [3 1], '@(x) {x}')