octave-nkf: liboctave/dim-vector.h annotate

annotate liboctave/dim-vector.h @ 10480:19e1e4470e01

remove old sparse assembly ctors

author	Jaroslav Hajek <highegg@gmail.com>
date	Wed, 31 Mar 2010 10:24:57 +0200
parents	3373fdc0b14a
children	8615b55b5caf

rev	line source
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	1 /*
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	2
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	3 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 John W. Eaton
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	4 Copyirght (C) 2009 VZLU Prague
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	5
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	7
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	9 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: 6216 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6216 diff changeset	11 option) any later version.
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	12
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	16 for more details.
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	17
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	18 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: 6216 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6216 diff changeset	20 <http://www.gnu.org/licenses/>.
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	21
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	22 */
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	23
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	24 #if !defined (octave_dim_vector_h)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	25 #define octave_dim_vector_h 1
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	26
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	27 #include <cassert>
9840 c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	28 #include <limits>
8950 d865363208d6 include <iosfwd> instead of <iostream> in header files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	29
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5307 diff changeset	30 #include <sstream>
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	31 #include <string>
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	32
6216 74ca56e4414c [project @ 2006-12-22 17:45:47 by jwe] jwe parents: 5765 diff changeset	33 #include "lo-error.h"
10419 afe44ee90cbd implement generic macro magic for repeated decls Jaroslav Hajek <highegg@gmail.com> parents: 10418 diff changeset	34 #include "lo-macros.h"
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	35
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	36 // Rationale: This implementation is more tricky than Array, but the
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	37 // big plus is that dim_vector requires only one allocation instead of
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	38 // two. It is (slightly) patterned after GCC's basic_string
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	39 // implementation. rep is a pointer to an array of memory, comprising
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	40 // count, length, and the data:
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	41 //
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	42 // <count>
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	43 // <ndims>
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	44 // rep --> <dims[0]>
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	45 // <dims[1]>
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	46 // ...
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	47 //
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	48 // The inlines count(), ndims() recover this data from the rep. Note
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	49 // that rep points to the beginning of dims to grant faster access
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	50 // (reinterpret_cast is assumed to be an inexpensive operation).
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	51
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	52 class
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	53 dim_vector
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	54 {
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	55 private:
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	56
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	57 octave_idx_type *rep;
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	58
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	59 octave_idx_type& ndims (void) const { return rep[-1]; }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	60
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	61 octave_idx_type& count (void) const { return rep[-2]; }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	62
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	63 // Construct a new rep with count = 1 and ndims given.
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	64
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	65 static octave_idx_type *newrep (int ndims)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	66 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	67 octave_idx_type *r = new octave_idx_type[ndims + 2];
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	68
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	69 *r++ = 1;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	70 *r++ = ndims;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	71
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	72 return r;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	73 }
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	74
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	75 // Clone this->rep.
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	76
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	77 octave_idx_type *clonerep (void)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	78 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	79 int l = ndims ();
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	80
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	81 octave_idx_type *r = new octave_idx_type[l + 2];
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	82
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	83 *r++ = 1;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	84 *r++ = l;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	85
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	86 for (int i = 0; i < l; i++)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	87 r[i] = rep[i];
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	88
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	89 return r;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	90 }
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	91
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	92 // Clone and resize this->rep to length n, filling by given value.
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	93
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	94 octave_idx_type *resizerep (int n, octave_idx_type fill_value)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	95 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	96 int l = ndims ();
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	97
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	98 if (n < 2)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	99 n = 2;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	100
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	101 octave_idx_type *r = new octave_idx_type[n + 2];
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	102
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	103 *r++ = 1;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	104 *r++ = n;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	105
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	106 if (l > n)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	107 l = n;
4673 6639c2574023 [project @ 2003-12-10 16:11:54 by jwe] jwe parents: 4655 diff changeset	108
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	109 int j;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	110 for (j = 0; j < l; j++)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	111 r[j] = rep[j];
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	112 for (; j < n; j++)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	113 r[j] = fill_value;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	114
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	115 return r;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	116 }
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	117
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	118 // Free the rep.
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	119
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	120 void freerep (void)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	121 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	122 assert (count () == 0);
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	123 delete [] (rep - 2);
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	124 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	125
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	126 void make_unique (void)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	127 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	128 if (count () > 1)
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	129 {
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	130 --count();
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	131 rep = clonerep ();
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	132 }
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	133 }
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	134
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	135 public:
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	136
10420 3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	137 // The constructor
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	138 //
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	139 // dim_vector (n)
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	140 //
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	141 // creates an dimension vector with N rows and 1 column. It is
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	142 // deprecated because of the potentiol for confusion that it causes.
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	143 // Additional constructors of the form
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	144 //
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	145 // dim_vector (r, c)
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	146 // dim_vector (r, c, p)
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	147 // dim_vector (d1, d2, d3, d4, ...)
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	148 //
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	149 // are available for up to 7 dimensions.
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	150
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	151 explicit dim_vector (octave_idx_type n) GCC_ATTR_DEPRECATED
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	152 : rep (newrep (2))
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	153 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	154 rep[0] = n;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	155 rep[1] = 1;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	156 }
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	157
10419 afe44ee90cbd implement generic macro magic for repeated decls Jaroslav Hajek <highegg@gmail.com> parents: 10418 diff changeset	158 #define ASSIGN_REP(i) rep[i] = d ## i;
afe44ee90cbd implement generic macro magic for repeated decls Jaroslav Hajek <highegg@gmail.com> parents: 10418 diff changeset	159 #define DIM_VECTOR_CTOR(N) \
10420 3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	160 dim_vector (OCT_MAKE_DECL_LIST (octave_idx_type, d, N)) \
10419 afe44ee90cbd implement generic macro magic for repeated decls Jaroslav Hajek <highegg@gmail.com> parents: 10418 diff changeset	161 : rep (newrep (N)) \
afe44ee90cbd implement generic macro magic for repeated decls Jaroslav Hajek <highegg@gmail.com> parents: 10418 diff changeset	162 { \
10420 3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	163 OCT_ITERATE_MACRO (ASSIGN_REP, N) \
10418 6c19d6fcd7e5 up to 7th-order dim_vector constructors Jaroslav Hajek <highegg@gmail.com> parents: 10403 diff changeset	164 }
10419 afe44ee90cbd implement generic macro magic for repeated decls Jaroslav Hajek <highegg@gmail.com> parents: 10418 diff changeset	165
afe44ee90cbd implement generic macro magic for repeated decls Jaroslav Hajek <highegg@gmail.com> parents: 10418 diff changeset	166 // Add more if needed.
10420 3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	167 DIM_VECTOR_CTOR (2)
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	168 DIM_VECTOR_CTOR (3)
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	169 DIM_VECTOR_CTOR (4)
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	170 DIM_VECTOR_CTOR (5)
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	171 DIM_VECTOR_CTOR (6)
3373fdc0b14a use macro for 2 and 3 arg dim_vector constructors John W. Eaton <jwe@octave.org> parents: 10419 diff changeset	172 DIM_VECTOR_CTOR (7)
10419 afe44ee90cbd implement generic macro magic for repeated decls Jaroslav Hajek <highegg@gmail.com> parents: 10418 diff changeset	173
afe44ee90cbd implement generic macro magic for repeated decls Jaroslav Hajek <highegg@gmail.com> parents: 10418 diff changeset	174 #undef ASSIGN_REP
afe44ee90cbd implement generic macro magic for repeated decls Jaroslav Hajek <highegg@gmail.com> parents: 10418 diff changeset	175 #undef DIM_VECTOR_CTOR
afe44ee90cbd implement generic macro magic for repeated decls Jaroslav Hajek <highegg@gmail.com> parents: 10418 diff changeset	176
10403 69ecfbffcf4f liboctave/dim-vector.h: New constructor accepting a C array of dimensions. Soren Hauberg <hauberg@gmail.com> parents: 10366 diff changeset	177 dim_vector (const octave_idx_type *vec, size_t vec_size)
69ecfbffcf4f liboctave/dim-vector.h: New constructor accepting a C array of dimensions. Soren Hauberg <hauberg@gmail.com> parents: 10366 diff changeset	178 : rep (newrep (vec_size))
69ecfbffcf4f liboctave/dim-vector.h: New constructor accepting a C array of dimensions. Soren Hauberg <hauberg@gmail.com> parents: 10366 diff changeset	179 {
69ecfbffcf4f liboctave/dim-vector.h: New constructor accepting a C array of dimensions. Soren Hauberg <hauberg@gmail.com> parents: 10366 diff changeset	180 for (size_t k = 0; k < vec_size; k++)
69ecfbffcf4f liboctave/dim-vector.h: New constructor accepting a C array of dimensions. Soren Hauberg <hauberg@gmail.com> parents: 10366 diff changeset	181 rep[k] = vec[k];
69ecfbffcf4f liboctave/dim-vector.h: New constructor accepting a C array of dimensions. Soren Hauberg <hauberg@gmail.com> parents: 10366 diff changeset	182 }
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	183
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	184 octave_idx_type& elem (int i)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	185 {
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	186 #ifdef BOUNDS_CHECKING
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	187 assert (i >= 0 && i < ndims ());
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	188 #endif
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	189 make_unique ();
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	190 return rep[i];
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	191 }
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	192
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	193 octave_idx_type elem (int i) const
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	194 {
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	195 #ifdef BOUNDS_CHECKING
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	196 assert (i >= 0 && i < ndims ());
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	197 #endif
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	198 return rep[i];
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	199 }
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	200
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	201 void chop_trailing_singletons (void)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	202 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	203 int l = ndims ();
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	204 if (l > 2 && rep[l-1] == 1)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	205 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	206 make_unique ();
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	207 do
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	208 l--;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	209 while (l > 2 && rep[l-1] == 1);
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	210 ndims () = l;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	211 }
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	212 }
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	213
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	214 void chop_all_singletons (void)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	215 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	216 make_unique ();
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	217
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	218 int j = 0;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	219 int l = ndims();
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	220
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	221 for (int i = 0; i < l; i++)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	222 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	223 if (rep[i] != 1)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	224 rep[j++] = rep[i];
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	225 }
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	226
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	227 if (j == 1)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	228 rep[1] = 1;
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	229
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	230 ndims () = j > 2 ? j : 2;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	231 }
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	232
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	233 private:
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	234
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	235 static octave_idx_type *nil_rep (void)
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	236 {
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	237 static dim_vector zv (0, 0);
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	238 return zv.rep;
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	239 }
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	240
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	241 explicit dim_vector (octave_idx_type *r)
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	242 : rep (r) { }
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	243
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	244 public:
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	245
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	246 explicit dim_vector (void) : rep (nil_rep ()) { count()++; }
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	247
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	248 dim_vector (const dim_vector& dv) : rep (dv.rep) { count()++; }
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	249
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	250 static dim_vector alloc (int n)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	251 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	252 return dim_vector (newrep (n < 2 ? 2 : n));
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	253 }
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	254
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	255 dim_vector& operator = (const dim_vector& dv)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	256 {
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	257 if (&dv != this)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	258 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	259 if (--count() <= 0)
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	260 freerep ();
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	261
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	262 rep = dv.rep;
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	263 count()++;
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	264 }
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	265
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	266 return *this;
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	267 }
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	268
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	269 ~dim_vector (void)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	270 {
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	271 if (--count() <= 0)
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	272 freerep ();
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	273 }
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	274
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	275 int length (void) const { return ndims (); }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	276
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	277 octave_idx_type& operator () (int i) { return elem (i); }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	278
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	279 octave_idx_type operator () (int i) const { return elem (i); }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	280
4887 bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe] jwe parents: 4735 diff changeset	281 void resize (int n, int fill_value = 0)
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	282 {
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	283 int len = length ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	284
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	285 if (n != len)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	286 {
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	287 octave_idx_type *r = resizerep (n, fill_value);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	288
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	289 if (--count() <= 0)
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	290 freerep ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	291
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	292 rep = r;
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	293 }
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	294 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	295
4559 802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	296 std::string str (char sep = 'x') const
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	297 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5307 diff changeset	298 std::ostringstream buf;
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	299
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	300 for (int i = 0; i < length (); i++)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	301 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	302 buf << elem (i);
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	303
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	304 if (i < length () - 1)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	305 buf << sep;
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	306 }
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	307
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5307 diff changeset	308 std::string retval = buf.str ();
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	309
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	310 return retval;
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	311 }
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	312
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	313 bool all_zero (void) const
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	314 {
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	315 bool retval = true;
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	316
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	317 for (int i = 0; i < length (); i++)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	318 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	319 if (elem (i) != 0)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	320 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	321 retval = false;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	322 break;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	323 }
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	324 }
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	325
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	326 return retval;
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	327 }
4559 802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	328
9886 cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	329 bool zero_by_zero (void) const
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	330 {
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	331 return length () == 2 && elem (0) == 0 && elem (1) == 0;
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	332 }
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	333
4559 802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	334 bool any_zero (void) const
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	335 {
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	336 bool retval = false;
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	337
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	338 for (int i = 0; i < length (); i++)
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	339 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	340 if (elem (i) == 0)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	341 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	342 retval = true;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	343 break;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	344 }
4559 802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	345 }
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	346
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	347 return retval;
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	348 }
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	349
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	350 int num_ones (void) const
4635 f2cd320cbf6e [project @ 2003-11-20 01:48:23 by jwe] jwe parents: 4567 diff changeset	351 {
f2cd320cbf6e [project @ 2003-11-20 01:48:23 by jwe] jwe parents: 4567 diff changeset	352 int retval = 0;
f2cd320cbf6e [project @ 2003-11-20 01:48:23 by jwe] jwe parents: 4567 diff changeset	353
f2cd320cbf6e [project @ 2003-11-20 01:48:23 by jwe] jwe parents: 4567 diff changeset	354 for (int i = 0; i < length (); i++)
f2cd320cbf6e [project @ 2003-11-20 01:48:23 by jwe] jwe parents: 4567 diff changeset	355 if (elem (i) == 1)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	356 retval++;
4635 f2cd320cbf6e [project @ 2003-11-20 01:48:23 by jwe] jwe parents: 4567 diff changeset	357
f2cd320cbf6e [project @ 2003-11-20 01:48:23 by jwe] jwe parents: 4567 diff changeset	358 return retval;
f2cd320cbf6e [project @ 2003-11-20 01:48:23 by jwe] jwe parents: 4567 diff changeset	359 }
f2cd320cbf6e [project @ 2003-11-20 01:48:23 by jwe] jwe parents: 4567 diff changeset	360
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	361 bool all_ones (void) const
4655 c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4635 diff changeset	362 {
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4635 diff changeset	363 return (num_ones () == length ());
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4635 diff changeset	364 }
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4635 diff changeset	365
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	366 // Return the number of elements that a matrix with this dimension
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	367 // vector would have, NOT the number of dimensions (elements in the
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	368 // dimension vector).
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	369
9027 9a46ba093db4 generalize dim_vector::numel Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	370 octave_idx_type numel (int n = 0) const
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	371 {
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	372 int n_dims = length ();
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	373
9027 9a46ba093db4 generalize dim_vector::numel Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	374 octave_idx_type retval = 1;
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	375
9027 9a46ba093db4 generalize dim_vector::numel Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	376 for (int i = n; i < n_dims; i++)
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	377 retval *= elem (i);
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	378
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	379 return retval;
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	380 }
4673 6639c2574023 [project @ 2003-12-10 16:11:54 by jwe] jwe parents: 4655 diff changeset	381
9840 c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	382 // The following function will throw a std::bad_alloc ()
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	383 // exception if the requested size is larger than can be indexed by
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	384 // octave_idx_type. This may be smaller than the actual amount of
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	385 // memory that can be safely allocated on a system. However, if we
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	386 // don't fail here, we can end up with a mysterious crash inside a
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	387 // function that is iterating over an array using octave_idx_type
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	388 // indices.
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	389
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	390 octave_idx_type safe_numel (void) const
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	391 {
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	392 octave_idx_type idx_max = std::numeric_limits<octave_idx_type>::max () - 1;
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	393 octave_idx_type n = 1;
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	394 int n_dims = length ();
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	395
9840 c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	396 for (int i = 0; i < n_dims; i++)
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	397 {
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	398 n *= rep[i];
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	399 if (rep[i] != 0)
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	400 idx_max /= rep[i];
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	401 if (idx_max <= 0)
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	402 throw std::bad_alloc ();
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	403 }
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	404
9840 c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	405 return n;
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	406 }
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	407
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	408 bool any_neg (void) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	409 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	410 int n_dims = length ();
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	411 int i;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	412
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	413 for (i = 0; i < n_dims; i++)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	414 if (elem (i) < 0)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	415 break;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	416
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	417 return i < n_dims;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	418 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	419
4735 24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	420 dim_vector squeeze (void) const
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	421 {
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	422 dim_vector new_dims = *this;
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	423
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	424 bool dims_changed = 1;
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	425
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	426 int k = 0;
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	427
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	428 for (int i = 0; i < length (); i++)
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	429 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	430 if (elem (i) == 1)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	431 dims_changed = true;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	432 else
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	433 new_dims(k++) = elem (i);
4735 24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	434 }
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	435
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	436 if (dims_changed)
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	437 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	438 if (k == 0)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	439 new_dims = dim_vector (1, 1);
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	440 else if (k == 1)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	441 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	442 // There is one non-singleton dimension, so we need
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	443 // to decide the correct orientation.
4735 24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	444
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	445 if (elem (0) == 1)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	446 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	447 // The original dimension vector had a leading
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	448 // singleton dimension.
4735 24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	449
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	450 octave_idx_type tmp = new_dims(0);
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	451
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	452 new_dims.resize (2);
4735 24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	453
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	454 new_dims(0) = 1;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	455 new_dims(1) = tmp;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	456 }
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	457 else
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	458 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	459 // The first element of the original dimension vector
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	460 // was not a singleton dimension.
4735 24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	461
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	462 new_dims.resize (2);
4735 24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	463
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	464 new_dims(1) = 1;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	465 }
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	466 }
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	467 else
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	468 new_dims.resize(k);
4735 24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	469 }
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	470
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	471 return new_dims;
24c7bc6354ba [project @ 2004-02-05 17:26:28 by jwe] jwe parents: 4673 diff changeset	472 }
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	473
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	474 bool concat (const dim_vector& dvb, int dim = 0)
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	475 {
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	476 if (all_zero ())
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	477 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	478 *this = dvb;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	479 return true;
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	480 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	481
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	482 if (dvb.all_zero ())
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	483 return true;
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	484
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	485 int na = length ();
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	486 int nb = dvb.length ();
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	487
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	488 // Find the max and min value of na and nb
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	489 int n_max = na > nb ? na : nb;
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	490 int n_min = na < nb ? na : nb;
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	491
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	492 // The elements of the dimension vectors can only differ
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	493 // if the dim variable differs from the actual dimension
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	494 // they differ.
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	495
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	496 for (int i = 0; i < n_min; i++)
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	497 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	498 if (elem(i) != dvb(i) && dim != i)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	499 return false;
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	500 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	501
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	502 // Ditto.
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	503 for (int i = n_min; i < n_max; i++)
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	504 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	505 if (na > n_min)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	506 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	507 if (elem(i) != 1 && dim != i)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	508 return false;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	509 }
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	510 else
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	511 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	512 if (dvb(i) != 1 && dim != i)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	513 return false;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	514 }
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	515 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	516
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	517 // If we want to add the dimension vectors at a dimension
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	518 // larger than both, then we need to set n_max to this number
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	519 // so that we resize *this to the right dimension.
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	520
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	521 n_max = n_max > (dim + 1) ? n_max : (dim + 1);
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	522
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	523 // Resize *this to the appropriate dimensions.
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	524
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	525 if (n_max > na)
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	526 resize (n_max, 1);
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	527
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	528 // Larger or equal since dim has been decremented by one.
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	529
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	530 if (dim >= nb)
4940 954cc2ba6a49 [project @ 2004-08-24 19:30:31 by jwe] jwe parents: 4915 diff changeset	531 elem (dim)++;
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	532 else
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	533 elem (dim) += dvb(dim);
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	534
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	535 return true;
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4887 diff changeset	536 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	537
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	538 // Force certain dimensionality, preserving numel (). Missing
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	539 // dimensions are set to 1, redundant are folded into the trailing
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	540 // one. If n = 1, the result is 2d and the second dim is 1
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	541 // (dim_vectors are always at least 2D). If the original dimensions
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	542 // were all zero, the padding value is zero.
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	543
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	544 dim_vector redim (int n) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	545 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	546 int n_dims = length ();
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	547
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	548 if (n_dims == n)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	549 return *this;
9666 a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	550 else if (n_dims < n)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	551 {
9666 a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	552 dim_vector retval = alloc (n);
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	553
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	554 int pad = 0;
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	555 for (int i = 0; i < n_dims; i++)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	556 {
9666 a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	557 retval.rep[i] = rep[i];
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	558 if (rep[i] != 0)
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	559 pad = 1;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	560 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	561
9666 a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	562 for (int i = n_dims; i < n; i++)
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	563 retval.rep[i] = pad;
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	564
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	565 return retval;
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	566 }
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	567 else
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	568 {
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	569 if (n < 1) n = 1;
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	570
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	571 dim_vector retval = alloc (n);
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	572
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	573 retval.rep[1] = 1;
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	574
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	575 for (int i = 0; i < n-1; i++)
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	576 retval.rep[i] = rep[i];
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	577
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	578 int k = rep[n-1];
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	579 for (int i = n; i < n_dims; i++)
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	580 k *= rep[i];
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	581
a531dec450c4 allow 1D case for sub2ind and ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9648 diff changeset	582 retval.rep[n-1] = k;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	583
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	584 return retval;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	585 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	586 }
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	587
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	588 dim_vector as_column (void) const
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	589 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	590 if (length () == 2 && elem (1) == 1)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	591 return *this;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	592 else
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	593 return dim_vector (numel (), 1);
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	594 }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	595
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	596 dim_vector as_row (void) const
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	597 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	598 if (length () == 2 && elem (0) == 1)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	599 return *this;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	600 else
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	601 return dim_vector (1, numel ());
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	602 }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	603
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	604 bool is_vector (void) const
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	605 {
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	606 return (length () == 2 && (elem (0) == 1 \|\| elem (1) == 1));
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	607 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	608
9511 cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	609 int first_non_singleton (int def = 0) const
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	610 {
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	611 for (int i = 0; i < length (); i++)
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	612 {
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	613 if (elem (i) != 1)
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	614 return i;
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	615 }
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	616
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	617 return def;
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	618 }
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	619
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	620 // Compute a linear index from an index tuple.
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	621
9739 13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	622 octave_idx_type compute_index (const octave_idx_type *idx)
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	623 {
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	624 octave_idx_type k = 0;
9743 26abff55f6fe optimize bsxfun for common built-in operations Jaroslav Hajek <highegg@gmail.com> parents: 9739 diff changeset	625 for (int i = length () - 1; i >= 0; i--)
9739 13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	626 k = k * rep[i] + idx[i];
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	627
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	628 return k;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	629 }
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	630
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	631 // Increment a multi-dimensional index tuple, optionally starting
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	632 // from an offset position and return the index of the last index
9739 13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	633 // position that was changed, or length () if just cycled over.
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	634
9739 13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	635 int increment_index (octave_idx_type *idx, int start = 0)
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	636 {
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	637 int i;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	638 for (i = start; i < length (); i++)
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	639 {
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	640 if (++(*idx) == rep[i])
9743 26abff55f6fe optimize bsxfun for common built-in operations Jaroslav Hajek <highegg@gmail.com> parents: 9739 diff changeset	641 *idx++ = 0;
9739 13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	642 else
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	643 break;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	644 }
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	645 return i;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	646 }
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	647
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	648 // Return cumulative dimensions.
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	649
9739 13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	650 dim_vector cumulative (void) const
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	651 {
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	652 int nd = length ();
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	653 dim_vector retval = alloc (nd);
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	654
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	655 octave_idx_type k = 1;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	656 for (int i = 0; i < nd; i++)
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	657 retval.rep[i] = k *= rep[i];
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	658
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	659 return retval;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	660 }
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	661
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	662 // Compute a linear index from an index tuple. Dimensions are
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	663 // required to be cumulative.
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	664
9739 13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	665 octave_idx_type cum_compute_index (const octave_idx_type *idx)
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	666 {
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	667 octave_idx_type k = idx[0];
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	668
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	669 for (int i = 1; i < length (); i++)
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	670 k += rep[i-1] * idx[i];
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	671
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	672 return k;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	673 }
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	674
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	675
9694 50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	676 friend bool operator == (const dim_vector& a, const dim_vector& b);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	677 };
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	678
9694 50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	679 inline bool
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	680 operator == (const dim_vector& a, const dim_vector& b)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	681 {
9694 50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	682 // Fast case.
50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	683 if (a.rep == b.rep)
50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	684 return true;
50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	685
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	686 bool retval = true;
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	687
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	688 int a_len = a.length ();
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	689 int b_len = b.length ();
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	690
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	691 if (a_len != b_len)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	692 retval = false;
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	693 else
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	694 {
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	695 for (int i = 0; i < a_len; i++)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	696 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	697 if (a(i) != b(i))
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	698 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	699 retval = false;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	700 break;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	701 }
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	702 }
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	703 }
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	704
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	705 return retval;
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	706 }
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	707
9694 50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	708 inline bool
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	709 operator != (const dim_vector& a, const dim_vector& b)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	710 {
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	711 return ! operator == (a, b);
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	712 }
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	713
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	714 #endif

Mercurial > hg > octave-nkf

annotate liboctave/dim-vector.h @ 10480:19e1e4470e01