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

annotate liboctave/dim-vector.h @ 10830:b4ebfd675321

avoid static initialization disaster in dim_vector

author	Jaroslav Hajek <highegg@gmail.com>
date	Thu, 29 Jul 2010 08:47:26 +0200
parents	6683f0c9d742
children	298a75c128ad

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
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10498 diff changeset	4 Copyirght (C) 2009, 2010 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
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	177 octave_idx_type& elem (int i)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	178 {
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	179 #ifdef BOUNDS_CHECKING
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	180 assert (i >= 0 && i < ndims ());
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	181 #endif
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	182 make_unique ();
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	183 return rep[i];
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	184 }
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	185
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	186 octave_idx_type elem (int i) const
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	187 {
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	188 #ifdef BOUNDS_CHECKING
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	189 assert (i >= 0 && i < ndims ());
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	190 #endif
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	191 return rep[i];
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	192 }
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	193
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	194 void chop_trailing_singletons (void)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	195 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	196 int l = ndims ();
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	197 if (l > 2 && rep[l-1] == 1)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	198 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	199 make_unique ();
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	200 do
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	201 l--;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	202 while (l > 2 && rep[l-1] == 1);
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	203 ndims () = l;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	204 }
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	205 }
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	206
10681 0ba9bd294421 make cat() (hopefully) more matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10645 diff changeset	207 void chop_all_singletons (void);
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	208
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	209 private:
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	210
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	211 static octave_idx_type *nil_rep (void)
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	212 {
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	213 static dim_vector zv (0, 0);
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	214 return zv.rep;
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	215 }
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	216
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	217 explicit dim_vector (octave_idx_type *r)
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	218 : rep (r) { }
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	219
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	220 public:
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	221
10830 b4ebfd675321 avoid static initialization disaster in dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 10810 diff changeset	222 static octave_idx_type dim_max (void);
10810 6683f0c9d742 make the maximum extent externally accessible Jaroslav Hajek <highegg@gmail.com> parents: 10715 diff changeset	223
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	224 explicit dim_vector (void) : rep (nil_rep ()) { count()++; }
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	225
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	226 dim_vector (const dim_vector& dv) : rep (dv.rep) { count()++; }
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	227
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	228 static dim_vector alloc (int n)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	229 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	230 return dim_vector (newrep (n < 2 ? 2 : n));
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	231 }
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	232
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	233 dim_vector& operator = (const dim_vector& dv)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	234 {
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	235 if (&dv != this)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	236 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	237 if (--count() <= 0)
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	238 freerep ();
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	239
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	240 rep = dv.rep;
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	241 count()++;
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	242 }
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	243
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	244 return *this;
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	245 }
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	246
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	247 ~dim_vector (void)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	248 {
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	249 if (--count() <= 0)
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	250 freerep ();
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	251 }
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	252
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	253 int length (void) const { return ndims (); }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	254
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	255 octave_idx_type& operator () (int i) { return elem (i); }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	256
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	257 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	258
4887 bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe] jwe parents: 4735 diff changeset	259 void resize (int n, int fill_value = 0)
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	260 {
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	261 int len = length ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	262
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	263 if (n != len)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	264 {
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	265 octave_idx_type *r = resizerep (n, fill_value);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	266
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	267 if (--count() <= 0)
b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	268 freerep ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	269
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9420 diff changeset	270 rep = r;
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	271 }
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	272 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	273
10681 0ba9bd294421 make cat() (hopefully) more matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10645 diff changeset	274 std::string str (char sep = 'x') const;
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	275
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	276 bool all_zero (void) const
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	277 {
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	278 bool retval = true;
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	279
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	280 for (int i = 0; i < length (); i++)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	281 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	282 if (elem (i) != 0)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	283 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	284 retval = false;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	285 break;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	286 }
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	287 }
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	288
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	289 return retval;
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4543 diff changeset	290 }
4559 802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	291
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	292 bool empty_2d (void) const
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	293 {
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	294 return length () == 2 && (elem (0) == 0 \|\| elem (1) == 0);
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	295 }
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	296
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	297
9886 cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	298 bool zero_by_zero (void) const
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	299 {
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	300 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	301 }
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	302
4559 802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	303 bool any_zero (void) const
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	304 {
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	305 bool retval = false;
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	306
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	307 for (int i = 0; i < length (); i++)
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	308 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	309 if (elem (i) == 0)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	310 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	311 retval = true;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	312 break;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	313 }
4559 802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	314 }
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	315
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	316 return retval;
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4548 diff changeset	317 }
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	318
10681 0ba9bd294421 make cat() (hopefully) more matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10645 diff changeset	319 int num_ones (void) const;
4635 f2cd320cbf6e [project @ 2003-11-20 01:48:23 by jwe] jwe parents: 4567 diff changeset	320
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	321 bool all_ones (void) const
4655 c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4635 diff changeset	322 {
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4635 diff changeset	323 return (num_ones () == length ());
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4635 diff changeset	324 }
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4635 diff changeset	325
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	326 // 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	327 // 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	328 // dimension vector).
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	329
9027 9a46ba093db4 generalize dim_vector::numel Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	330 octave_idx_type numel (int n = 0) const
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	331 {
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	332 int n_dims = length ();
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	333
9027 9a46ba093db4 generalize dim_vector::numel Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	334 octave_idx_type retval = 1;
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	335
9027 9a46ba093db4 generalize dim_vector::numel Jaroslav Hajek <highegg@gmail.com> parents: 8950 diff changeset	336 for (int i = n; i < n_dims; i++)
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	337 retval *= elem (i);
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	338
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	339 return retval;
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4565 diff changeset	340 }
4673 6639c2574023 [project @ 2003-12-10 16:11:54 by jwe] jwe parents: 4655 diff changeset	341
9840 c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	342 // 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	343 // 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	344 // 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	345 // 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	346 // 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	347 // 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	348 // indices.
c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	349
10681 0ba9bd294421 make cat() (hopefully) more matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10645 diff changeset	350 octave_idx_type safe_numel (void) const;
9840 c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9743 diff changeset	351
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	352 bool any_neg (void) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	353 {
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	354 int n_dims = length ();
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	355 int i;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	356
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	357 for (i = 0; i < n_dims; i++)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	358 if (elem (i) < 0)
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	359 break;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	360
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	361 return i < n_dims;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	362 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	363
10681 0ba9bd294421 make cat() (hopefully) more matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10645 diff changeset	364 dim_vector squeeze (void) const;
10498 8615b55b5caf fix & improve cat (bug #29465) Jaroslav Hajek <highegg@gmail.com> parents: 10420 diff changeset	365
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	366 // This corresponds to cat().
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	367 bool concat (const dim_vector& dvb, int dim);
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	368
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	369 // This corresponds to [,] (horzcat, dim = 0) and [;] (vertcat, dim = 1).
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	370 // The rules are more relaxed here.
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	371 bool hvcat (const dim_vector& dvb, int dim);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	372
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	373 // Force certain dimensionality, preserving numel (). Missing
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	374 // dimensions are set to 1, redundant are folded into the trailing
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	375 // 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	376 // (dim_vectors are always at least 2D). If the original dimensions
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	377 // were all zero, the padding value is zero.
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	378
10681 0ba9bd294421 make cat() (hopefully) more matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10645 diff changeset	379 dim_vector redim (int n) const;
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	380
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	381 dim_vector as_column (void) const
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	382 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	383 if (length () == 2 && elem (1) == 1)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	384 return *this;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	385 else
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	386 return dim_vector (numel (), 1);
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	387 }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	388
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	389 dim_vector as_row (void) const
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	390 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	391 if (length () == 2 && elem (0) == 1)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	392 return *this;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	393 else
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	394 return dim_vector (1, numel ());
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	395 }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10150 diff changeset	396
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	397 bool is_vector (void) const
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	398 {
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	399 return (length () == 2 && (elem (0) == 1 \|\| elem (1) == 1));
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	400 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	401
9511 cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	402 int first_non_singleton (int def = 0) const
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	403 {
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	404 for (int i = 0; i < length (); i++)
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	405 {
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	406 if (elem (i) != 1)
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	407 return i;
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	408 }
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	409
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	410 return def;
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	411 }
cc1fd3084cb2 implement dim_vector::first_non_singleton Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	412
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	413 // Compute a linear index from an index tuple.
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	414
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	415 octave_idx_type compute_index (const octave_idx_type *idx) const
9739 13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	416 {
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	417 octave_idx_type k = 0;
9743 26abff55f6fe optimize bsxfun for common built-in operations Jaroslav Hajek <highegg@gmail.com> parents: 9739 diff changeset	418 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	419 k = k * rep[i] + idx[i];
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	420
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	421 return k;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	422 }
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	423
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	424 // Ditto, but the tuple may be incomplete (nidx < length ()).
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	425
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	426 octave_idx_type compute_index (const octave_idx_type *idx, int nidx) const
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	427 {
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	428 octave_idx_type k = 0;
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	429 for (int i = nidx - 1; i >= 0; i--)
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	430 k = k * rep[i] + idx[i];
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	431
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	432 return k;
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	433 }
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	434
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	435 // Increment a multi-dimensional index tuple, optionally starting
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	436 // 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	437 // position that was changed, or length () if just cycled over.
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	438
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	439 int increment_index (octave_idx_type *idx, int start = 0) const
9739 13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	440 {
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	441 int i;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	442 for (i = start; i < length (); i++)
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	443 {
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	444 if (++(*idx) == rep[i])
9743 26abff55f6fe optimize bsxfun for common built-in operations Jaroslav Hajek <highegg@gmail.com> parents: 9739 diff changeset	445 *idx++ = 0;
9739 13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	446 else
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	447 break;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	448 }
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	449 return i;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	450 }
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	451
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	452 // Return cumulative dimensions.
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	453
9739 13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	454 dim_vector cumulative (void) const
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	455 {
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	456 int nd = length ();
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	457 dim_vector retval = alloc (nd);
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	458
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	459 octave_idx_type k = 1;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	460 for (int i = 0; i < nd; i++)
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	461 retval.rep[i] = k *= rep[i];
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	462
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	463 return retval;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	464 }
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	465
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	466 // Compute a linear index from an index tuple. Dimensions are
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	467 // required to be cumulative.
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	468
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10586 diff changeset	469 octave_idx_type cum_compute_index (const octave_idx_type *idx) const
9739 13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	470 {
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	471 octave_idx_type k = idx[0];
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	472
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	473 for (int i = 1; i < length (); i++)
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	474 k += rep[i-1] * idx[i];
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	475
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	476 return k;
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	477 }
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	478
13b57eec9440 a few handy methods for dim_vector Jaroslav Hajek <highegg@gmail.com> parents: 9694 diff changeset	479
9694 50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	480 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	481 };
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	482
9694 50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	483 inline bool
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	484 operator == (const dim_vector& a, const dim_vector& b)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	485 {
9694 50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	486 // Fast case.
50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	487 if (a.rep == b.rep)
50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	488 return true;
50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	489
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	490 bool retval = true;
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	491
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	492 int a_len = a.length ();
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	493 int b_len = b.length ();
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	494
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	495 if (a_len != b_len)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	496 retval = false;
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	497 else
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	498 {
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	499 for (int i = 0; i < a_len; i++)
10150 3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	500 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	501 if (a(i) != b(i))
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	502 {
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	503 retval = false;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	504 break;
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	505 }
3778ea95adea style fixes John W. Eaton <jwe@octave.org> parents: 10095 diff changeset	506 }
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	507 }
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	508
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	509 return retval;
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	510 }
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	511
9694 50db3c5175b5 allow unpacked form of LU Jaroslav Hajek <highegg@gmail.com> parents: 9666 diff changeset	512 inline bool
4543 79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	513 operator != (const dim_vector& a, const dim_vector& b)
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	514 {
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	515 return ! operator == (a, b);
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	516 }
79df15d4470c [project @ 2003-10-18 03:53:52 by jwe] jwe parents: 4532 diff changeset	517
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: diff changeset	518 #endif

Mercurial > hg > octave-nkf

annotate liboctave/dim-vector.h @ 10830:b4ebfd675321