octave-nkf: liboctave/array/intNDArray.cc annotate

annotate liboctave/array/intNDArray.cc @ 20263:00cf2847355d

Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). * liboctave/array/Array.h (Array::nelem) deprecate in favour of numel(). (Array::capacity, Array:: length): change to call numel() directly. These methods will be deprecated soon. * liboctave/array/PermMatrix.h (PermMatrix::nelem): deprecate in favour of numel(). * liboctave/array/Range.h (Range::numel) new method to replace nelem(). (Range::nelem) deprecate in favour of the new method numel. * liboctave/array/Sparse.h (Sparse::nelem) deprecate in favour of nzmax(). This one is secially bad because unlike the other classes, it is different from numel(). * libinterp/corefcn/debug.cc, libinterp/corefcn/jit-typeinfo.cc, libinterp/corefcn/ls-mat4.cc, libinterp/corefcn/lu.cc, libinterp/corefcn/luinc.cc, libinterp/corefcn/max.cc, libinterp/corefcn/pr-output.cc, libinterp/corefcn/rand.cc, libinterp/corefcn/xpow.cc, libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/audioread.cc, libinterp/octave-value/ov-base-int.cc, libinterp/octave-value/ov-bool-mat.cc, libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-range.cc, libinterp/octave-value/ov-range.h, libinterp/octave-value/ov-re-mat.cc, libinterp/parse-tree/pt-eval.cc, liboctave/array/Array.cc, liboctave/array/CNDArray.cc, liboctave/array/Range.cc, liboctave/array/dNDArray.cc, liboctave/array/fCNDArray.cc, liboctave/array/fNDArray.cc, liboctave/array/idx-vector.cc, liboctave/array/intNDArray.cc, liboctave/numeric/SparseCmplxLU.cc, liboctave/numeric/SparsedbleLU.cc: replace use of nelem() with numel().

author	Carnë Draug <carandraug@octave.org>
date	Sun, 24 May 2015 02:41:37 +0100
parents	4197fc428c7d
children	a9574e3c6e9e

