octave-nkf: scripts/general/accumarray.m annotate

annotate scripts/general/accumarray.m @ 19790:446c46af4b42 stable

strip trailing whitespace from most source files * Makefile.am, NEWS, build-aux/common.mk, configure.ac, doc/Makefile.am, doc/doxyhtml/Makefile.am, doc/interpreter/Makefile.am, doc/interpreter/arith.txi, doc/interpreter/audio.txi, doc/interpreter/basics.txi, doc/interpreter/bugs.txi, doc/interpreter/container.txi, doc/interpreter/cp-idx.txi, doc/interpreter/data.txi, doc/interpreter/debug.txi, doc/interpreter/diagperm.txi, doc/interpreter/diffeq.txi, doc/interpreter/doccheck/README, doc/interpreter/doccheck/spellcheck, doc/interpreter/emacs.txi, doc/interpreter/errors.txi, doc/interpreter/eval.txi, doc/interpreter/expr.txi, doc/interpreter/external.txi, doc/interpreter/fn-idx.txi, doc/interpreter/func.txi, doc/interpreter/geometry.txi, doc/interpreter/geometryimages.m, doc/interpreter/gpl.txi, doc/interpreter/grammar.txi, doc/interpreter/gui.txi, doc/interpreter/image.txi, doc/interpreter/install.txi, doc/interpreter/interp.txi, doc/interpreter/interpimages.m, doc/interpreter/intro.txi, doc/interpreter/io.txi, doc/interpreter/java.txi, doc/interpreter/linalg.txi, doc/interpreter/macros.texi, doc/interpreter/matrix.txi, doc/interpreter/munge-texi.pl, doc/interpreter/nonlin.txi, doc/interpreter/numbers.txi, doc/interpreter/obsolete.txi, doc/interpreter/octave-config.1, doc/interpreter/octave.texi, doc/interpreter/oop.txi, doc/interpreter/op-idx.txi, doc/interpreter/optim.txi, doc/interpreter/package.txi, doc/interpreter/plot.txi, doc/interpreter/poly.txi, doc/interpreter/preface.txi, doc/interpreter/quad.txi, doc/interpreter/set.txi, doc/interpreter/signal.txi, doc/interpreter/sparse.txi, doc/interpreter/sparseimages.m, doc/interpreter/splineimages.m, doc/interpreter/stats.txi, doc/interpreter/stmt.txi, doc/interpreter/strings.txi, doc/interpreter/system.txi, doc/interpreter/testfun.txi, doc/interpreter/tips.txi, doc/interpreter/var.txi, doc/interpreter/vectorize.txi, doc/liboctave/Makefile.am, doc/liboctave/array.texi, doc/liboctave/bugs.texi, doc/liboctave/cp-idx.texi, doc/liboctave/dae.texi, doc/liboctave/diffeq.texi, doc/liboctave/error.texi, doc/liboctave/factor.texi, doc/liboctave/fn-idx.texi, doc/liboctave/gpl.texi, doc/liboctave/install.texi, doc/liboctave/intro.texi, doc/liboctave/liboctave.texi, doc/liboctave/matvec.texi, doc/liboctave/nleqn.texi, doc/liboctave/nlfunc.texi, doc/liboctave/ode.texi, doc/liboctave/optim.texi, doc/liboctave/preface.texi, doc/liboctave/quad.texi, doc/liboctave/range.texi, doc/refcard/Makefile.am, doc/refcard/refcard.tex, etc/HACKING, etc/NEWS.1, etc/NEWS.2, etc/NEWS.3, etc/OLD-ChangeLogs/ChangeLog, etc/OLD-ChangeLogs/doc-ChangeLog, etc/OLD-ChangeLogs/scripts-ChangeLog, etc/OLD-ChangeLogs/src-ChangeLog, etc/OLD-ChangeLogs/test-ChangeLog, etc/PROJECTS, etc/README.Cygwin, etc/README.MacOS, etc/README.MinGW, etc/README.gnuplot, etc/gdbinit, etc/icons/Makefile.am, examples/@polynomial/end.m, examples/@polynomial/subsasgn.m, examples/Makefile.am, examples/standalonebuiltin.cc, libgui/Makefile.am, libgui/qterminal/libqterminal/README, libgui/qterminal/libqterminal/unix/BlockArray.cpp, libgui/qterminal/libqterminal/unix/BlockArray.h, libgui/qterminal/libqterminal/unix/Character.h, libgui/qterminal/libqterminal/unix/CharacterColor.h, libgui/qterminal/libqterminal/unix/Emulation.cpp, libgui/qterminal/libqterminal/unix/Emulation.h, libgui/qterminal/libqterminal/unix/Filter.cpp, libgui/qterminal/libqterminal/unix/Filter.h, libgui/qterminal/libqterminal/unix/History.cpp, libgui/qterminal/libqterminal/unix/History.h, libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp, libgui/qterminal/libqterminal/unix/KeyboardTranslator.h, libgui/qterminal/libqterminal/unix/LineFont.h, libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp, libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.h, libgui/qterminal/libqterminal/unix/Screen.cpp, libgui/qterminal/libqterminal/unix/Screen.h, libgui/qterminal/libqterminal/unix/ScreenWindow.cpp, libgui/qterminal/libqterminal/unix/ScreenWindow.h, libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp, libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.h, libgui/qterminal/libqterminal/unix/Vt102Emulation.h, libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp, libgui/qterminal/qterminal/main.cpp, libgui/src/m-editor/file-editor-tab.cc, libgui/src/octave-gui.cc, libgui/src/octave-qt-link.cc, libinterp/corefcn/data.cc, libinterp/corefcn/defun-int.h, libinterp/corefcn/det.cc, libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/lu.cc, libinterp/corefcn/oct-tex-parser.yy, libinterp/corefcn/oct-tex-symbols.in, libinterp/corefcn/quadcc.cc, libinterp/corefcn/zfstream.cc, libinterp/dldfcn/__eigs__.cc, libinterp/dldfcn/__voronoi__.cc, libinterp/gendoc.pl, libinterp/genprops.awk, libinterp/mk-errno-list, libinterp/mk-pkg-add, libinterp/mkbuiltins, libinterp/mkdefs, libinterp/mkdocs, libinterp/mkops, libinterp/octave-value/ov-java.cc, libinterp/parse-tree/lex.ll, libinterp/parse-tree/oct-parse.in.yy, libinterp/parse-tree/octave.gperf, liboctave/Makefile.am, liboctave/array/Array.cc, liboctave/array/module.mk, liboctave/cruft/daspk/datv.f, liboctave/cruft/daspk/dcnst0.f, liboctave/cruft/daspk/dcnstr.f, liboctave/cruft/daspk/ddasic.f, liboctave/cruft/daspk/ddasid.f, liboctave/cruft/daspk/ddasik.f, liboctave/cruft/daspk/ddaspk.f, liboctave/cruft/daspk/ddstp.f, liboctave/cruft/daspk/ddwnrm.f, liboctave/cruft/daspk/dfnrmd.f, liboctave/cruft/daspk/dfnrmk.f, liboctave/cruft/daspk/dhels.f, liboctave/cruft/daspk/dheqr.f, liboctave/cruft/daspk/dinvwt.f, liboctave/cruft/daspk/dlinsd.f, liboctave/cruft/daspk/dlinsk.f, liboctave/cruft/daspk/dmatd.f, liboctave/cruft/daspk/dnedd.f, liboctave/cruft/daspk/dnedk.f, liboctave/cruft/daspk/dnsd.f, liboctave/cruft/daspk/dnsid.f, liboctave/cruft/daspk/dnsik.f, liboctave/cruft/daspk/dnsk.f, liboctave/cruft/daspk/dorth.f, liboctave/cruft/daspk/dslvd.f, liboctave/cruft/daspk/dslvk.f, liboctave/cruft/daspk/dspigm.f, liboctave/cruft/daspk/dyypnw.f, liboctave/cruft/dasrt/ddasrt.f, liboctave/cruft/dasrt/drchek.f, liboctave/cruft/dassl/ddaslv.f, liboctave/cruft/dassl/ddassl.f, liboctave/cruft/misc/blaswrap.c, liboctave/cruft/misc/module.mk, liboctave/cruft/odepack/cfode.f, liboctave/cruft/odepack/dlsode.f, liboctave/cruft/odepack/ewset.f, liboctave/cruft/odepack/intdy.f, liboctave/cruft/odepack/prepj.f, liboctave/cruft/odepack/sintdy.f, liboctave/cruft/odepack/slsode.f, liboctave/cruft/odepack/solsy.f, liboctave/cruft/odepack/ssolsy.f, liboctave/cruft/odepack/stode.f, liboctave/cruft/odepack/vnorm.f, liboctave/cruft/ranlib/Basegen.doc, liboctave/cruft/ranlib/README, liboctave/cruft/ranlib/genbet.f, liboctave/cruft/ranlib/genexp.f, liboctave/cruft/ranlib/gennch.f, liboctave/cruft/ranlib/gennf.f, liboctave/cruft/ranlib/gennor.f, liboctave/cruft/ranlib/getsd.f, liboctave/cruft/ranlib/initgn.f, liboctave/cruft/ranlib/phrtsd.f, liboctave/cruft/ranlib/randlib.fdoc, liboctave/cruft/ranlib/setsd.f, liboctave/cruft/ranlib/tstgmn.for, liboctave/cruft/ranlib/tstmid.for, liboctave/cruft/slatec-fn/atanh.f, liboctave/cruft/slatec-fn/datanh.f, liboctave/cruft/slatec-fn/xgmainc.f, liboctave/cruft/slatec-fn/xsgmainc.f, liboctave/numeric/module.mk, liboctave/operators/mk-ops.awk, liboctave/operators/mx-ops, liboctave/operators/sparse-mk-ops.awk, liboctave/operators/sparse-mx-ops, liboctave/operators/vx-ops, liboctave/util/module.mk, run-octave.in, scripts/@ftp/ftp.m, scripts/audio/wavread.m, scripts/deprecated/java_convert_matrix.m, scripts/deprecated/java_debug.m, scripts/deprecated/java_invoke.m, scripts/deprecated/java_new.m, scripts/deprecated/java_unsigned_conversion.m, scripts/deprecated/javafields.m, scripts/deprecated/javamethods.m, scripts/deprecated/shell_cmd.m, scripts/general/accumarray.m, scripts/general/display.m, scripts/general/fieldnames.m, scripts/general/interp1.m, scripts/general/interp2.m, scripts/general/interp3.m, scripts/general/isa.m, scripts/general/methods.m, scripts/general/sortrows.m, scripts/geometry/convhull.m, scripts/geometry/delaunay.m, scripts/geometry/delaunay3.m, scripts/geometry/delaunayn.m, scripts/geometry/griddata.m, scripts/geometry/griddatan.m, scripts/geometry/voronoi.m, scripts/geometry/voronoin.m, scripts/gui/guihandles.m, scripts/gui/inputdlg.m, scripts/gui/listdlg.m, scripts/gui/msgbox.m, scripts/gui/questdlg.m, scripts/gui/uigetfile.m, scripts/gui/waitbar.m, scripts/gui/warndlg.m, scripts/help/doc.m, scripts/help/help.m, scripts/help/type.m, scripts/image/bone.m, scripts/image/cmpermute.m, scripts/image/cmunique.m, scripts/image/colorcube.m, scripts/image/colormap.m, scripts/image/contrast.m, scripts/image/gray2ind.m, scripts/image/image.m, scripts/image/imshow.m, scripts/image/ind2gray.m, scripts/image/jet.m, scripts/image/rgb2ntsc.m, scripts/image/spinmap.m, scripts/io/importdata.m, scripts/io/strread.m, scripts/io/textread.m, scripts/io/textscan.m, scripts/java/java_get.m, scripts/java/java_set.m, scripts/java/javaaddpath.m, scripts/java/javaclasspath.m, scripts/java/javamem.m, scripts/linear-algebra/linsolve.m, scripts/linear-algebra/qzhess.m, scripts/miscellaneous/debug.m, scripts/miscellaneous/desktop.m, scripts/miscellaneous/dir.m, scripts/miscellaneous/dos.m, scripts/miscellaneous/edit.m, scripts/miscellaneous/fact.m, scripts/miscellaneous/getappdata.m, scripts/miscellaneous/inputname.m, scripts/miscellaneous/license.m, scripts/miscellaneous/ls_command.m, scripts/miscellaneous/run.m, scripts/miscellaneous/setfield.m, scripts/miscellaneous/unix.m, scripts/miscellaneous/ver.m, scripts/mk-pkg-add, scripts/mkdoc.pl, scripts/optimization/fminsearch.m, scripts/optimization/optimset.m, scripts/optimization/sqp.m, scripts/pkg/pkg.m, scripts/pkg/private/create_pkgadddel.m, scripts/pkg/private/fix_depends.m, scripts/pkg/private/install.m, scripts/plot/appearance/axis.m, scripts/plot/appearance/box.m, scripts/plot/appearance/clabel.m, scripts/plot/appearance/daspect.m, scripts/plot/appearance/datetick.m, scripts/plot/appearance/grid.m, scripts/plot/appearance/legend.m, scripts/plot/appearance/orient.m, scripts/plot/appearance/shading.m, scripts/plot/appearance/text.m, scripts/plot/appearance/title.m, scripts/plot/appearance/xlabel.m, scripts/plot/appearance/ylabel.m, scripts/plot/appearance/zlabel.m, scripts/plot/draw/area.m, scripts/plot/draw/bar.m, scripts/plot/draw/barh.m, scripts/plot/draw/colorbar.m, scripts/plot/draw/contour.m, scripts/plot/draw/contour3.m, scripts/plot/draw/contourf.m, scripts/plot/draw/ellipsoid.m, scripts/plot/draw/errorbar.m, scripts/plot/draw/ezcontour.m, scripts/plot/draw/ezcontourf.m, scripts/plot/draw/ezmesh.m, scripts/plot/draw/ezpolar.m, scripts/plot/draw/fill.m, scripts/plot/draw/fplot.m, scripts/plot/draw/hist.m, scripts/plot/draw/meshc.m, scripts/plot/draw/meshz.m, scripts/plot/draw/pareto.m, scripts/plot/draw/patch.m, scripts/plot/draw/peaks.m, scripts/plot/draw/pie.m, scripts/plot/draw/pie3.m, scripts/plot/draw/plot.m, scripts/plot/draw/plotyy.m, scripts/plot/draw/private/__bar__.m, scripts/plot/draw/private/__contour__.m, scripts/plot/draw/private/__errplot__.m, scripts/plot/draw/private/__ezplot__.m, scripts/plot/draw/private/__patch__.m, scripts/plot/draw/private/__stem__.m, scripts/plot/draw/rectangle.m, scripts/plot/draw/ribbon.m, scripts/plot/draw/rose.m, scripts/plot/draw/scatter.m, scripts/plot/draw/scatter3.m, scripts/plot/draw/semilogx.m, scripts/plot/draw/shrinkfaces.m, scripts/plot/draw/sombrero.m, scripts/plot/draw/sphere.m, scripts/plot/draw/stairs.m, scripts/plot/draw/stem.m, scripts/plot/draw/stemleaf.m, scripts/plot/draw/surf.m, scripts/plot/draw/surface.m, scripts/plot/draw/surfc.m, scripts/plot/draw/surfl.m, scripts/plot/draw/surfnorm.m, scripts/plot/draw/tetramesh.m, scripts/plot/draw/trimesh.m, scripts/plot/draw/triplot.m, scripts/plot/draw/trisurf.m, scripts/plot/util/__gnuplot_drawnow__.m, scripts/plot/util/__plt_get_axis_arg__.m, scripts/plot/util/axes.m, scripts/plot/util/clf.m, scripts/plot/util/copyobj.m, scripts/plot/util/figure.m, scripts/plot/util/gcbo.m, scripts/plot/util/graphics_toolkit.m, scripts/plot/util/hggroup.m, scripts/plot/util/meshgrid.m, scripts/plot/util/newplot.m, scripts/plot/util/print.m, scripts/plot/util/private/__add_default_menu__.m, scripts/plot/util/private/__fltk_print__.m, scripts/plot/util/private/__gnuplot_print__.m, scripts/plot/util/private/__print_parse_opts__.m, scripts/plot/util/refreshdata.m, scripts/plot/util/subplot.m, scripts/polynomial/conv.m, scripts/polynomial/poly.m, scripts/polynomial/polyeig.m, scripts/polynomial/polyfit.m, scripts/polynomial/polyval.m, scripts/polynomial/private/__splinefit__.m, scripts/polynomial/spline.m, scripts/prefs/prefdir.m, scripts/prefs/preferences.m, scripts/prefs/private/prefsfile.m, scripts/prefs/rmpref.m, scripts/signal/freqz.m, scripts/signal/module.mk, scripts/sparse/eigs.m, scripts/sparse/pcg.m, scripts/sparse/private/__sprand_impl__.m, scripts/sparse/sprand.m, scripts/sparse/sprandn.m, scripts/sparse/spy.m, scripts/sparse/svds.m, scripts/specfun/expint.m, scripts/specfun/factor.m, scripts/special-matrix/gallery.m, scripts/special-matrix/hankel.m, scripts/special-matrix/toeplitz.m, scripts/startup/inputrc, scripts/statistics/base/kurtosis.m, scripts/statistics/base/moment.m, scripts/statistics/base/qqplot.m, scripts/statistics/base/var.m, scripts/statistics/distributions/betarnd.m, scripts/statistics/distributions/binoinv.m, scripts/statistics/distributions/binopdf.m, scripts/statistics/distributions/binornd.m, scripts/statistics/distributions/cauchy_rnd.m, scripts/statistics/distributions/chi2rnd.m, scripts/statistics/distributions/discrete_pdf.m, scripts/statistics/distributions/discrete_rnd.m, scripts/statistics/distributions/empirical_rnd.m, scripts/statistics/distributions/exprnd.m, scripts/statistics/distributions/frnd.m, scripts/statistics/distributions/gamrnd.m, scripts/statistics/distributions/geornd.m, scripts/statistics/distributions/hygernd.m, scripts/statistics/distributions/kolmogorov_smirnov_cdf.m, scripts/statistics/distributions/laplace_cdf.m, scripts/statistics/distributions/laplace_pdf.m, scripts/statistics/distributions/logistic_cdf.m, scripts/statistics/distributions/logistic_pdf.m, scripts/statistics/distributions/lognrnd.m, scripts/statistics/distributions/nbincdf.m, scripts/statistics/distributions/nbininv.m, scripts/statistics/distributions/nbinpdf.m, scripts/statistics/distributions/nbinrnd.m, scripts/statistics/distributions/normrnd.m, scripts/statistics/distributions/poissinv.m, scripts/statistics/distributions/poissrnd.m, scripts/statistics/distributions/tinv.m, scripts/statistics/distributions/trnd.m, scripts/statistics/distributions/unidcdf.m, scripts/statistics/distributions/unidpdf.m, scripts/statistics/distributions/unidrnd.m, scripts/statistics/distributions/unifrnd.m, scripts/statistics/distributions/wblrnd.m, scripts/statistics/models/module.mk, scripts/statistics/tests/kruskal_wallis_test.m, scripts/strings/base2dec.m, scripts/strings/deblank.m, scripts/strings/dec2base.m, scripts/strings/dec2bin.m, scripts/strings/dec2hex.m, scripts/strings/mat2str.m, scripts/strings/ostrsplit.m, scripts/strings/regexptranslate.m, scripts/strings/str2num.m, scripts/strings/strcat.m, scripts/strings/strjoin.m, scripts/strings/strsplit.m, scripts/strings/strtok.m, scripts/strings/strtrim.m, scripts/strings/strtrunc.m, scripts/strings/substr.m, scripts/testfun/__run_test_suite__.m, scripts/testfun/speed.m, scripts/testfun/test.m, scripts/time/asctime.m, scripts/time/datenum.m, scripts/time/datevec.m, scripts/time/weekday.m, src/Makefile.am, test/Makefile.am, test/build-bc-overload-tests.sh, test/build-sparse-tests.sh, test/jit.tst, test/line-continue.tst: Strip trailing whitespace.

