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

annotate liboctave/idx-vector.cc @ 9894:83bd7f34f9da

improve idx_vector->octave_value conversion

author	Jaroslav Hajek <highegg@gmail.com>
date	Tue, 01 Dec 2009 10:41:52 +0100
parents	034677ab6865
children	b7915ebe8acf

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
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8680 diff changeset	3 Copyright (C) 2008, 2009 Jaroslav Hajek
7017 a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	4 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	5 2003, 2004, 2005, 2006, 2007 John W. Eaton
9601 a9b37bae1802 add a couple of missing copyright statements Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	6 Copyright (C) 2009 VZLU Prague
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	7
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	8 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	9
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	10 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	11 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	12 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	13 option) any later version.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	14
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	15 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	16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	17 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	18 for more details.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	19
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	20 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	21 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	22 <http://www.gnu.org/licenses/>.
1 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 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	25
240 a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 227 diff changeset	26 #ifdef HAVE_CONFIG_H
1192 b6360f2d4fa6 [project @ 1995-03-30 21:38:35 by jwe] jwe parents: 1135 diff changeset	27 #include <config.h>
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	28 #endif
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	29
1343 94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1321 diff changeset	30 #include <cstdlib>
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1321 diff changeset	31
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3472 diff changeset	32 #include <iostream>
164 e2c950dd96d2 [project @ 1993-10-18 19:32:00 by jwe] jwe parents: 1 diff changeset	33
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	34 #include "idx-vector.h"
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	35 #include "Array.h"
8384 a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	36 #include "Sparse.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1343 diff changeset	37 #include "Range.h"
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1343 diff changeset	38
8379 ad8ed668e0a4 allow initialized local buffers Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	39 #include "oct-locbuf.h"
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	40 #include "lo-error.h"
2500 e39839e18edc [project @ 1996-11-12 17:13:53 by jwe] jwe parents: 2386 diff changeset	41 #include "lo-mappers.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	42
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	43 static void
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	44 gripe_invalid_index (void)
8290 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 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	47 ("subscript indices must be either positive integers or logicals.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	48 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	49
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	50 static void
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	51 gripe_invalid_range (void)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	52 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	53 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	54 ("invalid range used as index.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	55 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	56
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	57 static void
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	58 gripe_index_out_of_range (void)
8290 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 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	61 ("internal error: idx_vector index out of range.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	62 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	63
8680 a2bcd96b9344 use allocators for idx_vector_rep subclasses Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	64 DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_colon_rep);
a2bcd96b9344 use allocators for idx_vector_rep subclasses Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	65
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	66 idx_vector::idx_colon_rep::idx_colon_rep (char c)
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 if (c != ':')
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	69 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	70 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	71 ("internal error: invalid character converted to idx_vector. Must be ':'.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	72 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	73 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	74 }
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 octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	77 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	78 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	79 if (i < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	80 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	81 gripe_index_out_of_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	82 return 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	83 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	84 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	85 return i;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	86 }
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	87
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	88 std::ostream&
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	89 idx_vector::idx_colon_rep::print (std::ostream& os) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	90 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	91 return os << ":";
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	92 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	93
8680 a2bcd96b9344 use allocators for idx_vector_rep subclasses Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	94 DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_range_rep);
a2bcd96b9344 use allocators for idx_vector_rep subclasses Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	95
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	96 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	97 octave_idx_type _step)
9757 95ad9c2a27e2 fix idx_vector construction checks Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	98 : start(_start), len (_step ? std::max((_limit - _start) / _step, 0) : -1), step (_step)
8290 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 if (len < 0)
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 gripe_invalid_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	103 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	104 }
9757 95ad9c2a27e2 fix idx_vector construction checks Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	105 else if (start < 0 \|\| (step < 0 && start + (len-1)*step < 0))
8290 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 gripe_invalid_index ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	108 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	109 }
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
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	112 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	113 : start (0), len (r.nelem ()), step (1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	114 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	115 if (len < 0)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	116 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	117 gripe_invalid_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	118 err = true;
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 else if (len > 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	121 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	122 if (r.all_elements_are_ints ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	123 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	124 start = static_cast<octave_idx_type> (r.base ()) - 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	125 step = static_cast<octave_idx_type> (r.inc ());
9124 47f19c11b558 fix checking valid range subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9045 diff changeset	126 if (start < 0 \|\| (step < 0 && start + (len-1)*step < 0))
47f19c11b558 fix checking valid range subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9045 diff changeset	127 {
47f19c11b558 fix checking valid range subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9045 diff changeset	128 gripe_invalid_index ();
47f19c11b558 fix checking valid range subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9045 diff changeset	129 err = true;
47f19c11b558 fix checking valid range subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9045 diff changeset	130 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	131 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	132 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	133 {
9124 47f19c11b558 fix checking valid range subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9045 diff changeset	134 gripe_invalid_index ();
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	135 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	136 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	137 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	138 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	139
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5108 diff changeset	140 octave_idx_type
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	141 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	142 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	143 if (i < 0 \|\| i >= len)
4732 b484cdca27be [project @ 2004-02-04 04:32:48 by jwe] jwe parents: 4653 diff changeset	144 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	145 gripe_index_out_of_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	146 return 0;
4732 b484cdca27be [project @ 2004-02-04 04:32:48 by jwe] jwe parents: 4653 diff changeset	147 }
b484cdca27be [project @ 2004-02-04 04:32:48 by jwe] jwe parents: 4653 diff changeset	148 else
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	149 return start + i*step;
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	150 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	151
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	152 idx_vector::idx_base_rep *
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	153 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	154 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	155 if (step < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	156 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	157 else
2500 e39839e18edc [project @ 1996-11-12 17:13:53 by jwe] jwe parents: 2386 diff changeset	158 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	159 count++;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	160 return this;
2500 e39839e18edc [project @ 1996-11-12 17:13:53 by jwe] jwe parents: 2386 diff changeset	161 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	162 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	163
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	164 std::ostream&
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	165 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	166 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	167 os << start << ':' << step << ':' << start + len*step;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	168 return os;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	169 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	170
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	171 Range
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	172 idx_vector::idx_range_rep::unconvert (void) const
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	173 {
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	174 return Range (static_cast<double> (start+1),
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	175 static_cast<double> (step), len);
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	176 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	177
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	178 inline octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	179 convert_index (octave_idx_type i, bool& conv_error,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	180 octave_idx_type& ext)
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	181 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	182 if (i <= 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	183 conv_error = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	184 if (ext < i) ext = i;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	185 return i - 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	186 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	187
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	188 inline octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	189 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	190 {
9007 7e31df9a0334 simplify double->int conversion in indexing Jaroslav Hajek <highegg@gmail.com> parents: 8972 diff changeset	191 octave_idx_type i = static_cast<octave_idx_type> (x);
7e31df9a0334 simplify double->int conversion in indexing Jaroslav Hajek <highegg@gmail.com> parents: 8972 diff changeset	192 if (static_cast<double> (i) != x)
7e31df9a0334 simplify double->int conversion in indexing Jaroslav Hajek <highegg@gmail.com> parents: 8972 diff changeset	193 conv_error = true;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	194
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	195 return convert_index (i, conv_error, ext);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	196 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	197
8290 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 (float x, bool& conv_error, octave_idx_type& ext)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	200 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	201 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	202 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	203
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	204 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	205 inline octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	206 convert_index (octave_int<T> x, bool& conv_error,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	207 octave_idx_type& ext)
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 i = octave_int<octave_idx_type> (x).value ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	210 return convert_index (i, conv_error, ext);
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	211 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	212
8680 a2bcd96b9344 use allocators for idx_vector_rep subclasses Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	213 DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_scalar_rep);
a2bcd96b9344 use allocators for idx_vector_rep subclasses Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	214
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	215 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	216 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	217 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	218 octave_idx_type dummy;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	219 data = convert_index (x, err, dummy);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	220 if (err) gripe_invalid_index ();
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	221 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	222
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	223 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	224 : data (i)
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	225 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	226 if (data < 0)
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	227 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	228 gripe_invalid_index ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	229 err = true;
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	230 }
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	231 }
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	232
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	233 octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	234 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	235 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	236 if (i != 0) gripe_index_out_of_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	237 return data;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	238 }
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 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	241 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	242 return os << data;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	243 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	244
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	245 double
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	246 idx_vector::idx_scalar_rep::unconvert (void) const
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	247 {
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	248 return data + 1;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	249 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	250
8680 a2bcd96b9344 use allocators for idx_vector_rep subclasses Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	251 DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_vector_rep);
a2bcd96b9344 use allocators for idx_vector_rep subclasses Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	252
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	253 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	254 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	255 : 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	256 {
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 *d = new octave_idx_type[len];
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 d[i] = convert_index (nda.xelem (i), err, ext);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	262 data = d;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	263
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	264 if (err) gripe_invalid_index ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	265 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	266 }
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 // 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	269
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	270 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	271 : data (inda.data ()), len (inda.numel ()), ext (0),
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	272 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	273 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	274 if (len != 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	275 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	276 octave_idx_type max = -1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	277 for (octave_idx_type i = 0; i < len; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	278 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	279 octave_idx_type k = inda.xelem (i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	280 if (k < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	281 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	282 else if (k > max)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	283 max = k;
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 ext = max + 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	287
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	288 if (err) gripe_invalid_index ();
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 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	291
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	292 idx_vector::idx_vector_rep::idx_vector_rep (bool b)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	293 : 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	294 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	295 if (len != 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	296 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	297 octave_idx_type *d = new octave_idx_type [1];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	298 d[0] = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	299 data = d;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	300 ext = 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	301 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	302 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	303
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	304 idx_vector::idx_vector_rep::idx_vector_rep (const Array<bool>& bnda,
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	305 octave_idx_type nnz)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	306 : data (0), len (nnz), ext (0), aowner (0), orig_dims ()
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	307 {
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	308 if (nnz < 0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	309 len = bnda.nnz ();
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	310
9045 ac0a23e9f5c5 more compatible indexing by logical empty matrices Jaroslav Hajek <highegg@gmail.com> parents: 9007 diff changeset	311 const dim_vector dv = bnda.dims ();
7774 ce52af0e4a10 all false logical indexing fix David Bateman <dbateman@free.fr> parents: 7727 diff changeset	312
9045 ac0a23e9f5c5 more compatible indexing by logical empty matrices Jaroslav Hajek <highegg@gmail.com> parents: 9007 diff changeset	313 if (! dv.all_zero ())
ac0a23e9f5c5 more compatible indexing by logical empty matrices Jaroslav Hajek <highegg@gmail.com> parents: 9007 diff changeset	314 orig_dims = ((dv.length () == 2 && dv(0) == 1)
ac0a23e9f5c5 more compatible indexing by logical empty matrices Jaroslav Hajek <highegg@gmail.com> parents: 9007 diff changeset	315 ? dim_vector (1, len) : dim_vector (len, 1));
7774 ce52af0e4a10 all false logical indexing fix David Bateman <dbateman@free.fr> parents: 7727 diff changeset	316
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	317 if (len != 0)
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	318 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	319 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	320
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	321 octave_idx_type ntot = bnda.length ();
85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	322
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	323 octave_idx_type k = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	324 for (octave_idx_type i = 0; i < ntot; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	325 if (bnda.xelem (i)) d[k++] = i;
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	326
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	327 data = d;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	328
8384 a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	329 ext = d[k-1] + 1;
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	330 }
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	331 }
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	332
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	333 idx_vector::idx_vector_rep::idx_vector_rep (const Sparse<bool>& bnda)
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	334 : data (0), len (0), ext (0), aowner (0), orig_dims ()
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	335 {
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	336 for (octave_idx_type i = 0, l = bnda.nnz (); i < l; i++)
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	337 if (bnda.data (i)) len++;
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	338
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	339 dim_vector dv = bnda.dims ();
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	340
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	341 orig_dims = ((dv.length () == 2 && dv(0) == 1)
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	342 ? dim_vector (1, len) : orig_dims = dim_vector (len, 1));
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	343
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	344 if (len != 0)
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	345 {
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	346 octave_idx_type *d = new octave_idx_type [len];
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	347
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	348 octave_idx_type nnz = bnda.nnz ();
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	349
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	350 octave_idx_type k = 0;
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	351 // FIXME: I hope this is OK, i.e. the element iterated this way are correctly ordered.
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	352 for (octave_idx_type i = 0; i < nnz; i++)
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	353 {
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	354 if (bnda.data (i))
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	355 d[k++] = bnda.cidx (i) + bnda.rows () * bnda.ridx (i);
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	356 }
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	357
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	358 data = d;
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	359
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	360 ext = d[k-1] + 1;
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	361 }
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	362 }
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	363
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	364 idx_vector::idx_vector_rep::~idx_vector_rep (void)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	365 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	366 if (aowner)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	367 delete aowner;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	368 else
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	369 delete [] data;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	370 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	371
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5108 diff changeset	372 octave_idx_type
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	373 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	374 {
1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	375 if (n < 0 \|\| n >= len)
1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	376 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	377 gripe_invalid_index ();
227 1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	378 return 0;
1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	379 }
1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	380
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	381 return xelem (n);
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	382 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	383
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	384 idx_vector::idx_base_rep *
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	385 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	386 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	387 octave_idx_type *new_data = new octave_idx_type[len];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	388 std::copy (data, data + len, new_data);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	389 std::sort (new_data, new_data + len);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	390 octave_idx_type new_len;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	391 if (uniq)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	392 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	393 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	394 new_len = len;
2966 458cea5c8356 [project @ 1997-05-12 20:17:35 by jwe] jwe parents: 2847 diff changeset	395
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	396 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	397 }
5869adaa6aea [project @ 1993-11-12 10:44:40 by jwe] jwe parents: 191 diff changeset	398
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	399 std::ostream&
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	400 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	401 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	402 os << '[';
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	403 for (octave_idx_type ii = 0; ii < len - 1; ii++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	404 os << data[ii] << ',' << ' ';
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	405 if (len > 0) os << data[len-1]; os << ']';
7425 fe4a43e1d1d3 [project @ 2008-01-28 09:13:01 by jwe] jwe parents: 7422 diff changeset	406
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	407 return os;
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	408 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	409
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	410 Array<double>
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	411 idx_vector::idx_vector_rep::unconvert (void) const
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	412 {
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	413 Array<double> retval (orig_dims);
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	414 for (octave_idx_type i = 0; i < len; i++)
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	415 retval.xelem (i) = data[i] + 1;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	416 return retval;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	417 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	418
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	419 DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_mask_rep);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	420
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	421 idx_vector::idx_mask_rep::idx_mask_rep (bool b)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	422 : data (0), len (b ? 1 : 0), ext (0), lsti (-1), lste (-1),
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	423 aowner (0), orig_dims (len, len)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	424 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	425 if (len != 0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	426 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	427 bool *d = new bool [1];
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	428 d[0] = true;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	429 data = d;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	430 ext = 1;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	431 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	432 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	433
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	434 idx_vector::idx_mask_rep::idx_mask_rep (const Array<bool>& bnda,
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	435 octave_idx_type nnz)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	436 : data (0), len (nnz), ext (bnda.numel ()), lsti (-1), lste (-1),
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	437 aowner (0), orig_dims ()
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	438 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	439 if (nnz < 0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	440 len = bnda.nnz ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	441
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	442 // We truncate the extent as much as possible. For Matlab
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	443 // compatibility, but maybe it's not a bad idea anyway.
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	444 while (ext > 0 && ! bnda(ext-1))
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	445 ext--;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	446
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	447 const dim_vector dv = bnda.dims ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	448
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	449 if (! dv.all_zero ())
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	450 orig_dims = ((dv.length () == 2 && dv(0) == 1)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	451 ? dim_vector (1, len) : dim_vector (len, 1));
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	452
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	453 aowner = new Array<bool> (bnda);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	454 data = bnda.data ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	455 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	456
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	457 idx_vector::idx_mask_rep::~idx_mask_rep (void)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	458 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	459 if (aowner)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	460 delete aowner;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	461 else
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	462 delete [] data;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	463 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	464
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	465 octave_idx_type
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	466 idx_vector::idx_mask_rep::xelem (octave_idx_type n) const
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	467 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	468 if (n == lsti + 1)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	469 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	470 lsti = n;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	471 while (! data[++lste]) ;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	472 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	473 else
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	474 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	475 lsti = n++;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	476 lste = -1;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	477 while (n > 0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	478 if (data[++lste]) --n;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	479 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	480 return lste;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	481 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	482
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	483 octave_idx_type
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	484 idx_vector::idx_mask_rep::checkelem (octave_idx_type n) const
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	485 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	486 if (n < 0 \|\| n >= len)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	487 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	488 gripe_invalid_index ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	489 return 0;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	490 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	491
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	492 return xelem (n);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	493 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	494
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	495 std::ostream&
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	496 idx_vector::idx_mask_rep::print (std::ostream& os) const
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	497 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	498 os << '[';
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	499 for (octave_idx_type ii = 0; ii < ext - 1; ii++)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	500 os << data[ii] << ',' << ' ';
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	501 if (ext > 0) os << data[ext-1]; os << ']';
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	502
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	503 return os;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	504 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	505
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	506 Array<bool>
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	507 idx_vector::idx_mask_rep::unconvert (void) const
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	508 {
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	509 if (aowner)
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	510 return *aowner;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	511 else
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	512 {
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	513 Array<bool> retval (orig_dims);
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	514 for (octave_idx_type i = 0; i < len; i++)
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	515 retval.xelem (i) = data[i];
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	516 return retval;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	517 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	518 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	519
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	520 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	521
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	522 idx_vector::idx_vector (const Array<bool>& bnda)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	523 : rep (0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	524 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	525 // Convert only if it means saving at least half the memory.
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	526 static const int factor = (2 * sizeof (octave_idx_type));
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	527 octave_idx_type nnz = bnda.nnz ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	528 if (nnz <= bnda.numel () / factor)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	529 rep = new idx_vector_rep (bnda, nnz);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	530 else
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	531 rep = new idx_mask_rep (bnda, nnz);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	532 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	533
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	534 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	535 octave_idx_type nj)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	536 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	537 bool reduced = false;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	538
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	539 // Empty index always reduces.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	540 if (rep->length (n) == 0)
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	541 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	542 *this = idx_vector ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	543 return true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	544 }
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	545
8972 5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	546 // Possibly skip singleton dims.
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	547 if (n == 1 && rep->is_colon_equiv (n))
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	548 {
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	549 *this = j;
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	550 return true;
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	551 }
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	552
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	553 if (nj == 1 && j.is_colon_equiv (nj))
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	554 return true;
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	555
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	556 switch (j.idx_class ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	557 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	558 case class_colon:
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	559 switch (rep->idx_class ())
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	560 {
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	561 case class_colon:
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	562 // (:,:) reduces to (:)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	563 reduced = true;
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	564 break;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	565 case class_scalar:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	566 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	567 // (i,:) reduces to a range.
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	568 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	569 octave_idx_type k = r->get_data ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	570 *this = new idx_range_rep (k, nj, n, DIRECT);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	571 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	572 break;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	573 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	574 case class_range:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	575 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	576 // (i:k:end,:) reduces to a range if i <= k and k divides n.
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	577 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	578 octave_idx_type s = r->get_start (), l = r->length (n);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	579 octave_idx_type t = r->get_step ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	580 if (l*t == n)
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	581 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	582 this = new idx_range_rep (s, l nj, t, DIRECT);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	583 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	584 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	585 break;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	586 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	587 default:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	588 break;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	589 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	590 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	591 case class_range:
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	592 switch (rep->idx_class ())
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	593 {
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	594 case class_colon:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	595 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	596 // (:,i:j) reduces to a range (the step must be 1)
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	597 idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	598 if (rj->get_step () == 1)
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	599 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	600 octave_idx_type sj = rj->get_start (), lj = rj->length (nj);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	601 this = new idx_range_rep (sj n, lj * n, 1, DIRECT);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	602 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	603 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	604 break;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	605 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	606 case class_scalar:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	607 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	608 // (k,i:d:j) reduces to a range.
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	609 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	610 idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	611 octave_idx_type k = r->get_data ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	612 octave_idx_type sj = rj->get_start (), lj = rj->length (nj);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	613 octave_idx_type tj = rj->get_step ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	614 this = new idx_range_rep (n sj + k, lj, n * tj, DIRECT);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	615 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	616 break;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	617 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	618 case class_range:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	619 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	620 // (i:k:end,p:q) reduces to a range if i <= k and k divides n.
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	621 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	622 octave_idx_type s = r->get_start (), l = r->length (n);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	623 octave_idx_type t = r->get_step ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	624 idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	625 octave_idx_type sj = rj->get_start (), lj = rj->length (nj);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	626 octave_idx_type tj = rj->get_step ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	627 if (l*t == n && tj == 1)
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	628 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	629 this = new idx_range_rep (s + n sj, l * lj, t, DIRECT);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	630 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	631 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	632 break;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	633 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	634 default:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	635 break;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	636 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	637 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	638 case class_scalar:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	639 switch (rep->idx_class ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	640 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	641 case class_scalar:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	642 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	643 // (i,j) reduces to a single index.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	644 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	645 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	646 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	647 *this = new idx_scalar_rep (k, DIRECT);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	648 reduced = true;
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	649 break;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	650 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	651 case class_range:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	652 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	653 // (i:d:j,k) reduces to a range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	654 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	655 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	656 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	657 octave_idx_type t = r->get_step ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	658 octave_idx_type k = rj->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	659 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	660 reduced = true;
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	661 break;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	662 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	663 case class_colon:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	664 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	665 // (:,k) reduces to a range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	666 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	667 octave_idx_type k = rj->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	668 this = new idx_range_rep (n k, n, 1, DIRECT);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	669 reduced = true;
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	670 break;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	671 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	672 default:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	673 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	674 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	675 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	676 default:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	677 break;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	678 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	679
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	680 return reduced;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	681 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	682
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	683 bool
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	684 idx_vector::is_cont_range (octave_idx_type n,
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	685 octave_idx_type& l, octave_idx_type& u) const
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	686 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	687 bool res = false;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	688 switch (rep->idx_class ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	689 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	690 case class_colon:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	691 l = 0; u = n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	692 res = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	693 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	694 case class_range:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	695 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	696 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	697 if (r->get_step () == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	698 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	699 l = r->get_start ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	700 u = l + r->length (n);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	701 res = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	702 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	703 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	704 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	705 case class_scalar:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	706 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	707 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	708 l = r->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	709 u = l + 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	710 res = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	711 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	712 break;
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	713 case class_mask:
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	714 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	715 idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	716 octave_idx_type ext = r->extent (0), len = r->length (0);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	717 if (ext == len)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	718 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	719 l = 0;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	720 u = len;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	721 res = true;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	722 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	723 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	724 default:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	725 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	726 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	727
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	728 return res;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	729 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	730
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	731 octave_idx_type
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	732 idx_vector::increment (void) const
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	733 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	734 octave_idx_type retval = 0;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	735 switch (rep->idx_class ())
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	736 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	737 case class_colon:
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	738 retval = 1;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	739 case class_range:
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	740 retval = dynamic_cast<idx_range_rep *> (rep) -> get_step ();
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	741 break;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	742 case class_vector:
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	743 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	744 if (length (0) > 1)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	745 retval = elem (1) - elem (0);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	746 }
9757 95ad9c2a27e2 fix idx_vector construction checks Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	747 default:
95ad9c2a27e2 fix idx_vector construction checks Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	748 break;
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	749 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	750 return retval;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	751 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	752
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	753 void
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	754 idx_vector::copy_data (octave_idx_type *data) const
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	755 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	756 octave_idx_type len = rep->length (0);
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	757
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	758 switch (rep->idx_class ())
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	759 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	760 case class_colon:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	761 current_liboctave_error_handler ("colon not allowed");
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	762 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	763 case class_range:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	764 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	765 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	766 octave_idx_type start = r->get_start (), step = r->get_step ();
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	767 octave_idx_type i, j;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	768 if (step == 1)
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	769 for (i = start, j = start + len; i < j; i++) *data++ = i;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	770 else if (step == -1)
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	771 for (i = start, j = start - len; i > j; i--) *data++ = i;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	772 else
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	773 for (i = 0, j = start; i < len; i++, j += step) *data++ = j;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	774 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	775 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	776 case class_scalar:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	777 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	778 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	779 *data = r->get_data ();
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	780 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	781 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	782 case class_vector:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	783 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	784 idx_vector_rep * r = dynamic_cast<idx_vector_rep *> (rep);
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	785 const octave_idx_type *rdata = r->get_data ();
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	786 copy_or_memcpy (len, rdata, data);
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	787 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	788 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	789 default:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	790 assert (false);
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	791 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	792 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	793
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	794 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	795
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	796 idx_vector
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	797 idx_vector::complement (octave_idx_type n) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	798 {
8379 ad8ed668e0a4 allow initialized local buffers Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	799 OCTAVE_LOCAL_BUFFER_INIT (bool, left, n, true);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	800
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	801 octave_idx_type cnt = n;
3680 b8b0f5ff28e2 [project @ 2000-06-08 20:06:17 by jwe] jwe parents: 3504 diff changeset	802
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	803 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	804 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	805 octave_idx_type k = xelem (i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	806 if (k < n && left[k])
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	807 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	808 left[k] = false;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	809 cnt--;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	810 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	811 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	812
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	813 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	814 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	815 if (left[i]) data[j++] = i;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	816
8301 f7d44b6a74df fix out-of-bounds checks in null assignments Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	817 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	818 len ? data[len-1]+1 : 0,
f7d44b6a74df fix out-of-bounds checks in null assignments Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	819 dim_vector (1, len), DIRECT);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	820 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	821
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	822 bool
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	823 idx_vector::is_permutation (octave_idx_type n) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	824 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	825 bool retval = false;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	826
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	827 if (is_colon_equiv (n))
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	828 retval = true;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	829 else if (length (n) == n && extent(n) == n)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	830 {
8379 ad8ed668e0a4 allow initialized local buffers Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	831 OCTAVE_LOCAL_BUFFER_INIT (bool, left, n, true);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	832
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	833 retval = true;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	834
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	835 for (octave_idx_type i = 0, len = length (); i < len; i++)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	836 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	837 octave_idx_type k = xelem (i);
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	838 if (left[k])
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	839 left[k] = false;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	840 else
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	841 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	842 retval = false;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	843 break;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	844 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	845 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	846
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	847 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	848
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	849 return retval;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	850 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	851
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	852 idx_vector
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	853 idx_vector::unmask (void) const
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	854 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	855 if (idx_class () == class_mask)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	856 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	857 idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	858 const bool *data = r->get_data ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	859 octave_idx_type ext = r->extent (0), len = r->length (0);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	860 octave_idx_type *idata = new octave_idx_type [len];
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	861 for (octave_idx_type i = 0, j = 0; i < ext; i++)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	862 if (data[i])
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	863 idata[j++] = i;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	864 ext = len > 0 ? idata[len - 1] : 0;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	865 return new idx_vector_rep (idata, len, ext, r->orig_dimensions (), DIRECT);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	866 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	867 else
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	868 return *this;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	869 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	870
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	871 void idx_vector::unconvert (idx_class_type& iclass,
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	872 double& scalar, Range& range,
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	873 Array<double>& array, Array<bool>& mask) const
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	874 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	875 iclass = idx_class ();
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	876 switch (iclass)
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	877 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	878 case class_colon:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	879 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	880 case class_range:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	881 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	882 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	883 range = r->unconvert ();
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	884 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	885 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	886 case class_scalar:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	887 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	888 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	889 scalar = r->unconvert ();
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	890 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	891 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	892 case class_vector:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	893 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	894 idx_vector_rep * r = dynamic_cast<idx_vector_rep *> (rep);
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	895 array = r->unconvert ();
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	896 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	897 break;
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	898 case class_mask:
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	899 {
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	900 idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep);
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	901 mask = r->unconvert ();
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	902 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	903 break;
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	904 default:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	905 assert (false);
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	906 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	907 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	908 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	909
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	910 octave_idx_type
8677 095ae5e0a831 eliminte some compiler warnings John W. Eaton <jwe@octave.org> parents: 8384 diff changeset	911 idx_vector::freeze (octave_idx_type z_len, const char *, bool resize_ok)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	912 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	913 if (! resize_ok && extent (z_len) > z_len)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	914 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	915 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	916 ("invalid matrix index = %d", extent (z_len));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	917 rep->err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	918 chkerr ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	919 }
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	920
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	921 return length (z_len);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	922 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	923
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	924 octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	925 idx_vector::ones_count () const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	926 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	927 octave_idx_type n = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	928 if (is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	929 n = 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	930 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	931 for (octave_idx_type i = 0; i < length (1); i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	932 if (xelem (i) == 0) n++;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	933 return n;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	934 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	935
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	936 // Instantiate the octave_int constructors we want.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	937 #define INSTANTIATE_SCALAR_VECTOR_REP_CONST(T) \
8319 c374691576f6 Fix for MSVC compilation Michael Goffioul <michael.goffioul@gmail.com> parents: 8301 diff changeset	938 template OCTAVE_API idx_vector::idx_scalar_rep::idx_scalar_rep (T); \
c374691576f6 Fix for MSVC compilation Michael Goffioul <michael.goffioul@gmail.com> parents: 8301 diff changeset	939 template OCTAVE_API idx_vector::idx_vector_rep::idx_vector_rep (const Array<T>&);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	940
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	941 INSTANTIATE_SCALAR_VECTOR_REP_CONST (float)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	942 INSTANTIATE_SCALAR_VECTOR_REP_CONST (double)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	943 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int8)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	944 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int16)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	945 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int32)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	946 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int64)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	947 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint8)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	948 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint16)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	949 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint32)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	950 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint64)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	951
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	952 /*
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	953 ;;; Local Variables: ***
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	954 ;;; mode: C++ ***
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	955 ;;; End: ***
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	956 */

Mercurial > hg > octave-nkf

annotate liboctave/idx-vector.cc @ 9894:83bd7f34f9da