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

annotate liboctave/idx-vector.cc @ 10339:de2d43bcb083

optimize some lazy index operations

author	Jaroslav Hajek <highegg@gmail.com>
date	Fri, 19 Feb 2010 11:47:47 +0100
parents	07ebe522dac2
children	9c4daf174387

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
10277 703038d648f1 update some copyright notices Jaroslav Hajek <highegg@gmail.com> parents: 10273 diff changeset	6 Copyright (C) 2009, 2010 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>
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	31 #include <memory>
1343 94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1321 diff changeset	32
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3472 diff changeset	33 #include <iostream>
164 e2c950dd96d2 [project @ 1993-10-18 19:32:00 by jwe] jwe parents: 1 diff changeset	34
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	35 #include "idx-vector.h"
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	36 #include "Array.h"
8384 a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	37 #include "Sparse.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1343 diff changeset	38 #include "Range.h"
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1343 diff changeset	39
8379 ad8ed668e0a4 allow initialized local buffers Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	40 #include "oct-locbuf.h"
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	41 #include "lo-error.h"
2500 e39839e18edc [project @ 1996-11-12 17:13:53 by jwe] jwe parents: 2386 diff changeset	42 #include "lo-mappers.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	43
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	44 static void
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	45 gripe_invalid_index (void)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	46 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	47 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	48 ("subscript indices must be either positive integers or logicals.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	49 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	50
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	51 static void
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	52 gripe_invalid_range (void)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	53 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	54 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	55 ("invalid range used as index.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	56 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	57
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	58 static void
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	59 gripe_index_out_of_range (void)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	60 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	61 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	62 ("internal error: idx_vector index out of range.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	63 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	64
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	65 Array<octave_idx_type>
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	66 idx_vector::idx_base_rep::as_array (void)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	67 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	68 (*current_liboctave_error_handler)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	69 ("internal error: as_array not allowed for this index class.");
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	70
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	71 return Array<octave_idx_type> ();
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	72 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	73
8680 a2bcd96b9344 use allocators for idx_vector_rep subclasses Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	74 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	75
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	76 idx_vector::idx_colon_rep::idx_colon_rep (char c)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	77 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	78 if (c != ':')
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	79 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	80 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	81 ("internal error: invalid character converted to idx_vector. Must be ':'.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	82 err = true;
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 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	85
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	86 octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	87 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	88 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	89 if (i < 0)
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 gripe_index_out_of_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	92 return 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	93 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	94 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	95 return i;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	96 }
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	97
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	98 idx_vector::idx_base_rep *
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	99 idx_vector::idx_colon_rep::sort_idx (Array<octave_idx_type>&)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	100 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	101 (*current_liboctave_error_handler)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	102 ("internal error: idx_colon_rep::sort_idx");
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	103
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	104 count++;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	105 return this;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	106 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	107
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	108 std::ostream&
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	109 idx_vector::idx_colon_rep::print (std::ostream& os) const
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 return os << ":";
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	112 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	113
8680 a2bcd96b9344 use allocators for idx_vector_rep subclasses Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	114 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	115
10258 e317791645c4 64-bit fixes John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	116 idx_vector::idx_range_rep::idx_range_rep (octave_idx_type _start,
e317791645c4 64-bit fixes John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	117 octave_idx_type _limit,
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	118 octave_idx_type _step)
10258 e317791645c4 64-bit fixes John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	119 : start(_start), len (_step ? std::max((_limit - _start) / _step, static_cast<octave_idx_type> (0)) : -1), step (_step)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	120 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	121 if (len < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	122 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	123 gripe_invalid_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	124 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	125 }
9757 95ad9c2a27e2 fix idx_vector construction checks Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	126 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	127 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	128 gripe_invalid_index ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	129 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	130 }
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
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	133 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	134 : start (0), len (r.nelem ()), step (1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	135 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	136 if (len < 0)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	137 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	138 gripe_invalid_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	139 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	140 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	141 else if (len > 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	142 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	143 if (r.all_elements_are_ints ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	144 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	145 start = static_cast<octave_idx_type> (r.base ()) - 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	146 step = static_cast<octave_idx_type> (r.inc ());
9124 47f19c11b558 fix checking valid range subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9045 diff changeset	147 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	148 {
47f19c11b558 fix checking valid range subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9045 diff changeset	149 gripe_invalid_index ();
47f19c11b558 fix checking valid range subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9045 diff changeset	150 err = true;
47f19c11b558 fix checking valid range subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9045 diff changeset	151 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	152 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	153 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	154 {
9124 47f19c11b558 fix checking valid range subscripts Jaroslav Hajek <highegg@gmail.com> parents: 9045 diff changeset	155 gripe_invalid_index ();
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	156 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	157 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	158 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	159 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	160
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5108 diff changeset	161 octave_idx_type
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	162 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	163 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	164 if (i < 0 \|\| i >= len)
4732 b484cdca27be [project @ 2004-02-04 04:32:48 by jwe] jwe parents: 4653 diff changeset	165 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	166 gripe_index_out_of_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	167 return 0;
4732 b484cdca27be [project @ 2004-02-04 04:32:48 by jwe] jwe parents: 4653 diff changeset	168 }
b484cdca27be [project @ 2004-02-04 04:32:48 by jwe] jwe parents: 4653 diff changeset	169 else
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	170 return start + i*step;
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	171 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	172
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	173 idx_vector::idx_base_rep *
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	174 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	175 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	176 if (step < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	177 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	178 else
2500 e39839e18edc [project @ 1996-11-12 17:13:53 by jwe] jwe parents: 2386 diff changeset	179 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	180 count++;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	181 return this;
2500 e39839e18edc [project @ 1996-11-12 17:13:53 by jwe] jwe parents: 2386 diff changeset	182 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	183 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	184
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	185 idx_vector::idx_base_rep *
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	186 idx_vector::idx_range_rep::sort_idx (Array<octave_idx_type>& idx)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	187 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	188 if (step < 0 && len > 0)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	189 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	190 idx.clear (1, len);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	191 for (octave_idx_type i = 0; i < len; i++)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	192 idx.xelem (i) = len - 1 - i;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	193 return new idx_range_rep (start + (len - 1)*step, len, -step, DIRECT);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	194 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	195 else
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	196 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	197 idx.clear (1, len);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	198 for (octave_idx_type i = 0; i < len; i++)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	199 idx.xelem (i) = i;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	200 count++;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	201 return this;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	202 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	203 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	204
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	205 std::ostream&
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	206 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	207 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	208 os << start << ':' << step << ':' << start + len*step;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	209 return os;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	210 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	211
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	212 Range
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	213 idx_vector::idx_range_rep::unconvert (void) const
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	214 {
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	215 return Range (static_cast<double> (start+1),
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	216 static_cast<double> (step), len);
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	217 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	218
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	219 Array<octave_idx_type>
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	220 idx_vector::idx_range_rep::as_array (void)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	221 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	222 Array<octave_idx_type> retval (dim_vector (1, len));
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	223 for (octave_idx_type i = 0; i < len; i++)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	224 retval.xelem (i) = start + len*step;
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	225
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	226 return retval;
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	227 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	228
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	229 inline octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	230 convert_index (octave_idx_type i, bool& conv_error,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	231 octave_idx_type& ext)
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	232 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	233 if (i <= 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	234 conv_error = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	235 if (ext < i) ext = i;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	236 return i - 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	237 }
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 inline octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	240 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	241 {
9007 7e31df9a0334 simplify double->int conversion in indexing Jaroslav Hajek <highegg@gmail.com> parents: 8972 diff changeset	242 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	243 if (static_cast<double> (i) != x)
7e31df9a0334 simplify double->int conversion in indexing Jaroslav Hajek <highegg@gmail.com> parents: 8972 diff changeset	244 conv_error = true;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	245
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	246 return convert_index (i, conv_error, ext);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	247 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	248
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	249 inline octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	250 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	251 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	252 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	253 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	254
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	255 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	256 inline octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	257 convert_index (octave_int<T> x, bool& conv_error,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	258 octave_idx_type& ext)
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	259 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	260 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	261 return convert_index (i, conv_error, ext);
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	262 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	263
8680 a2bcd96b9344 use allocators for idx_vector_rep subclasses Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	264 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	265
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	266 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	267 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	268 {
10101 b51848e95e4b cleanups to avoid valgrind warnings John W. Eaton <jwe@octave.org> parents: 10042 diff changeset	269 octave_idx_type dummy = 0;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	270 data = convert_index (x, err, dummy);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	271 if (err) gripe_invalid_index ();
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	272 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	273
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	274 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	275 : data (i)
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	276 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	277 if (data < 0)
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	278 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	279 gripe_invalid_index ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	280 err = true;
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	281 }
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	282 }
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	283
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	284 octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	285 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	286 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	287 if (i != 0) gripe_index_out_of_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	288 return data;
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
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	291 idx_vector::idx_base_rep *
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	292 idx_vector::idx_scalar_rep::sort_idx (Array<octave_idx_type>& idx)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	293 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	294 idx.clear (1, 1);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	295 idx.fill (0);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	296 count++;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	297 return this;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	298 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	299
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	300 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	301 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	302 return os << data;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	303 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	304
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	305 double
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	306 idx_vector::idx_scalar_rep::unconvert (void) const
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	307 {
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	308 return data + 1;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	309 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	310
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	311 Array<octave_idx_type>
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	312 idx_vector::idx_scalar_rep::as_array (void)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	313 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	314 return Array<octave_idx_type> (dim_vector (1, 1), data);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	315 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	316
8680 a2bcd96b9344 use allocators for idx_vector_rep subclasses Jaroslav Hajek <highegg@gmail.com> parents: 8677 diff changeset	317 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	318
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	319 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	320 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	321 : 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	322 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	323 if (len != 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	324 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	325 octave_idx_type *d = new octave_idx_type[len];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	326 for (octave_idx_type i = 0; i < len; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	327 d[i] = convert_index (nda.xelem (i), err, ext);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	328 data = d;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	329
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	330 if (err) gripe_invalid_index ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	331 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	332 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	333
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	334 // 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	335
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	336 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	337 : data (inda.data ()), len (inda.numel ()), ext (0),
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	338 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	339 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	340 if (len != 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	341 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	342 octave_idx_type max = -1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	343 for (octave_idx_type i = 0; i < len; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	344 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	345 octave_idx_type k = inda.xelem (i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	346 if (k < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	347 err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	348 else if (k > max)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	349 max = k;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	350 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	351
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	352 ext = max + 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	353
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	354 if (err) gripe_invalid_index ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	355 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	356 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	357
10285 22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	358 idx_vector::idx_vector_rep::idx_vector_rep (const Array<octave_idx_type>& inda,
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	359 octave_idx_type _ext, direct)
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	360 : data (inda.data ()), len (inda.numel ()), ext (_ext),
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	361 aowner (new Array<octave_idx_type> (inda)), orig_dims (inda.dims ())
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	362 {
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	363 // No checking.
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	364 if (ext < 0)
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	365 {
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	366 octave_idx_type max = -1;
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	367 for (octave_idx_type i = 0; i < len; i++)
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	368 if (data[i] > max)
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	369 max = data[i];
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	370
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	371 ext = max + 1;
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	372 }
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	373 }
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	374
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	375 idx_vector::idx_vector_rep::idx_vector_rep (bool b)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	376 : 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	377 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	378 if (len != 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	379 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	380 octave_idx_type *d = new octave_idx_type [1];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	381 d[0] = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	382 data = d;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	383 ext = 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	384 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	385 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	386
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	387 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	388 octave_idx_type nnz)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	389 : 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	390 {
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	391 if (nnz < 0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	392 len = bnda.nnz ();
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	393
9045 ac0a23e9f5c5 more compatible indexing by logical empty matrices Jaroslav Hajek <highegg@gmail.com> parents: 9007 diff changeset	394 const dim_vector dv = bnda.dims ();
7774 ce52af0e4a10 all false logical indexing fix David Bateman <dbateman@free.fr> parents: 7727 diff changeset	395
9045 ac0a23e9f5c5 more compatible indexing by logical empty matrices Jaroslav Hajek <highegg@gmail.com> parents: 9007 diff changeset	396 if (! dv.all_zero ())
ac0a23e9f5c5 more compatible indexing by logical empty matrices Jaroslav Hajek <highegg@gmail.com> parents: 9007 diff changeset	397 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	398 ? dim_vector (1, len) : dim_vector (len, 1));
7774 ce52af0e4a10 all false logical indexing fix David Bateman <dbateman@free.fr> parents: 7727 diff changeset	399
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	400 if (len != 0)
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	401 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	402 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	403
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	404 octave_idx_type ntot = bnda.length ();
85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	405
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	406 octave_idx_type k = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	407 for (octave_idx_type i = 0; i < ntot; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10285 diff changeset	408 if (bnda.xelem (i)) d[k++] = i;
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	409
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	410 data = d;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	411
8384 a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	412 ext = d[k-1] + 1;
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	413 }
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	414 }
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	415
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	416 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	417 : data (0), len (0), ext (0), aowner (0), orig_dims ()
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	418 {
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	419 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	420 if (bnda.data (i)) len++;
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	421
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	422 dim_vector dv = bnda.dims ();
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	423
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	424 orig_dims = ((dv.length () == 2 && dv(0) == 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10285 diff changeset	425 ? dim_vector (1, len) : orig_dims = dim_vector (len, 1));
8384 a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	426
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	427 if (len != 0)
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	428 {
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	429 octave_idx_type *d = new octave_idx_type [len];
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	430
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	431 octave_idx_type nnz = bnda.nnz ();
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	432
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	433 octave_idx_type k = 0;
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	434 // 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	435 for (octave_idx_type i = 0; i < nnz; i++)
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	436 {
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	437 if (bnda.data (i))
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	438 d[k++] = bnda.cidx (i) + bnda.rows () * bnda.ridx (i);
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	439 }
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	440
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	441 data = d;
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	442
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	443 ext = d[k-1] + 1;
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	444 }
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	445 }
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	446
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	447 idx_vector::idx_vector_rep::~idx_vector_rep (void)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	448 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	449 if (aowner)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	450 delete aowner;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	451 else
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	452 delete [] data;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	453 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	454
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5108 diff changeset	455 octave_idx_type
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	456 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	457 {
1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	458 if (n < 0 \|\| n >= len)
1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	459 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	460 gripe_invalid_index ();
227 1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	461 return 0;
1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	462 }
1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	463
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	464 return xelem (n);
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	465 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	466
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	467 idx_vector::idx_base_rep *
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	468 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	469 {
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	470 if (len == 0)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	471 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	472 count++;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	473 return this;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	474 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	475
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	476 // This is wrapped in auto_ptr so that we don't leak on out-of-memory.
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	477 std::auto_ptr<idx_vector_rep> new_rep (
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	478 new idx_vector_rep (0, len, ext, orig_dims, DIRECT));
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	479
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	480 if (ext > len*xlog2 (1.0 + len))
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	481 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	482 // Use standard sort via octave_sort.
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	483 octave_idx_type *new_data = new octave_idx_type[len];
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	484 new_rep->data = new_data;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	485
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	486 std::copy (data, data + len, new_data);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	487 octave_sort<octave_idx_type> lsort;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	488 lsort.set_compare (ASCENDING);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	489 lsort.sort (new_data, len);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	490
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	491 if (uniq)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	492 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	493 octave_idx_type new_len = std::unique (new_data, new_data + len) - new_data;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	494 new_rep->len = new_len;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	495 if (new_rep->orig_dims.length () == 2 && new_rep->orig_dims(0) == 1)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	496 new_rep->orig_dims = dim_vector (1, new_len);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	497 else
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	498 new_rep->orig_dims = dim_vector (new_len, 1);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	499 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	500 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	501 else if (uniq)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	502 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	503 // Use two-pass bucket sort (only a mask array needed).
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	504 OCTAVE_LOCAL_BUFFER_INIT (bool, has, ext, false);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	505 for (octave_idx_type i = 0; i < len; i++)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	506 has[data[i]] = true;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	507
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	508 octave_idx_type new_len = 0;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	509 for (octave_idx_type i = 0; i < ext; i++)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	510 new_len += has[i];
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	511
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	512 new_rep->len = new_len;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	513 if (new_rep->orig_dims.length () == 2 && new_rep->orig_dims(0) == 1)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	514 new_rep->orig_dims = dim_vector (1, new_len);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	515 else
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	516 new_rep->orig_dims = dim_vector (new_len, 1);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	517
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	518 octave_idx_type *new_data = new octave_idx_type[new_len];
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	519 new_rep->data = new_data;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	520
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	521 for (octave_idx_type i = 0, j = 0; i < ext; i++)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	522 if (has[i])
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	523 new_data[j++] = i;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	524 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	525 else
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	526 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	527 // Use two-pass bucket sort.
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	528 OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, cnt, ext, 0);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	529 for (octave_idx_type i = 0; i < len; i++)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	530 cnt[data[i]]++;
2966 458cea5c8356 [project @ 1997-05-12 20:17:35 by jwe] jwe parents: 2847 diff changeset	531
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	532 octave_idx_type *new_data = new octave_idx_type[len];
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	533 new_rep->data = new_data;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	534
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	535 for (octave_idx_type i = 0, j = 0; i < ext; i++)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	536 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	537 for (octave_idx_type k = 0; k < cnt[i]; k++)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	538 new_data[j++] = i;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	539 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	540 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	541
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	542 return new_rep.release ();
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	543 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	544
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	545 idx_vector::idx_base_rep *
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	546 idx_vector::idx_vector_rep::sort_idx (Array<octave_idx_type>& idx)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	547 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	548 // This is wrapped in auto_ptr so that we don't leak on out-of-memory.
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	549 std::auto_ptr<idx_vector_rep> new_rep (
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	550 new idx_vector_rep (0, len, ext, orig_dims, DIRECT));
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	551
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	552 if (ext > len*xlog2 (1.0 + len))
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	553 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	554 // Use standard sort via octave_sort.
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	555 idx.clear (orig_dims);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	556 octave_idx_type *idx_data = idx.fortran_vec ();
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	557 for (octave_idx_type i = 0; i < len; i++)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	558 idx_data[i] = i;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	559
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	560 octave_idx_type *new_data = new octave_idx_type [len];
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	561 new_rep->data = new_data;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	562 std::copy (data, data + len, new_data);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	563
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	564 octave_sort<octave_idx_type> lsort;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	565 lsort.set_compare (ASCENDING);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	566 lsort.sort (new_data, idx_data, len);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	567 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	568 else
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	569 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	570 // Use two-pass bucket sort.
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	571 OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, cnt, ext, 0);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	572
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	573 for (octave_idx_type i = 0; i < len; i++)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	574 cnt[data[i]]++;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	575
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	576 idx.clear (orig_dims);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	577 octave_idx_type *idx_data = idx.fortran_vec ();
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	578
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	579 octave_idx_type *new_data = new octave_idx_type [len];
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	580 new_rep->data = new_data;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	581
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	582 for (octave_idx_type i = 0, k = 0; i < ext; i++)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	583 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	584 octave_idx_type j = cnt[i];
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	585 cnt[i] = k;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	586 k += j;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	587 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	588
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	589 for (octave_idx_type i = 0; i < len; i++)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	590 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	591 octave_idx_type j = data[i], k = cnt[j]++;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	592 new_data[k] = j;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	593 idx_data[k] = i;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	594 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	595 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	596
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	597 return new_rep.release ();
209 5869adaa6aea [project @ 1993-11-12 10:44:40 by jwe] jwe parents: 191 diff changeset	598 }
5869adaa6aea [project @ 1993-11-12 10:44:40 by jwe] jwe parents: 191 diff changeset	599
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	600 std::ostream&
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	601 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	602 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	603 os << '[';
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	604 for (octave_idx_type ii = 0; ii < len - 1; ii++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	605 os << data[ii] << ',' << ' ';
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	606 if (len > 0) os << data[len-1]; os << ']';
7425 fe4a43e1d1d3 [project @ 2008-01-28 09:13:01 by jwe] jwe parents: 7422 diff changeset	607
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	608 return os;
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	609 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	610
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	611 Array<double>
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	612 idx_vector::idx_vector_rep::unconvert (void) const
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	613 {
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	614 Array<double> retval (orig_dims);
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	615 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	616 retval.xelem (i) = data[i] + 1;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	617 return retval;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	618 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	619
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	620 Array<octave_idx_type>
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	621 idx_vector::idx_vector_rep::as_array (void)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	622 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	623 if (aowner)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	624 return *aowner;
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	625 else
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	626 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	627 Array<octave_idx_type> retval (orig_dims);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	628 std::memcpy (retval.fortran_vec (), data, len*sizeof (octave_idx_type));
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	629 // Delete the old copy and share the data instead to save memory.
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	630 delete [] data;
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	631 data = retval.fortran_vec ();
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	632 aowner = new Array<octave_idx_type> (retval);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	633 return retval;
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	634 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	635 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	636
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	637 DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_mask_rep);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	638
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	639 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	640 : 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	641 aowner (0), orig_dims (len, len)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	642 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	643 if (len != 0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	644 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	645 bool *d = new bool [1];
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	646 d[0] = true;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	647 data = d;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	648 ext = 1;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	649 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	650 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	651
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	652 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	653 octave_idx_type nnz)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	654 : 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	655 aowner (0), orig_dims ()
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	656 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	657 if (nnz < 0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	658 len = bnda.nnz ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	659
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	660 // 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	661 // 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	662 while (ext > 0 && ! bnda(ext-1))
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	663 ext--;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	664
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	665 const dim_vector dv = bnda.dims ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	666
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	667 if (! dv.all_zero ())
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	668 orig_dims = ((dv.length () == 2 && dv(0) == 1)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	669 ? dim_vector (1, len) : dim_vector (len, 1));
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	670
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	671 aowner = new Array<bool> (bnda);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	672 data = bnda.data ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	673 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	674
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	675 idx_vector::idx_mask_rep::~idx_mask_rep (void)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	676 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	677 if (aowner)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	678 delete aowner;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	679 else
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	680 delete [] data;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	681 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	682
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	683 octave_idx_type
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	684 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	685 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	686 if (n == lsti + 1)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	687 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	688 lsti = n;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	689 while (! data[++lste]) ;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	690 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	691 else
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	692 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	693 lsti = n++;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	694 lste = -1;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	695 while (n > 0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	696 if (data[++lste]) --n;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	697 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	698 return lste;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	699 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	700
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	701 octave_idx_type
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	702 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	703 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	704 if (n < 0 \|\| n >= len)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	705 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	706 gripe_invalid_index ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	707 return 0;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	708 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	709
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	710 return xelem (n);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	711 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	712
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	713 std::ostream&
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	714 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	715 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	716 os << '[';
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	717 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	718 os << data[ii] << ',' << ' ';
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	719 if (ext > 0) os << data[ext-1]; os << ']';
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	720
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	721 return os;
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
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	724 Array<bool>
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	725 idx_vector::idx_mask_rep::unconvert (void) const
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	726 {
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	727 if (aowner)
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	728 return *aowner;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	729 else
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	730 {
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	731 Array<bool> retval (orig_dims);
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	732 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	733 retval.xelem (i) = data[i];
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	734 return retval;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	735 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	736 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	737
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	738 idx_vector::idx_base_rep *
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	739 idx_vector::idx_mask_rep::sort_idx (Array<octave_idx_type>& idx)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	740 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	741 idx.clear (len, 1);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	742 for (octave_idx_type i = 0; i < len; i++)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	743 idx.xelem (i) = i;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	744
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	745 count++;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	746 return this;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	747 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	748
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	749 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	750
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	751 idx_vector::idx_vector (const Array<bool>& bnda)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	752 : rep (0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	753 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	754 // 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	755 static const int factor = (2 * sizeof (octave_idx_type));
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	756 octave_idx_type nnz = bnda.nnz ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	757 if (nnz <= bnda.numel () / factor)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	758 rep = new idx_vector_rep (bnda, nnz);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	759 else
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	760 rep = new idx_mask_rep (bnda, nnz);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	761 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	762
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	763 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	764 octave_idx_type nj)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	765 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	766 bool reduced = false;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	767
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	768 // Empty index always reduces.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	769 if (rep->length (n) == 0)
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	770 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	771 *this = idx_vector ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	772 return true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	773 }
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	774
8972 5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	775 // Possibly skip singleton dims.
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	776 if (n == 1 && rep->is_colon_equiv (n))
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	777 {
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	778 *this = j;
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	779 return true;
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	780 }
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	781
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	782 if (nj == 1 && j.is_colon_equiv (nj))
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	783 return true;
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	784
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	785 switch (j.idx_class ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	786 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	787 case class_colon:
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	788 switch (rep->idx_class ())
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	789 {
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	790 case class_colon:
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	791 // (:,:) reduces to (:)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	792 reduced = true;
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	793 break;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	794 case class_scalar:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	795 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	796 // (i,:) reduces to a range.
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	797 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	798 octave_idx_type k = r->get_data ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	799 *this = new idx_range_rep (k, nj, n, DIRECT);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	800 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	801 break;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	802 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	803 case class_range:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	804 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	805 // (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	806 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	807 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	808 octave_idx_type t = r->get_step ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	809 if (l*t == n)
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	810 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	811 this = new idx_range_rep (s, l nj, t, DIRECT);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	812 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	813 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	814 break;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	815 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	816 default:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	817 break;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	818 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	819 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	820 case class_range:
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	821 switch (rep->idx_class ())
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	822 {
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	823 case class_colon:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	824 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	825 // (:,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	826 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	827 if (rj->get_step () == 1)
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	828 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	829 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	830 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	831 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	832 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	833 break;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	834 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	835 case class_scalar:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	836 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	837 // (k,i:d:j) reduces to a range.
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	838 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	839 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	840 octave_idx_type k = r->get_data ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	841 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	842 octave_idx_type tj = rj->get_step ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	843 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	844 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	845 break;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	846 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	847 case class_range:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	848 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	849 // (i:k:end,p:q) reduces to a range if i <= k and k divides n.
10042 b7915ebe8acf implement index reduction rule for multiple constant ranges Jaroslav Hajek <highegg@gmail.com> parents: 9894 diff changeset	850 // (ones (1, m), ones (1, n)) reduces to (ones (1, m*n))
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	851 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	852 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	853 octave_idx_type t = r->get_step ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	854 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	855 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	856 octave_idx_type tj = rj->get_step ();
10042 b7915ebe8acf implement index reduction rule for multiple constant ranges Jaroslav Hajek <highegg@gmail.com> parents: 9894 diff changeset	857 if ((l*t == n && tj == 1) \|\| (t == 0 && tj == 0))
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	858 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	859 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	860 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	861 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	862 break;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	863 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	864 default:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	865 break;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	866 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	867 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	868 case class_scalar:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	869 switch (rep->idx_class ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	870 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	871 case class_scalar:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	872 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	873 // (i,j) reduces to a single index.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	874 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	875 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	876 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	877 *this = new idx_scalar_rep (k, DIRECT);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	878 reduced = true;
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	879 break;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	880 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	881 case class_range:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	882 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	883 // (i:d:j,k) reduces to a range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	884 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	885 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	886 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	887 octave_idx_type t = r->get_step ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	888 octave_idx_type k = rj->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	889 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	890 reduced = true;
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	891 break;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	892 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	893 case class_colon:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	894 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	895 // (:,k) reduces to a range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	896 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	897 octave_idx_type k = rj->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	898 this = new idx_range_rep (n k, n, 1, DIRECT);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	899 reduced = true;
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	900 break;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	901 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	902 default:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	903 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	904 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	905 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	906 default:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	907 break;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	908 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	909
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	910 return reduced;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	911 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	912
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	913 bool
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	914 idx_vector::is_cont_range (octave_idx_type n,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10285 diff changeset	915 octave_idx_type& l, octave_idx_type& u) const
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	916 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	917 bool res = false;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	918 switch (rep->idx_class ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	919 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	920 case class_colon:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	921 l = 0; u = n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	922 res = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	923 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	924 case class_range:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	925 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	926 idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	927 if (r->get_step () == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	928 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	929 l = r->get_start ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	930 u = l + r->length (n);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	931 res = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	932 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	933 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	934 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	935 case class_scalar:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	936 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	937 idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	938 l = r->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	939 u = l + 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	940 res = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	941 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	942 break;
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	943 case class_mask:
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	944 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	945 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	946 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	947 if (ext == len)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	948 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	949 l = 0;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	950 u = len;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	951 res = true;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	952 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	953 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	954 default:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	955 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	956 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	957
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	958 return res;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	959 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	960
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	961 octave_idx_type
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	962 idx_vector::increment (void) const
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	963 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	964 octave_idx_type retval = 0;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	965 switch (rep->idx_class ())
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	966 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	967 case class_colon:
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	968 retval = 1;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	969 case class_range:
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	970 retval = dynamic_cast<idx_range_rep *> (rep) -> get_step ();
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	971 break;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	972 case class_vector:
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	973 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	974 if (length (0) > 1)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	975 retval = elem (1) - elem (0);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	976 }
9757 95ad9c2a27e2 fix idx_vector construction checks Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	977 default:
95ad9c2a27e2 fix idx_vector construction checks Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	978 break;
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	979 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	980 return retval;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	981 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	982
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	983 void
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	984 idx_vector::copy_data (octave_idx_type *data) const
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	985 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	986 octave_idx_type len = rep->length (0);
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	987
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	988 switch (rep->idx_class ())
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	989 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	990 case class_colon:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	991 current_liboctave_error_handler ("colon not allowed");
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	992 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	993 case class_range:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	994 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	995 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	996 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	997 octave_idx_type i, j;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	998 if (step == 1)
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	999 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	1000 else if (step == -1)
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1001 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	1002 else
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1003 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	1004 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1005 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1006 case class_scalar:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1007 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1008 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	1009 *data = r->get_data ();
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1010 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1011 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1012 case class_vector:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1013 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1014 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	1015 const octave_idx_type *rdata = r->get_data ();
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	1016 copy_or_memcpy (len, rdata, data);
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1017 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1018 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1019 default:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1020 assert (false);
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1021 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1022 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1023
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1024 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1025
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1026 idx_vector
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1027 idx_vector::complement (octave_idx_type n) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1028 {
8379 ad8ed668e0a4 allow initialized local buffers Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	1029 OCTAVE_LOCAL_BUFFER_INIT (bool, left, n, true);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1030
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1031 octave_idx_type cnt = n;
3680 b8b0f5ff28e2 [project @ 2000-06-08 20:06:17 by jwe] jwe parents: 3504 diff changeset	1032
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1033 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	1034 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1035 octave_idx_type k = xelem (i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1036 if (k < n && left[k])
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1037 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1038 left[k] = false;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1039 cnt--;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1040 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1041 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1042
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1043 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	1044 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	1045 if (left[i]) data[j++] = i;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1046
8301 f7d44b6a74df fix out-of-bounds checks in null assignments Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	1047 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	1048 len ? data[len-1]+1 : 0,
f7d44b6a74df fix out-of-bounds checks in null assignments Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	1049 dim_vector (1, len), DIRECT);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1050 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1051
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1052 bool
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1053 idx_vector::is_permutation (octave_idx_type n) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1054 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1055 bool retval = false;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1056
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1057 if (is_colon_equiv (n))
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1058 retval = true;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1059 else if (length (n) == n && extent(n) == n)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1060 {
8379 ad8ed668e0a4 allow initialized local buffers Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	1061 OCTAVE_LOCAL_BUFFER_INIT (bool, left, n, true);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1062
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1063 retval = true;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1064
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1065 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	1066 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1067 octave_idx_type k = xelem (i);
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1068 if (left[k])
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1069 left[k] = false;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1070 else
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1071 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1072 retval = false;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1073 break;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1074 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1075 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1076
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1077 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1078
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1079 return retval;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1080 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1081
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1082 idx_vector
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1083 idx_vector::unmask (void) const
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1084 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1085 if (idx_class () == class_mask)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1086 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1087 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	1088 const bool *data = r->get_data ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1089 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	1090 octave_idx_type *idata = new octave_idx_type [len];
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1091 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	1092 if (data[i])
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1093 idata[j++] = i;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1094 ext = len > 0 ? idata[len - 1] : 0;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1095 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	1096 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1097 else
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1098 return *this;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1099 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1100
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1101 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	1102 double& scalar, Range& range,
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	1103 Array<double>& array, Array<bool>& mask) const
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1104 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1105 iclass = idx_class ();
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1106 switch (iclass)
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1107 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1108 case class_colon:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1109 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1110 case class_range:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1111 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1112 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	1113 range = r->unconvert ();
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1114 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1115 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1116 case class_scalar:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1117 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1118 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	1119 scalar = r->unconvert ();
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1120 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1121 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1122 case class_vector:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1123 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1124 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	1125 array = r->unconvert ();
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1126 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1127 break;
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1128 case class_mask:
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1129 {
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	1130 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	1131 mask = r->unconvert ();
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1132 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1133 break;
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1134 default:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1135 assert (false);
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1136 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1137 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1138 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1139
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1140 Array<octave_idx_type>
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1141 idx_vector::as_array (void) const
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1142 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1143 return rep->as_array ();
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1144 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1145
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1146 octave_idx_type
8677 095ae5e0a831 eliminte some compiler warnings John W. Eaton <jwe@octave.org> parents: 8384 diff changeset	1147 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	1148 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1149 if (! resize_ok && extent (z_len) > z_len)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1150 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1151 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1152 ("invalid matrix index = %d", extent (z_len));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1153 rep->err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1154 chkerr ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1155 }
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	1156
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1157 return length (z_len);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1158 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1159
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1160 octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1161 idx_vector::ones_count () const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1162 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1163 octave_idx_type n = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1164 if (is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1165 n = 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1166 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1167 for (octave_idx_type i = 0; i < length (1); i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1168 if (xelem (i) == 0) n++;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1169 return n;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1170 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1171
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1172 // Instantiate the octave_int constructors we want.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1173 #define INSTANTIATE_SCALAR_VECTOR_REP_CONST(T) \
8319 c374691576f6 Fix for MSVC compilation Michael Goffioul <michael.goffioul@gmail.com> parents: 8301 diff changeset	1174 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	1175 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	1176
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1177 INSTANTIATE_SCALAR_VECTOR_REP_CONST (float)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1178 INSTANTIATE_SCALAR_VECTOR_REP_CONST (double)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1179 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int8)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1180 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int16)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1181 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int32)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1182 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int64)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1183 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint8)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1184 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint16)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1185 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint32)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1186 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint64)

Mercurial > hg > octave-lyh

annotate liboctave/idx-vector.cc @ 10339:de2d43bcb083