author	John W. Eaton <jwe@octave.org>
date	Tue, 20 Jan 2015 08:26:57 -0500
parents	d63878346099
children	4197fc428c7d

rev	line source
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 17097 diff changeset	1 ## Copyright (C) 2007-2013 David Bateman
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11472 diff changeset	2 ## Copyright (C) 2009-2010 VZLU Prague
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	3 ##
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	4 ## This file is part of Octave.
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	5 ##
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	6 ## Octave is free software; you can redistribute it and/or modify it
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	7 ## under the terms of the GNU General Public License as published by
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	8 ## the Free Software Foundation; either version 3 of the License, or (at
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	9 ## your option) any later version.
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	10 ##
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	11 ## 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	12 ## WITHOUT ANY WARRANTY; without even the implied warranty of
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	13 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	14 ## General Public License for more details.
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	15 ##
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	16 ## 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	17 ## along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6770 diff changeset	18 ## <http://www.gnu.org/licenses/>.
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 ## -- texinfo --
10793 be55736a0783 Grammarcheck the documentation from m-files. Rik <octave@nomad.inbox5.com> parents: 10775 diff changeset	21 ## @deftypefn {Function File} {} accumarray (@var{subs}, @var{vals}, @var{sz}, @var{func}, @var{fillval}, @var{issparse})
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	22 ## @deftypefnx {Function File} {} accumarray (@var{subs}, @var{vals}, @dots{})
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	23 ##
7186 800f1fd3ffb8 [project @ 2007-11-26 19:16:07 by jwe] jwe parents: 7016 diff changeset	24 ## Create an array by accumulating the elements of a vector into the
9051 1bf0ce0930be Grammar check TexInfo in all .m files Rik <rdrider0-list@yahoo.com> parents: 8934 diff changeset	25 ## positions defined by their subscripts. The subscripts are defined by
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	26 ## the rows of the matrix @var{subs} and the values by @var{vals}. Each
13929 9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13788 diff changeset	27 ## row of @var{subs} corresponds to one of the values in @var{vals}. If
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	28 ## @var{vals} is a scalar, it will be used for each of the row of
14119 94e2a76f1e5a doc: Final grammarcheck and spellcheck before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 14115 diff changeset	29 ## @var{subs}. If @var{subs} is a cell array of vectors, all vectors
14113 dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	30 ## must be of the same length, and the subscripts in the @var{k}th
dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	31 ## 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	32 ##
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	33 ## 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	34 ## 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	35 ## 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	36 ## 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	37 ## 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	38 ## 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	39 ##
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	40 ## 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	41 ## the same subscripts. This behavior can be modified by defining 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	42 ## @var{func} function. This should be a function or function handle
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 ## 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	44 ## 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	45 ##
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	46 ## 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	47 ## 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	48 ## allows these values to be defined. This behavior changes, however,
13929 9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13788 diff changeset	49 ## for certain values of @var{func}. If @var{func} is @code{min}
13787 8bb7bdbe9c69 Clarify max/min in accumarray and uniformise its behaviour Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13175 diff changeset	50 ## (respectively, @code{max}) then the result will be filled with the
8bb7bdbe9c69 Clarify max/min in accumarray and uniformise its behaviour Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13175 diff changeset	51 ## 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	52 ## 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	53 ## 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	54 ## non-positive (respectively, non-negative), and NaN otherwise.
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	55 ##
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	56 ## 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	57 ## @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	58 ## instead.
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	59 ##
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	60 ## 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	61 ## 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	62 ## 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	63 ## of @code{unique} for assigning to all repeated elements of @var{x}
17097 e7a059a9a644 doc: Use XREF as anchor prefix in documentation for clearer results in Info viewer. Rik <rik@octave.org> parents: 16772 diff changeset	64 ## the same index (@pxref{XREFunique,,unique}).
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	65 ##
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	66 ## @example
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	67 ## @group
14122 c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	68 ## @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	69 ## [@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	70 ## [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	71 ## @result{} 2 89
4d917a6a858b doc: Use Octave coding conventions in @example blocks of docstrings. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	72 ## 3 90
4d917a6a858b doc: Use Octave coding conventions in @example blocks of docstrings. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	73 ## 2 91
4d917a6a858b doc: Use Octave coding conventions in @example blocks of docstrings. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	74 ## 2 92
4d917a6a858b doc: Use Octave coding conventions in @example blocks of docstrings. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	75 ## 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	76 ## @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	77 ## @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	78 ##
13929 9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13788 diff changeset	79 ## 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	80 ## 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	81 ##
8d5f0b41e6b0 Improve accumarray's docstring: one more example, mention vals can be scalar Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12214 diff changeset	82 ## @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	83 ## @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	84 ## 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	85 ## 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	86 ## 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	87 ## 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	88 ## 2, 3, 2], 101:105)
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	89 ## @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	90 ## @result{} ans(:,:,2) = [0, 0, 0; 206, 0, 208]
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	91 ## @end group
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	92 ## @end example
10275 19f2107d1fdd document accumarray complexity Jaroslav Hajek <highegg@gmail.com> parents: 10274 diff changeset	93 ##
14122 c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	94 ## The sparse option can be used as an alternative to the @code{sparse}
17097 e7a059a9a644 doc: Use XREF as anchor prefix in documentation for clearer results in Info viewer. Rik <rik@octave.org> parents: 16772 diff changeset	95 ## constructor (@pxref{XREFsparse,,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	96 ##
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	97 ## @example
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	98 ## 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	99 ## @end example
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	100 ##
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	101 ## @noindent
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	102 ## 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	103 ##
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	104 ## @example
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	105 ## 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	106 ## @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	107 ##
14122 c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	108 ## @noindent
14366 b76f0740940e doc: Periodic grammar check of documentation. Rik <octave@nomad.inbox5.com> parents: 14363 diff changeset	109 ## 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	110 ## 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	111 ##
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	112 ## @example
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	113 ## 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	114 ## @end example
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	115 ##
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	116 ## 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	117 ## 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	118 ## maximum subscript (linearized in multi-dimensional case). If
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	119 ## @var{func} is one of @code{@@sum} (default), @code{@@max},
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	120 ## @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	121 ## 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	122 ## 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	123 ## 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	124 ##
c299bb9f0ad0 accumarray.m: Add another example for sparse matrices, minor formatting Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14119 diff changeset	125 ## @seealso{accumdim, unique, sparse}
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	126 ## @end deftypefn
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	127
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	128 function A = accumarray (subs, vals, sz = [], func = [], fillval = [], issparse = [])
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	129
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	130 if (nargin < 2 \|\| nargin > 6)
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	131 print_usage ();
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	132 endif
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	133
14113 dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	134 lenvals = length (vals);
dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	135
7186 800f1fd3ffb8 [project @ 2007-11-26 19:16:07 by jwe] jwe parents: 7016 diff changeset	136 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	137 subs = cellfun (@vec, subs, "uniformoutput", false);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	138 ndims = numel (subs);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	139 if (ndims == 1)
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	140 subs = subs{1};
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	141 endif
14113 dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	142
dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	143 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	144
19790 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	145 if (any (lensubs != lensubs(1)) \|\|
14115 0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	146 (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	147 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	148 endif
dac62c415e8b Do more error checking on accumarray and accumdim input. Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14062 diff changeset	149
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	150 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	151 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	152 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	153 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	154 endif
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	155 endif
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	156
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	157 if (isempty (fillval))
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	158 fillval = 0;
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	159 endif
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	160
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	161 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	162 issparse = false;
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	163 endif
7186 800f1fd3ffb8 [project @ 2007-11-26 19:16:07 by jwe] jwe parents: 7016 diff changeset	164
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	165 if (issparse)
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	166
14115 0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	167 ## Sparse case. Avoid linearizing the subscripts, because it could
0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	168 ## overflow.
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	169
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	170 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	171 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	172 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	173
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	174 ## Ensure subscripts are a two-column matrix.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	175 if (iscell (subs))
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	176 subs = [subs{:}];
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	177 endif
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	178
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	179 ## Validate dimensions.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	180 if (ndims == 1)
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	181 subs(:,2) = 1;
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	182 elseif (ndims != 2)
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	183 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	184 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	185
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	186 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	187 vals = double (vals);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	188 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	189 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	190 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	191
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	192 if (! (isempty (func) \|\| func == @sum))
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	193
14115 0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	194 ## Reduce values. This is not needed if we're about to sum them,
0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	195 ## 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	196
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	197 ## Sort indices.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	198 [subs, idx] = sortrows (subs);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	199 n = rows (subs);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	200 ## Identify runs.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	201 jdx = find (any (diff (subs, 1, 1), 2));
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	202 jdx = [jdx; n];
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	203
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	204 vals = cellfun (func, mat2cell (vals(:)(idx), diff ([0; jdx])));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	205 subs = subs(jdx, :);
10283 b178769f31ca more small improvements in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	206 mode = "unique";
b178769f31ca more small improvements in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	207 else
b178769f31ca more small improvements in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	208 mode = "sum";
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	209 endif
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	210
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	211 ## Form the sparse matrix.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	212 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	213 A = sparse (subs(:,1), subs(:,2), vals, mode);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	214 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	215
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	216 ## Row vector case
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	217 if (sz(1) == 1)
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	218 [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	219 else
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	220 [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	221 endif
9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	222 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	223 else
11589 b0084095098e missing semicolons in script files John W. Eaton <jwe@octave.org> parents: 11587 diff changeset	224 error ("accumarray: dimensions mismatch");
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	225 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	226
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	227 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	228
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	229 ## Linearize subscripts.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	230 if (ndims > 1)
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	231 if (isempty (sz))
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	232 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	233 sz = cellfun ("max", subs);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	234 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	235 sz = max (subs, [], 1);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	236 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	237 elseif (ndims != length (sz))
11589 b0084095098e missing semicolons in script files John W. Eaton <jwe@octave.org> parents: 11587 diff changeset	238 error ("accumarray: dimensions mismatch");
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	239 endif
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	240
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	241 ## Convert multidimensional subscripts.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	242 if (ismatrix (subs))
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	243 subs = num2cell (subs, 1);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	244 endif
10274 db613bccd992 take advantage of new sort optimization in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10271 diff changeset	245 subs = sub2ind (sz, subs{:}); # creates index cache
10271 297996005012 1 more small fix in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10269 diff changeset	246 elseif (! isempty (sz) && length (sz) < 2)
10269 217d36560dfa small fixes to accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10268 diff changeset	247 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	248 elseif (! isindex (subs)) # creates index cache
db613bccd992 take advantage of new sort optimization in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10271 diff changeset	249 error ("accumarray: indices must be positive integers");
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	250 endif
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	251
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	252
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	253 ## Some built-in reductions handled efficiently.
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	254
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	255 if (isempty (func) \|\| func == @sum)
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	256 ## Fast summation.
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	257 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	258 A = __accumarray_sum__ (subs, vals);
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	259 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	260 A = __accumarray_sum__ (subs, vals, prod (sz));
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	261 ## set proper shape.
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	262 A = reshape (A, sz);
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	263 endif
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	264
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	265 ## we fill in nonzero fill value.
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	266 if (fillval != 0)
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	267 mask = true (size (A));
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	268 mask(subs) = false;
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	269 A(mask) = fillval;
c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	270 endif
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	271 elseif (func == @max)
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	272 ## Fast maximization.
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	273
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	274 if (isinteger (vals))
c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	275 zero = intmin (class (vals));
c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	276 elseif (islogical (vals))
10269 217d36560dfa small fixes to accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10268 diff changeset	277 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	278 elseif (fillval == 0 && all (vals(:) >= 0))
14115 0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	279 ## 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	280 ## nonegative.
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	281 zero = 0;
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	282 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	283 zero = NaN; # Neutral value.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	284 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	285
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	286 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	287 A = __accumarray_max__ (subs, vals, zero);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	288 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	289 A = __accumarray_max__ (subs, vals, zero, prod (sz));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	290 A = reshape (A, sz);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	291 endif
8934 c2099a4d12ea partially optimize accumarray Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	292
10775 6892c5562950 fix bug in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10283 diff changeset	293 if (fillval != zero && ! (isnan (fillval) \|\| isnan (zero)))
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	294 mask = true (size (A));
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	295 mask(subs) = false;
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	296 A(mask) = fillval;
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	297 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	298 elseif (func == @min)
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	299 ## Fast minimization.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	300
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	301 if (isinteger (vals))
c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	302 zero = intmax (class (vals));
c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	303 elseif (islogical (vals))
10269 217d36560dfa small fixes to accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10268 diff changeset	304 zero = true;
13787 8bb7bdbe9c69 Clarify max/min in accumarray and uniformise its behaviour Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13175 diff changeset	305 elseif (fillval == 0 && all (vals(:) <= 0))
14115 0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	306 ## 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	307 ## non-positive.
13787 8bb7bdbe9c69 Clarify max/min in accumarray and uniformise its behaviour Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13175 diff changeset	308 zero = 0;
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	309 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	310 zero = NaN; # Neutral value.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	311 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	312
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	313 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	314 A = __accumarray_min__ (subs, vals, zero);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	315 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	316 A = __accumarray_min__ (subs, vals, zero, prod (sz));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	317 A = reshape (A, sz);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	318 endif
8820 89b95972e178 fix previously introduced problem in octave_sort, improve design Jaroslav Hajek <highegg@gmail.com> parents: 8507 diff changeset	319
10775 6892c5562950 fix bug in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10283 diff changeset	320 if (fillval != zero && ! (isnan (fillval) \|\| isnan (zero)))
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	321 mask = true (size (A));
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	322 mask(subs) = false;
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	323 A(mask) = fillval;
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	324 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	325 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	326
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	327 ## The general case. Reduce values.
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	328 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	329 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	330 vals = vals(ones (1, n), 1);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	331 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	332 vals = vals(:);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	333 endif
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	334
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	335 ## Sort indices.
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	336 [subs, idx] = sort (subs);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	337 ## Identify runs.
10283 b178769f31ca more small improvements in accumarray Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	338 jdx = find (subs(1:n-1) != subs(2:n));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	339 jdx = [jdx; n];
11469 c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	340 vals = mat2cell (vals(idx), diff ([0; jdx]));
14115 0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	341 ## Optimize the case when function is @(x) {x}, i.e. we just want
0b3518c1228a acumarray.m: Reformat long lines Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14114 diff changeset	342 ## to collect the values to cells.
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	343 persistent simple_cell_str = func2str (@(x) {x});
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	344 if (! strcmp (func2str (func), simple_cell_str))
11469 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 = cellfun (func, vals);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	346 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	347 subs = subs(jdx);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	348
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	349 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	350 sz = max (subs);
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	351 if (length (sz) == 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	352 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	353 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	354 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	355
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	356 ## 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	357 if (iscell (vals))
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	358 A = cell (sz);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	359 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	360 A = zeros (sz, class (vals));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	361 else
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	362 A = repmat (fillval, sz);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	363 endif
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	364
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	365 ## 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	366 A(subs) = vals;
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	367 endif
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	368 endif
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	369 endfunction
babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	370
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14327 diff changeset	371
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	372 %!assert (accumarray ([1;2;4;2;4],101:105), [101;206;0;208])
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14366 diff changeset	373 %!assert (accumarray ([1,1,1;2,1,2;2,3,2;2,1,2;2,3,2],101:105), cat (3, [101,0,0;0,0,0],[0,0,0;206,0,208]))
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14327 diff changeset	374 %!assert (accumarray ([1,1,1;2,1,2;2,3,2;2,1,2;2,3,2],101:105,[],@(x)sin(sum(x))), sin (cat (3, [101,0,0;0,0,0],[0,0,0;206,0,208])))
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14327 diff changeset	375 %!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), 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]))
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14327 diff changeset	376 %!assert (accumarray ([1,1;2,1;2,3;2,1;2,3],101:105,[2,4],@max,NaN), [101,NaN,NaN,NaN;104,NaN,105,NaN])
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	377 %!assert (accumarray ([1 1; 2 1; 2 3; 2 1; 2 3],101:105, [], @prod), [101, 0, 0; 10608, 0, 10815])
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14327 diff changeset	378 %!assert (accumarray ([1 1; 2 1; 2 3; 2 1; 2 3],101:105,[2 4],@prod,0,true), sparse ([1,2,2],[1,1,3],[101,10608,10815],2,4))
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	379 %!assert (accumarray ([1 1; 2 1; 2 3; 2 1; 2 3],1,[2,4]), [1,0,0,0;2,0,2,0])
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14327 diff changeset	380 %!assert (accumarray ([1 1; 2 1; 2 3; 2 1; 2 3],101:105,[2,4],@(x)length(x)>1), [false,false,false,false;true,false,true,false])
13788 9ab64f063c96 Consistently allow creation of sparse vectors in accumarray Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13787 diff changeset	381 %!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	382 %!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	383 %!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	384 %!assert (accumarray ([1; 2], [3; 4], [1, 2], @min, [], 1), sparse ([3, 4]))
6770 babcbcc11ab6 [project @ 2007-07-06 08:44:04 by dbateman] dbateman parents: diff changeset	385 %!test
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14327 diff changeset	386 %! A = accumarray ([1 1; 2 1; 2 3; 2 1; 2 3], 101:105, [2,4], @(x){x});
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14327 diff changeset	387 %! assert (A{2},[102;104]);
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	388 %!test
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	389 %! 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	390 %! vals = rand (2000, 1);
c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	391 %! assert (accumarray (subs, vals, [], @max), accumarray (subs, vals, [], @(x) max (x)));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	392 %!test
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	393 %! 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	394 %! vals = rand (2000, 1);
c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	395 %! assert (accumarray (subs, vals, [100, 1], @min, NaN), accumarray (subs, vals, [100, 1], @(x) min (x), NaN));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	396 %!test
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	397 %! subs = ceil (rand (2000, 2)*30);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	398 %! 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	399 %! vals = rand (2000, 1);
c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	400 %! assert (accumarray (subsc, vals, [], [], 0, true), accumarray (subs, vals, [], [], 0, true));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	401 %!test
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	402 %! subs = ceil (rand (2000, 3)*10);
9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	403 %! 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	404 %! vals = rand (2000, 1);
c776f063fefe Overhaul m-script files to use common variable name between code and documentation. Rik <octave@nomad.inbox5.com> parents: 11191 diff changeset	405 %! assert (accumarray (subsc, vals, [], @max), accumarray (subs, vals, [], @max));
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	406
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14327 diff changeset	407 %!error (accumarray (1:5))
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14327 diff changeset	408 %!error (accumarray ([1,2,3],1:2))
10268 9a16a61ed43d new optimizations for accumarray Jaroslav Hajek <highegg@gmail.com> parents: 9859 diff changeset	409