rev	line source
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	1 // N-D Array manipulations.
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	2 /*
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	3
19731 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 18759 diff changeset	4 Copyright (C) 2004-2015 John W. Eaton
9601 a9b37bae1802 add a couple of missing copyright statements Jaroslav Hajek <highegg@gmail.com> parents: 9513 diff changeset	5 Copyright (C) 2009 VZLU Prague, a.s.
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	6
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	7 This file is part of Octave.
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	8
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	10 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6979 diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6979 diff changeset	12 option) any later version.
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	13
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	17 for more details.
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	18
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	19 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6979 diff changeset	20 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6979 diff changeset	21 <http://www.gnu.org/licenses/>.
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	22
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	23 */
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	24
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	25 #ifdef HAVE_CONFIG_H
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	26 #include <config.h>
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	27 #endif
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	28
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	29 #include "Array-util.h"
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	30 #include "mx-base.h"
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	31 #include "lo-ieee.h"
8741 008f3985c8c0 use new summation code for native integer summation Jaroslav Hajek <highegg@gmail.com> parents: 7620 diff changeset	32 #include "mx-inlines.cc"
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	33
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	34 // unary operations
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	35
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	36 template <class T>
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	37 boolNDArray
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	38 intNDArray<T>::operator ! (void) const
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	39 {
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4915 diff changeset	40 boolNDArray b (this->dims ());
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	41
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	42 for (octave_idx_type i = 0; i < this->length (); i++)
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4915 diff changeset	43 b.elem (i) = ! this->elem (i);
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	44
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	45 return b;
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	46 }
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	47
5943 c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	48 template <class T>
c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	49 bool
c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	50 intNDArray<T>::any_element_not_one_or_zero (void) const
c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	51 {
20263 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 19731 diff changeset	52 octave_idx_type nel = this->numel ();
5943 c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	53
c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	54 for (octave_idx_type i = 0; i < nel; i++)
c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	55 {
c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	56 T val = this->elem (i);
c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	57
c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	58 if (val != 0.0 && val != 1.0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	59 return true;
5943 c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	60 }
c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	61
c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	62 return false;
c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	63 }
c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5775 diff changeset	64
6979 2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6482 diff changeset	65 template <class T>
2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6482 diff changeset	66 intNDArray<T>
2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6482 diff changeset	67 intNDArray<T>::diag (octave_idx_type k) const
2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6482 diff changeset	68 {
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	69 return MArray<T>::diag (k);
6979 2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6482 diff changeset	70 }
2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6482 diff changeset	71
14557 e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	72 template <class T>
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	73 intNDArray<T>
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	74 intNDArray<T>::diag (octave_idx_type m, octave_idx_type n) const
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	75 {
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	76 return MArray<T>::diag (m, n);
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	77 }
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	78
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	79 // FIXME: this is not quite the right thing.
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	80
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	81 template <class T>
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	82 boolNDArray
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	83 intNDArray<T>::all (int dim) const
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	84 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	85 return do_mx_red_op<bool, T > (*this, dim, mx_inline_all);
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	86 }
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	87
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	88 template <class T>
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	89 boolNDArray
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	90 intNDArray<T>::any (int dim) const
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	91 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	92 return do_mx_red_op<bool, T > (*this, dim, mx_inline_any);
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	93 }
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	94
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	95 template <class T>
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	96 void
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	97 intNDArray<T>::increment_index (Array<octave_idx_type>& ra_idx,
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	98 const dim_vector& dimensions,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	99 int start_dimension)
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	100 {
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	101 ::increment_index (ra_idx, dimensions, start_dimension);
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	102 }
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	103
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	104 template <class T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	105 octave_idx_type
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	106 intNDArray<T>::compute_index (Array<octave_idx_type>& ra_idx,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	107 const dim_vector& dimensions)
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	108 {
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	109 return ::compute_index (ra_idx, dimensions);
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	110 }
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	111
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	112 template <class T>
5073 e71be9c548f2 [project @ 2004-11-09 18:31:25 by jwe] jwe parents: 4932 diff changeset	113 intNDArray<T>
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	114 intNDArray<T>::concat (const intNDArray<T>& rb,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	115 const Array<octave_idx_type>& ra_idx)
5073 e71be9c548f2 [project @ 2004-11-09 18:31:25 by jwe] jwe parents: 4932 diff changeset	116 {
6482 7e958a1532c6 [project @ 2007-04-04 02:37:07 by jwe] jwe parents: 5943 diff changeset	117 if (rb.numel () > 0)
5073 e71be9c548f2 [project @ 2004-11-09 18:31:25 by jwe] jwe parents: 4932 diff changeset	118 insert (rb, ra_idx);
e71be9c548f2 [project @ 2004-11-09 18:31:25 by jwe] jwe parents: 4932 diff changeset	119 return *this;
e71be9c548f2 [project @ 2004-11-09 18:31:25 by jwe] jwe parents: 4932 diff changeset	120 }
e71be9c548f2 [project @ 2004-11-09 18:31:25 by jwe] jwe parents: 4932 diff changeset	121
e71be9c548f2 [project @ 2004-11-09 18:31:25 by jwe] jwe parents: 4932 diff changeset	122 template <class T>
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	123 intNDArray<T>&
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	124 intNDArray<T>::insert (const intNDArray<T>& a, octave_idx_type r,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	125 octave_idx_type c)
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	126 {
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	127 Array<T>::insert (a, r, c);
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	128 return *this;
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	129 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	130
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	131 template <class T>
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	132 intNDArray<T>&
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	133 intNDArray<T>::insert (const intNDArray<T>& a,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	134 const Array<octave_idx_type>& ra_idx)
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	135 {
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	136 Array<T>::insert (a, ra_idx);
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	137 return *this;
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	138 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4902 diff changeset	139
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	140 // This contains no information on the array structure !!!
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	141
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	142 template <class T>
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	143 std::ostream&
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	144 operator << (std::ostream& os, const intNDArray<T>& a)
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	145 {
20263 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 19731 diff changeset	146 octave_idx_type nel = a.numel ();
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	147
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	148 for (octave_idx_type i = 0; i < nel; i++)
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	149 os << " " << a.elem (i) << "\n";
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	150
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	151 return os;
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	152 }
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	153
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	154 template <class T>
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	155 std::istream&
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	156 operator >> (std::istream& is, intNDArray<T>& a)
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	157 {
20263 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 19731 diff changeset	158 octave_idx_type nel = a.numel ();
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	159
8999 dc07bc4157b8 allow empty matrices in stream input operators Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	160 if (nel > 0)
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	161 {
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	162 T tmp;
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	163
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	164 for (octave_idx_type i = 0; i < nel; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	165 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	166 is >> tmp;
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	167
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	168 if (is)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	169 a.elem (i) = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	170 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	171 goto done;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	172 }
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	173 }
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	174
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	175 done:
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	176
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	177 return is;
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	178 }
bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: diff changeset	179
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	180 // FIXME: should abs and signum just be mapper functions?
7503 8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	181
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	182 template <class T>
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	183 intNDArray<T>
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	184 intNDArray<T>::abs (void) const
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	185 {
20263 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 19731 diff changeset	186 octave_idx_type nel = this->numel ();
10577 87f879cf48fd don't alter arg values in call to abs or sign for integer values John W. Eaton <jwe@octave.org> parents: 10362 diff changeset	187 intNDArray<T> ret (this->dims ());
7503 8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	188
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	189 for (octave_idx_type i = 0; i < nel; i++)
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	190 {
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	191 T val = this->elem (i);
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	192 ret.xelem (i) = val.abs ();
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	193 }
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	194
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	195 return ret;
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	196 }
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	197
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	198 template <class T>
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	199 intNDArray<T>
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	200 intNDArray<T>::signum (void) const
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	201 {
20263 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 19731 diff changeset	202 octave_idx_type nel = this->numel ();
10577 87f879cf48fd don't alter arg values in call to abs or sign for integer values John W. Eaton <jwe@octave.org> parents: 10362 diff changeset	203 intNDArray<T> ret (this->dims ());
7503 8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	204
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	205 for (octave_idx_type i = 0; i < nel; i++)
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	206 {
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	207 T val = this->elem (i);
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	208 ret.xelem (i) = val.signum ();
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	209 }
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	210
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	211 return ret;
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	212 }
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7457 diff changeset	213
7113 a018c140f8aa [project @ 2007-11-07 00:28:01 by dbateman] dbateman parents: 7017 diff changeset	214 template <class T>
a018c140f8aa [project @ 2007-11-07 00:28:01 by dbateman] dbateman parents: 7017 diff changeset	215 intNDArray<T>
18759 8cc66f091584 Add "native" option to prod() (bug #40349). Rik <rik@octave.org> parents: 17769 diff changeset	216 intNDArray<T>::prod (int dim) const
8cc66f091584 Add "native" option to prod() (bug #40349). Rik <rik@octave.org> parents: 17769 diff changeset	217 {
8cc66f091584 Add "native" option to prod() (bug #40349). Rik <rik@octave.org> parents: 17769 diff changeset	218 return do_mx_red_op<T, T> (*this, dim, mx_inline_prod);
8cc66f091584 Add "native" option to prod() (bug #40349). Rik <rik@octave.org> parents: 17769 diff changeset	219 }
8cc66f091584 Add "native" option to prod() (bug #40349). Rik <rik@octave.org> parents: 17769 diff changeset	220
8cc66f091584 Add "native" option to prod() (bug #40349). Rik <rik@octave.org> parents: 17769 diff changeset	221 template <class T>
8cc66f091584 Add "native" option to prod() (bug #40349). Rik <rik@octave.org> parents: 17769 diff changeset	222 intNDArray<T>
7113 a018c140f8aa [project @ 2007-11-07 00:28:01 by dbateman] dbateman parents: 7017 diff changeset	223 intNDArray<T>::sum (int dim) const
a018c140f8aa [project @ 2007-11-07 00:28:01 by dbateman] dbateman parents: 7017 diff changeset	224 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	225 return do_mx_red_op<T, T> (*this, dim, mx_inline_sum);
7113 a018c140f8aa [project @ 2007-11-07 00:28:01 by dbateman] dbateman parents: 7017 diff changeset	226 }
a018c140f8aa [project @ 2007-11-07 00:28:01 by dbateman] dbateman parents: 7017 diff changeset	227
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	228 template <class T>
9721 192d94cff6c1 improve sum & implement the 'extra' option, refactor some code Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	229 NDArray
192d94cff6c1 improve sum & implement the 'extra' option, refactor some code Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	230 intNDArray<T>::dsum (int dim) const
192d94cff6c1 improve sum & implement the 'extra' option, refactor some code Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	231 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	232 return do_mx_red_op<double, T> (*this, dim, mx_inline_dsum);
9721 192d94cff6c1 improve sum & implement the 'extra' option, refactor some code Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	233 }
192d94cff6c1 improve sum & implement the 'extra' option, refactor some code Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	234
192d94cff6c1 improve sum & implement the 'extra' option, refactor some code Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	235 template <class T>
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	236 intNDArray<T>
8780 ea76466605ba support native cumsum, gripe on overflow in sum/cumsum Jaroslav Hajek <highegg@gmail.com> parents: 8777 diff changeset	237 intNDArray<T>::cumsum (int dim) const
ea76466605ba support native cumsum, gripe on overflow in sum/cumsum Jaroslav Hajek <highegg@gmail.com> parents: 8777 diff changeset	238 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	239 return do_mx_cum_op<T, T> (*this, dim, mx_inline_cumsum);
8780 ea76466605ba support native cumsum, gripe on overflow in sum/cumsum Jaroslav Hajek <highegg@gmail.com> parents: 8777 diff changeset	240 }
ea76466605ba support native cumsum, gripe on overflow in sum/cumsum Jaroslav Hajek <highegg@gmail.com> parents: 8777 diff changeset	241
ea76466605ba support native cumsum, gripe on overflow in sum/cumsum Jaroslav Hajek <highegg@gmail.com> parents: 8777 diff changeset	242 template <class T>
ea76466605ba support native cumsum, gripe on overflow in sum/cumsum Jaroslav Hajek <highegg@gmail.com> parents: 8777 diff changeset	243 intNDArray<T>
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	244 intNDArray<T>::max (int dim) const
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	245 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	246 return do_mx_minmax_op<T> (*this, dim, mx_inline_max);
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	247 }
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	248
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	249 template <class T>
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	250 intNDArray<T>
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9721 diff changeset	251 intNDArray<T>::max (Array<octave_idx_type>& idx_arg, int dim) const
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	252 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	253 return do_mx_minmax_op<T> (*this, idx_arg, dim, mx_inline_max);
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	254 }
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	255
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	256 template <class T>
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	257 intNDArray<T>
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	258 intNDArray<T>::min (int dim) const
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	259 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	260 return do_mx_minmax_op<T> (*this, dim, mx_inline_min);
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	261 }
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	262
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	263 template <class T>
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	264 intNDArray<T>
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9721 diff changeset	265 intNDArray<T>::min (Array<octave_idx_type>& idx_arg, int dim) const
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	266 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	267 return do_mx_minmax_op<T> (*this, idx_arg, dim, mx_inline_min);
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	268 }
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7113 diff changeset	269
8777 724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	270 template <class T>
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	271 intNDArray<T>
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	272 intNDArray<T>::cummax (int dim) const
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	273 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	274 return do_mx_cumminmax_op<T> (*this, dim, mx_inline_cummax);
8777 724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	275 }
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	276
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	277 template <class T>
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	278 intNDArray<T>
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9721 diff changeset	279 intNDArray<T>::cummax (Array<octave_idx_type>& idx_arg, int dim) const
8777 724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	280 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	281 return do_mx_cumminmax_op<T> (*this, idx_arg, dim, mx_inline_cummax);
8777 724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	282 }
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	283
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	284 template <class T>
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	285 intNDArray<T>
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	286 intNDArray<T>::cummin (int dim) const
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	287 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	288 return do_mx_cumminmax_op<T> (*this, dim, mx_inline_cummin);
8777 724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	289 }
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	290
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	291 template <class T>
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	292 intNDArray<T>
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9721 diff changeset	293 intNDArray<T>::cummin (Array<octave_idx_type>& idx_arg, int dim) const
8777 724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	294 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	295 return do_mx_cumminmax_op<T> (*this, idx_arg, dim, mx_inline_cummin);
8777 724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	296 }
724c0f46d9d4 implement cummin/cummax functions Jaroslav Hajek <highegg@gmail.com> parents: 8751 diff changeset	297
9513 9f870f73ab7d implement built-in diff Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	298 template <class T>
9f870f73ab7d implement built-in diff Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	299 intNDArray<T>
9f870f73ab7d implement built-in diff Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	300 intNDArray<T>::diff (octave_idx_type order, int dim) const
9f870f73ab7d implement built-in diff Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	301 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	302 return do_mx_diff_op<T> (*this, dim, order, mx_inline_diff);
9513 9f870f73ab7d implement built-in diff Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	303 }

Mercurial > octave-nkf

annotate liboctave/array/intNDArray.cc @ 20263:00cf2847355d