octave-nkf: liboctave/idx-vector.cc annotate

annotate liboctave/idx-vector.cc @ 8301:f7d44b6a74df

fix out-of-bounds checks in null assignments

author	Jaroslav Hajek <highegg@gmail.com>
date	Sun, 02 Nov 2008 06:15:11 +0100
parents	7cbe01c21986
children	c374691576f6

rev	line source
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1 /*
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2
7017 a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	3 Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002,
a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	4 2003, 2004, 2005, 2006, 2007 John W. Eaton
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	5 Copyright (C) 2008 Jaroslav Hajek
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	6
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	7 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	8
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	10 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6884 diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6884 diff changeset	12 option) any later version.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	13
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	17 for more details.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	18
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	19 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6884 diff changeset	20 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6884 diff changeset	21 <http://www.gnu.org/licenses/>.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	22
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	23 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	24
240 a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 227 diff changeset	25 #ifdef HAVE_CONFIG_H
1192 b6360f2d4fa6 [project @ 1995-03-30 21:38:35 by jwe] jwe parents: 1135 diff changeset	26 #include <config.h>
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	27 #endif
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	28
1343 94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1321 diff changeset	29 #include <cstdlib>
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1321 diff changeset	30
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3472 diff changeset	31 #include <iostream>
164 e2c950dd96d2 [project @ 1993-10-18 19:32:00 by jwe] jwe parents: 1 diff changeset	32
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	33 #include "idx-vector.h"
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	34 #include "Array.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1343 diff changeset	35 #include "Range.h"
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1343 diff changeset	36
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	37 #include "lo-error.h"
2500 e39839e18edc [project @ 1996-11-12 17:13:53 by jwe] jwe parents: 2386 diff changeset	38 #include "lo-mappers.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	39
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	40 static void gripe_invalid_index ()
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	41 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	42 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	43 ("subscript indices must be either positive integers or logicals.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	44 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	45
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	46 static void gripe_invalid_range ()
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	47 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	48 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	49 ("invalid range used as index.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	50 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	51
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	52 static void gripe_index_out_of_range ()
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	53 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	54 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	55 ("internal error: idx_vector index out of range.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	56 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	57
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	58 idx_vector::idx_colon_rep::idx_colon_rep (char c)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	59 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	60 if (c != ':')
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	61 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	62 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	63 ("internal error: invalid character converted to idx_vector. Must be ':'.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	64 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	65 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	66 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	67
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	68 octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	69 idx_vector::idx_colon_rep::checkelem (octave_idx_type i) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	70 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	71 if (i < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	72 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	73 gripe_index_out_of_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	74 return 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	75 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	76 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	77 return i;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	78 }
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	79
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	80 std::ostream&
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	81 idx_vector::idx_colon_rep::print (std::ostream& os) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	82 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	83 return os << ":";
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	84 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	85
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	86 idx_vector::idx_range_rep::idx_range_rep (octave_idx_type _start, octave_idx_type _limit,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	87 octave_idx_type _step)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	88 : start(_start), len (_step ? (_limit - _start) / _step : -1), step (_step)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	89 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	90 if (len < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	91 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	92 gripe_invalid_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	93 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	94 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	95 else if (start < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	96 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	97 gripe_invalid_index ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	98 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	99 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	100 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	101
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	102 static void gripe_non_int_range ()
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	103 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	104 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	105 ("If a range is used as subscript, all elements are expected to be integers.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	106 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	107
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	108 idx_vector::idx_range_rep::idx_range_rep (const Range& r)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	109 : start (0), len (r.nelem ()), step (1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	110 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	111 if (len < 0)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	112 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	113 gripe_invalid_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	114 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	115 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	116 else if (len > 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	117 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	118 if (r.all_elements_are_ints ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	119 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	120 start = static_cast<octave_idx_type> (r.base ()) - 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	121 step = static_cast<octave_idx_type> (r.inc ());
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	122 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	123 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	124 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	125 gripe_non_int_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	126 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	127 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	128 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	129 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	130
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5108 diff changeset	131 octave_idx_type
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	132 idx_vector::idx_range_rep::checkelem (octave_idx_type i) const
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	133 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	134 if (i < 0 \|\| i >= len)
4732 b484cdca27be [project @ 2004-02-04 04:32:48 by jwe] jwe parents: 4653 diff changeset	135 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	136 gripe_index_out_of_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	137 return 0;
4732 b484cdca27be [project @ 2004-02-04 04:32:48 by jwe] jwe parents: 4653 diff changeset	138 }
b484cdca27be [project @ 2004-02-04 04:32:48 by jwe] jwe parents: 4653 diff changeset	139 else
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	140 return start + i*step;
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	141 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	142
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	143 idx_vector::idx_base_rep *
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	144 idx_vector::idx_range_rep::sort_uniq_clone (bool)
2500 e39839e18edc [project @ 1996-11-12 17:13:53 by jwe] jwe parents: 2386 diff changeset	145 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	146 if (step < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	147 return new idx_range_rep (start + (len - 1)*step, len, -step, DIRECT);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	148 else
2500 e39839e18edc [project @ 1996-11-12 17:13:53 by jwe] jwe parents: 2386 diff changeset	149 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	150 count++;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	151 return this;
2500 e39839e18edc [project @ 1996-11-12 17:13:53 by jwe] jwe parents: 2386 diff changeset	152 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	153 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	154
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	155 std::ostream&
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	156 idx_vector::idx_range_rep::print (std::ostream& os) const
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	157 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	158 os << start << ':' << step << ':' << start + len*step;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	159 return os;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	160 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	161
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	162 inline octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	163 convert_index (octave_idx_type i, bool& conv_error,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	164 octave_idx_type& ext)
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	165 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	166 if (i <= 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	167 conv_error = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	168 if (ext < i) ext = i;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	169 return i - 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	170 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	171
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	172 inline octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	173 convert_index (double x, bool& conv_error, octave_idx_type& ext)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	174 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	175 octave_idx_type i;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	176 if (xisnan (x) \|\| xisinf (x))
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	177 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	178 i = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	179 conv_error = true;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	180 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	181 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	182 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	183 i = static_cast<octave_idx_type> (x);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	184 if (static_cast<double> (i) != x)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	185 conv_error = true;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	186 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	187
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	188 return convert_index (i, conv_error, ext);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	189 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	190
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	191 inline octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	192 convert_index (float x, bool& conv_error, octave_idx_type& ext)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	193 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	194 return convert_index (static_cast<double> (x), conv_error, ext);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	195 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	196
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	197 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	198 inline octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	199 convert_index (octave_int<T> x, bool& conv_error,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	200 octave_idx_type& ext)
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	201 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	202 octave_idx_type i = octave_int<octave_idx_type> (x).value ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	203 return convert_index (i, conv_error, ext);
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	204 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	205
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	206 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	207 idx_vector::idx_scalar_rep::idx_scalar_rep (T x)
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	208 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	209 octave_idx_type dummy;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	210 data = convert_index (x, err, dummy);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	211 if (err) gripe_invalid_index ();
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	212 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	213
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	214 idx_vector::idx_scalar_rep::idx_scalar_rep (octave_idx_type i)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	215 : data (i)
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	216 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	217 if (data < 0)
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	218 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	219 gripe_invalid_index ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	220 err = true;
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	221 }
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	222 }
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	223
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	224 octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	225 idx_vector::idx_scalar_rep::checkelem (octave_idx_type i) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	226 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	227 if (i != 0) gripe_index_out_of_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	228 return data;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	229 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	230
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	231 std::ostream& idx_vector::idx_scalar_rep::print (std::ostream& os) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	232 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	233 return os << data;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	234 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	235
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	236 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	237 idx_vector::idx_vector_rep::idx_vector_rep (const Array<T>& nda)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	238 : data (0), len (nda.numel ()), ext (0), aowner (0), orig_dims (nda.dims ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	239 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	240 if (len != 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	241 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	242 octave_idx_type *d = new octave_idx_type[len];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	243 for (octave_idx_type i = 0; i < len; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	244 d[i] = convert_index (nda.xelem (i), err, ext);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	245 data = d;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	246
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	247 if (err) gripe_invalid_index ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	248 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	249 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	250
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	251 // Note that this makes a shallow copy of the index array.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	252
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	253 idx_vector::idx_vector_rep::idx_vector_rep (const Array<octave_idx_type>& inda)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	254 : data (inda.data ()), len (inda.numel ()), ext (0),
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	255 aowner (new Array<octave_idx_type> (inda)), orig_dims (inda.dims ())
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	256 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	257 if (len != 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	258 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	259 octave_idx_type max = -1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	260 for (octave_idx_type i = 0; i < len; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	261 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	262 octave_idx_type k = inda.xelem (i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	263 if (k < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	264 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	265 else if (k > max)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	266 max = k;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	267 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	268
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	269 ext = max + 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	270
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	271 if (err) gripe_invalid_index ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	272 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	273 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	274
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	275 idx_vector::idx_vector_rep::idx_vector_rep (bool b)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	276 : data (0), len (b ? 1 : 0), ext (0), aowner (0), orig_dims (len, len)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	277 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	278 if (len != 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	279 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	280 octave_idx_type *d = new octave_idx_type [1];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	281 d[0] = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	282 data = d;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	283 ext = 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	284 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	285 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	286
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	287 idx_vector::idx_vector_rep::idx_vector_rep (const Array<bool>& bnda)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	288 : data (0), len (0), ext (0), aowner (0), orig_dims ()
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	289 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	290 for (octave_idx_type i = 0, l = bnda.numel (); i < l; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	291 if (bnda.xelem (i)) len++;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	292
7774 ce52af0e4a10 all false logical indexing fix David Bateman <dbateman@free.fr> parents: 7727 diff changeset	293 dim_vector dv = bnda.dims ();
ce52af0e4a10 all false logical indexing fix David Bateman <dbateman@free.fr> parents: 7727 diff changeset	294
ce52af0e4a10 all false logical indexing fix David Bateman <dbateman@free.fr> parents: 7727 diff changeset	295 orig_dims = ((dv.length () == 2 && dv(0) == 1)
ce52af0e4a10 all false logical indexing fix David Bateman <dbateman@free.fr> parents: 7727 diff changeset	296 ? dim_vector (1, len) : orig_dims = dim_vector (len, 1));
ce52af0e4a10 all false logical indexing fix David Bateman <dbateman@free.fr> parents: 7727 diff changeset	297
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	298 if (len != 0)
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	299 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	300 octave_idx_type *d = new octave_idx_type [len];
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	301
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	302 octave_idx_type ntot = bnda.length ();
85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	303
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	304 octave_idx_type k = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	305 for (octave_idx_type i = 0; i < ntot; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	306 if (bnda.xelem (i)) d[k++] = i;
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	307
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	308 data = d;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	309
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	310 ext = k;
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	311 }
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	312 }
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	313
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	314 idx_vector::idx_vector_rep::~idx_vector_rep (void)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	315 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	316 if (aowner)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	317 delete aowner;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	318 else
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	319 delete [] data;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	320 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	321
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5108 diff changeset	322 octave_idx_type
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	323 idx_vector::idx_vector_rep::checkelem (octave_idx_type n) const
227 1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	324 {
1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	325 if (n < 0 \|\| n >= len)
1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	326 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	327 gripe_invalid_index ();
227 1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	328 return 0;
1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	329 }
1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	330
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	331 return xelem (n);
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	332 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	333
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	334 idx_vector::idx_base_rep *
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	335 idx_vector::idx_vector_rep::sort_uniq_clone (bool uniq)
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	336 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	337 octave_idx_type *new_data = new octave_idx_type[len];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	338 std::copy (data, data + len, new_data);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	339 std::sort (new_data, new_data + len);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	340 octave_idx_type new_len;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	341 if (uniq)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	342 new_len = std::unique (new_data, new_data + len) - new_data;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	343 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	344 new_len = len;
2966 458cea5c8356 [project @ 1997-05-12 20:17:35 by jwe] jwe parents: 2847 diff changeset	345
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	346 return new idx_vector_rep (new_data, new_len, ext, orig_dims, DIRECT);
209 5869adaa6aea [project @ 1993-11-12 10:44:40 by jwe] jwe parents: 191 diff changeset	347 }
5869adaa6aea [project @ 1993-11-12 10:44:40 by jwe] jwe parents: 191 diff changeset	348
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	349 std::ostream&
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	350 idx_vector::idx_vector_rep::print (std::ostream& os) const
3079 eb827eb9b8ff [project @ 1997-08-03 20:44:07 by jwe] jwe parents: 2966 diff changeset	351 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	352 os << '[';
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	353 for (octave_idx_type ii = 0; ii < len - 1; ii++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	354 os << data[ii] << ',' << ' ';
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	355 if (len > 0) os << data[len-1]; os << ']';
7425 fe4a43e1d1d3 [project @ 2008-01-28 09:13:01 by jwe] jwe parents: 7422 diff changeset	356
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	357 return os;
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	358 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	359
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	360 const idx_vector idx_vector::colon (new idx_vector::idx_colon_rep ());
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	361
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	362 bool idx_vector::maybe_reduce (octave_idx_type n, const idx_vector& j,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	363 octave_idx_type nj)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	364 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	365 bool reduced = false;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	366
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	367 // Empty index always reduces.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	368 if (rep->length (n) == 0)
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	369 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	370 *this = idx_vector ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	371 return true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	372 }
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	373
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	374 switch (j.idx_class ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	375 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	376 case class_colon:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	377 if (rep->is_colon_equiv (n))
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	378 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	379 // (:,:) reduces to (:)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	380 *this = colon;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	381 reduced = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	382 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	383 else if (rep->idx_class () == class_scalar)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	384 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	385 // (i,:) reduces to a range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	386 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	387 octave_idx_type k = r->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	388 *this = new idx_range_rep (k, nj, n, DIRECT);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	389 reduced = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	390 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	391 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	392 case class_range:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	393 if (rep->is_colon_equiv (n))
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	394 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	395 // (:,i:j) reduces to a range (the step must be 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	396 idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	397 if (rj->get_step () == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	398 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	399 octave_idx_type s = rj->get_start (), l = rj->length (nj);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	400 this = new idx_range_rep (s n, l * n, 1, DIRECT);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	401 reduced = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	402 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	403 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	404 else if (rep->idx_class () == class_scalar)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	405 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	406 // (k,i:d:j) reduces to a range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	407 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	408 idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	409 octave_idx_type k = r->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	410 octave_idx_type s = rj->get_start (), l = rj->length (nj);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	411 octave_idx_type t = rj->get_step ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	412 this = new idx_range_rep (n s + k, l, n * t, DIRECT);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	413 reduced = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	414 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	415 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	416 case class_scalar:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	417 switch (rep->idx_class ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	418 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	419 case class_scalar:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	420 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	421 // (i,j) reduces to a single index.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	422 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	423 idx_scalar_rep * rj = dynamic_cast<idx_scalar_rep *> (j.rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	424 octave_idx_type k = r->get_data () + n * rj->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	425 *this = new idx_scalar_rep (k, DIRECT);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	426 reduced = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	427 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	428 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	429 case class_range:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	430 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	431 // (i:d:j,k) reduces to a range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	432 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	433 idx_scalar_rep * rj = dynamic_cast<idx_scalar_rep *> (j.rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	434 octave_idx_type s = r->get_start (), l = r->length (nj);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	435 octave_idx_type t = r->get_step ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	436 octave_idx_type k = rj->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	437 this = new idx_range_rep (n k + s, l, t, DIRECT);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	438 reduced = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	439 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	440 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	441 case class_colon:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	442 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	443 // (:,k) reduces to a range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	444 idx_scalar_rep * rj = dynamic_cast<idx_scalar_rep *> (j.rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	445 octave_idx_type k = rj->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	446 this = new idx_range_rep (n k, n, 1, DIRECT);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	447 reduced = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	448 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	449 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	450 default:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	451 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	452 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	453 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	454 default:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	455 break;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	456 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	457
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	458 return reduced;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	459 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	460
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	461 bool idx_vector::is_cont_range (octave_idx_type n,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	462 octave_idx_type& l, octave_idx_type& u) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	463 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	464 bool res = false;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	465 switch (rep->idx_class ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	466 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	467 case class_colon:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	468 l = 0; u = n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	469 res = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	470 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	471 case class_range:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	472 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	473 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	474 if (r->get_step () == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	475 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	476 l = r->get_start ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	477 u = l + r->length (n);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	478 res = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	479 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	480 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	481 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	482 case class_scalar:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	483 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	484 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	485 l = r->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	486 u = l + 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	487 res = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	488 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	489 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	490 default:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	491 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	492 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	493
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	494 return res;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	495 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	496
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	497 idx_vector
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	498 idx_vector::complement (octave_idx_type n) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	499 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	500
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	501 bool *left = new bool[n];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	502
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	503 std::fill (left, left + n, true);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	504
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	505 octave_idx_type cnt = n;
3680 b8b0f5ff28e2 [project @ 2000-06-08 20:06:17 by jwe] jwe parents: 3504 diff changeset	506
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	507 for (octave_idx_type i = 0, len = length (); i < len; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	508 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	509 octave_idx_type k = xelem (i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	510 if (k < n && left[k])
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	511 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	512 left[k] = false;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	513 cnt--;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	514 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	515 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	516
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	517 octave_idx_type len = cnt, *data = new octave_idx_type[len];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	518 for (octave_idx_type i = 0, j = 0; i < n; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	519 if (left[i]) data[j++] = i;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	520
8301 f7d44b6a74df fix out-of-bounds checks in null assignments Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	521 return new idx_vector_rep (data, len,
f7d44b6a74df fix out-of-bounds checks in null assignments Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	522 len ? data[len-1]+1 : 0,
f7d44b6a74df fix out-of-bounds checks in null assignments Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	523 dim_vector (1, len), DIRECT);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	524 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	525
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	526 octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	527 idx_vector::freeze (octave_idx_type z_len, const char *tag, bool resize_ok)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	528 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	529 if (! resize_ok && extent (z_len) > z_len)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	530 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	531 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	532 ("invalid matrix index = %d", extent (z_len));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	533 rep->err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	534 chkerr ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	535 }
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	536
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	537 return length (z_len);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	538 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	539
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	540 octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	541 idx_vector::ones_count () const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	542 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	543 octave_idx_type n = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	544 if (is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	545 n = 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	546 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	547 for (octave_idx_type i = 0; i < length (1); i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	548 if (xelem (i) == 0) n++;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	549 return n;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	550 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	551
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	552 // Instantiate the octave_int constructors we want.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	553 #define INSTANTIATE_SCALAR_VECTOR_REP_CONST(T) \
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	554 template idx_vector::idx_scalar_rep::idx_scalar_rep (T); \
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	555 template idx_vector::idx_vector_rep::idx_vector_rep (const Array<T>&);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	556
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	557 INSTANTIATE_SCALAR_VECTOR_REP_CONST (float)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	558 INSTANTIATE_SCALAR_VECTOR_REP_CONST (double)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	559 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int8)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	560 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int16)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	561 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int32)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	562 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int64)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	563 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint8)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	564 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint16)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	565 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint32)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	566 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint64)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	567
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	568 /*
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	569 ;;; Local Variables: ***
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	570 ;;; mode: C++ ***
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	571 ;;; End: ***
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	572 */

Mercurial > octave-nkf

annotate liboctave/idx-vector.cc @ 8301:f7d44b6a74df