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

annotate liboctave/array/idx-vector.cc @ 28638:98192ec1621f

replace Range with range<double> * __magick_read__.cc, cellfun.cc, data.cc, ls-mat4.cc, max.cc, pr-output.cc, pr-output.h, rand.cc, tril.cc, xpow.cc, xpow.h, ov-base.cc, ov-base.h, ov-range.cc, ov-range.h, ov.cc, ov.h, jit-typeinfo.cc, jit-typeinfo.h, pt-eval.cc, pt-jit.cc, idx-vector.cc, idx-vector.h: Replace all uses of Range with range<double>. * Range.h: Deprecated Range constructors.

author	John W. Eaton <jwe@octave.org>
date	Thu, 06 Aug 2020 16:28:30 -0400
parents	a3db48e66ef8
children	7854d5752dd2

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 // Copyright (C) 1993-2020 The Octave Project Developers
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21202 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
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26415 diff changeset	30 #include <cinttypes>
1343 94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1321 diff changeset	31 #include <cstdlib>
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1321 diff changeset	32
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	33 #include <ostream>
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"
10370 9c4daf174387 implement IDs for common liboctave exceptions Jaroslav Hajek <highegg@gmail.com> parents: 10339 diff changeset	37 #include "Array-util.h"
8384 a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	38 #include "Sparse.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1343 diff changeset	39 #include "Range.h"
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1343 diff changeset	40
8379 ad8ed668e0a4 allow initialized local buffers Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	41 #include "oct-locbuf.h"
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	42 #include "lo-error.h"
2500 e39839e18edc [project @ 1996-11-12 17:13:53 by jwe] jwe parents: 2386 diff changeset	43 #include "lo-mappers.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	44
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	45 OCTAVE_NORETURN static
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	46 void
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	47 err_invalid_range (void)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	48 {
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	49 (*current_liboctave_error_handler) ("invalid range used as index");
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	50 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	51
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	52 static void
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21019 diff changeset	53 err_index_out_of_range (void)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	54 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	55 (*current_liboctave_error_handler)
11590 4ced6b90fffb style fixes for warning and error messages in source files John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	56 ("internal error: idx_vector index out of range");
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	57 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	58
21573 f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	59 idx_vector::idx_vector_rep *
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	60 idx_vector::nil_rep (void)
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	61 {
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	62 static idx_vector_rep ivr;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	63 return &ivr;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	64 }
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	65
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	66 idx_vector::idx_vector_rep *
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	67 idx_vector::err_rep (void)
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	68 {
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	69 static idx_vector_rep ivr;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	70 ivr.err = true;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	71 return &ivr;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	72 }
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	73
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	74 Array<octave_idx_type>
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	75 idx_vector::idx_base_rep::as_array (void)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	76 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	77 (*current_liboctave_error_handler)
11590 4ced6b90fffb style fixes for warning and error messages in source files John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	78 ("internal error: as_array not allowed for this index class");
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	79
21411 9f7282acc30f Fix segfault caused by clang processing of GCC noreturn attribute. Rik <rik@octave.org> parents: 21307 diff changeset	80 // Never actually executed, but required to silence compiler warning
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	81 return Array<octave_idx_type> ();
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	82 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	83
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	84 idx_vector::idx_colon_rep::idx_colon_rep (char c)
23401 e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	85 : idx_base_rep ()
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	86 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	87 if (c != ':')
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 (*current_liboctave_error_handler)
11590 4ced6b90fffb style fixes for warning and error messages in source files John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	90 ("internal error: invalid character converted to idx_vector; must be ':'");
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21129 diff changeset	91 // FIXME: this is unreachable now.
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	92 err = true;
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 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	95
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	96 octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	97 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	98 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	99 if (i < 0)
21129 228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21102 diff changeset	100 err_index_out_of_range ();
228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21102 diff changeset	101
228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21102 diff changeset	102 return i;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	103 }
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	104
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	105 idx_vector::idx_base_rep *
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	106 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	107 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	108 (*current_liboctave_error_handler)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	109 ("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	110 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	111
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	112 std::ostream&
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	113 idx_vector::idx_colon_rep::print (std::ostream& os) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	114 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23796 diff changeset	115 return os << ':';
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	116 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	117
10258 e317791645c4 64-bit fixes John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	118 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	119 octave_idx_type _limit,
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	120 octave_idx_type _step)
23401 e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	121 : idx_base_rep (), start(_start),
22402 4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22327 diff changeset	122 len (_step ? std::max ((_limit - _start) / _step,
4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22327 diff changeset	123 static_cast<octave_idx_type> (0))
4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22327 diff changeset	124 : -1),
4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22327 diff changeset	125 step (_step)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	126 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	127 if (len < 0)
21129 228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21102 diff changeset	128 err_invalid_range ();
228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21102 diff changeset	129 if (start < 0)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	130 octave::err_invalid_index (start);
21129 228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21102 diff changeset	131 if (step < 0 && start + (len-1)*step < 0)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	132 octave::err_invalid_index (start + (len-1)*step);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	133 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	134
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28636 diff changeset	135 idx_vector::idx_range_rep::idx_range_rep (const octave::range<double>& r)
23401 e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	136 : idx_base_rep (), start (0), len (r.numel ()), step (1)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	137 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	138 if (len < 0)
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	139 err_invalid_range ();
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	140
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	141 if (len > 0)
8290 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 ())
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	144 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	145 start = static_cast<octave_idx_type> (r.base ()) - 1;
28636 a3db48e66ef8 use Range::increment instead of Range::inc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	146 step = static_cast<octave_idx_type> (r.increment ());
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20232 diff changeset	147 if (start < 0)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	148 octave::err_invalid_index (start);
21129 228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21102 diff changeset	149 if (step < 0 && start + (len - 1)*step < 0)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	150 octave::err_invalid_index (start + (len - 1)*step);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	151 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	152 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	153 {
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20232 diff changeset	154 // find first non-integer, then gripe about it
20648 67cf25a6e11e use gnulib::floor John W. Eaton <jwe@octave.org> parents: 20542 diff changeset	155 double b = r.base ();
28636 a3db48e66ef8 use Range::increment instead of Range::inc John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	156 double inc = r.increment ();
26415 f553b02e13c6 Use "x == fix (x)" to detect integers rather than floor or round (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	157 octave::err_invalid_index (b != std::trunc (b) ? b : b + inc);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	158 }
1 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 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	161
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5108 diff changeset	162 octave_idx_type
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	163 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	164 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	165 if (i < 0 \|\| i >= len)
21129 228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21102 diff changeset	166 err_index_out_of_range ();
228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21102 diff changeset	167
228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21102 diff changeset	168 return start + i*step;
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	169 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	170
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	171 idx_vector::idx_base_rep *
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	172 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	173 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	174 if (step < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	175 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	176 else
2500 e39839e18edc [project @ 1996-11-12 17:13:53 by jwe] jwe parents: 2386 diff changeset	177 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	178 count++;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	179 return this;
2500 e39839e18edc [project @ 1996-11-12 17:13:53 by jwe] jwe parents: 2386 diff changeset	180 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	181 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	182
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	183 idx_vector::idx_base_rep *
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	184 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	185 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	186 if (step < 0 && len > 0)
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 idx.clear (1, len);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	189 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	190 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	191 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	192 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	193 else
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 idx.clear (1, len);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	196 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	197 idx.xelem (i) = i;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	198 count++;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	199 return this;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	200 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	201 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	202
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	203 std::ostream&
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	204 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	205 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	206 os << start << ':' << step << ':' << start + len*step;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	207 return os;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	208 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	209
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28636 diff changeset	210 octave::range<double>
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	211 idx_vector::idx_range_rep::unconvert (void) const
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	212 {
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28636 diff changeset	213 return octave::range<double>::make_n_element_range
98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28636 diff changeset	214 (static_cast<double> (start+1), static_cast<double> (step), len);
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	215 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	216
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	217 Array<octave_idx_type>
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	218 idx_vector::idx_range_rep::as_array (void)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	219 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	220 Array<octave_idx_type> retval (dim_vector (1, len));
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	221 for (octave_idx_type i = 0; i < len; i++)
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10475 diff changeset	222 retval.xelem (i) = start + i*step;
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	223
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	224 return retval;
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
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	227 inline octave_idx_type
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	228 convert_index (octave_idx_type i, bool& conv_error,
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	229 octave_idx_type& ext)
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	230 {
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	231 if (i <= 0 && ! conv_error)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	232 octave::err_invalid_index (i-1);
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	233
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	234 if (ext < i)
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	235 ext = i;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	236
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	237 return i - 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	238 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	239
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	240 inline octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	241 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	242 {
9007 7e31df9a0334 simplify double->int conversion in indexing Jaroslav Hajek <highegg@gmail.com> parents: 8972 diff changeset	243 octave_idx_type i = static_cast<octave_idx_type> (x);
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	244
9007 7e31df9a0334 simplify double->int conversion in indexing Jaroslav Hajek <highegg@gmail.com> parents: 8972 diff changeset	245 if (static_cast<double> (i) != x)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	246 octave::err_invalid_index (x-1);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	247
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	248 return convert_index (i, conv_error, ext);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	249 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	250
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	251 inline octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	252 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	253 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	254 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	255 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	256
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21136 diff changeset	257 template <typename T>
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	258 inline octave_idx_type
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	259 convert_index (octave_int<T> x, bool& conv_error,
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	260 octave_idx_type& ext)
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	261 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	262 octave_idx_type i = octave_int<octave_idx_type> (x).value ();
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	263
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	264 return convert_index (i, conv_error, ext);
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	265 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	266
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21136 diff changeset	267 template <typename T>
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	268 idx_vector::idx_scalar_rep::idx_scalar_rep (T x)
23401 e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	269 : idx_base_rep (), data (0)
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	270 {
10101 b51848e95e4b cleanups to avoid valgrind warnings John W. Eaton <jwe@octave.org> parents: 10042 diff changeset	271 octave_idx_type dummy = 0;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	272
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	273 data = convert_index (x, err, dummy);
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	274 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3680 diff changeset	275
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	276 idx_vector::idx_scalar_rep::idx_scalar_rep (octave_idx_type i)
23401 e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	277 : idx_base_rep (), data (i)
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	278 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	279 if (data < 0)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	280 octave::err_invalid_index (data);
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	281 }
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	282
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	283 octave_idx_type
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	284 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	285 {
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	286 if (i != 0)
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21019 diff changeset	287 err_index_out_of_range ();
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	288
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	289 return data;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	290 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	291
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	292 idx_vector::idx_base_rep *
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	293 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	294 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	295 idx.clear (1, 1);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	296 idx.fill (0);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	297 count++;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	298 return this;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	299 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	300
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	301 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	302 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	303 return os << data;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	304 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	305
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	306 double
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	307 idx_vector::idx_scalar_rep::unconvert (void) const
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	308 {
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	309 return data + 1;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	310 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	311
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	312 Array<octave_idx_type>
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	313 idx_vector::idx_scalar_rep::as_array (void)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	314 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	315 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	316 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	317
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21136 diff changeset	318 template <typename T>
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	319 idx_vector::idx_vector_rep::idx_vector_rep (const Array<T>& nda)
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	320 : idx_base_rep (), data (nullptr), len (nda.numel ()), ext (0),
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23592 diff changeset	321 aowner (nullptr), orig_dims (nda.dims ())
8290 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 {
21448 06a2f9245a11 avoid possible memory leak in idx_vector_rep constructor (bug #47372) John W. Eaton <jwe@octave.org> parents: 21411 diff changeset	325 std::unique_ptr<octave_idx_type []> d (new octave_idx_type [len]);
06a2f9245a11 avoid possible memory leak in idx_vector_rep constructor (bug #47372) John W. Eaton <jwe@octave.org> parents: 21411 diff changeset	326
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	327 for (octave_idx_type i = 0; i < len; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	328 d[i] = convert_index (nda.xelem (i), err, ext);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	329
21448 06a2f9245a11 avoid possible memory leak in idx_vector_rep constructor (bug #47372) John W. Eaton <jwe@octave.org> parents: 21411 diff changeset	330 data = d.release ();
8290 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)
23401 e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	337 : idx_base_rep (), data (inda.data ()), len (inda.numel ()), ext (0),
11503 b3f511c48b14 idx-vector.h, idx-vector.cc: data member initialization and constructor fixes John W. Eaton <jwe@octave.org> parents: 10702 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);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	346 if (k < 0)
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20232 diff changeset	347 {
21129 228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21102 diff changeset	348 if (! err)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	349 octave::err_invalid_index (k);
20542 dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957) Lachlan Andrew <lachlanbis@gmail.com> parents: 20232 diff changeset	350 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	351 else if (k > max)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	352 max = k;
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
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	355 ext = max + 1;
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 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	358
10285 22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	359 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	360 octave_idx_type _ext, direct)
23401 e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	361 : idx_base_rep (), data (inda.data ()), len (inda.numel ()), ext (_ext),
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	362 aowner (new Array<octave_idx_type> (inda)), orig_dims (inda.dims ())
10285 22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	363 {
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	364 // No checking.
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	365 if (ext < 0)
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	366 {
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	367 octave_idx_type max = -1;
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	368 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	369 if (data[i] > max)
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	370 max = data[i];
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	371
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	372 ext = max + 1;
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 }
22a7913bbeb5 optimize return values of find and sort Jaroslav Hajek <highegg@gmail.com> parents: 10277 diff changeset	375
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	376 idx_vector::idx_vector_rep::idx_vector_rep (bool b)
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	377 : idx_base_rep (), data (nullptr), len (b ? 1 : 0), ext (0),
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	378 aowner (nullptr), orig_dims (len, len)
8290 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 if (len != 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	381 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	382 octave_idx_type *d = new octave_idx_type [1];
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	383 d[0] = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	384 data = d;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	385 ext = 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	386 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	387 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	388
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	389 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	390 octave_idx_type nnz)
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	391 : idx_base_rep (), data (nullptr), len (nnz), ext (0), aowner (nullptr),
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	392 orig_dims ()
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	393 {
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	394 if (nnz < 0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	395 len = bnda.nnz ();
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	396
9045 ac0a23e9f5c5 more compatible indexing by logical empty matrices Jaroslav Hajek <highegg@gmail.com> parents: 9007 diff changeset	397 const dim_vector dv = bnda.dims ();
7774 ce52af0e4a10 all false logical indexing fix David Bateman <dbateman@free.fr> parents: 7727 diff changeset	398
23386 f1ea44e92df8 improve compatibility for single index indexing (bug #50776) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	399 orig_dims = dv.make_nd_vector (len);
7774 ce52af0e4a10 all false logical indexing fix David Bateman <dbateman@free.fr> parents: 7727 diff changeset	400
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	401 if (len != 0)
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	402 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	403 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	404
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20228 diff changeset	405 octave_idx_type ntot = bnda.numel ();
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	406
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	407 octave_idx_type k = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	408 for (octave_idx_type i = 0; i < ntot; i++)
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	409 if (bnda.xelem (i))
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	410 d[k++] = i;
7572 85da2ab0c6fd logical indexing compatibility fixes John W. Eaton <jwe@octave.org> parents: 7425 diff changeset	411
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	412 data = d;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	413
8384 a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	414 ext = d[k-1] + 1;
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 }
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	417
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	418 idx_vector::idx_vector_rep::idx_vector_rep (const Sparse<bool>& bnda)
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	419 : idx_base_rep (), data (nullptr), len (bnda.nnz ()), ext (0),
4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	420 aowner (nullptr), orig_dims ()
8384 a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	421 {
16779 8fce0ed4894a Specialize is_empty and numel methods for sparse matrices (debian bug #706376) David Bateman <dbateman@free.fr> parents: 15271 diff changeset	422 const dim_vector dv = bnda.dims ();
8384 a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	423
23386 f1ea44e92df8 improve compatibility for single index indexing (bug #50776) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	424 orig_dims = dv.make_nd_vector (len);
8384 a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	425
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	426 if (len != 0)
a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	427 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	428 octave_idx_type *d = new octave_idx_type [len];
8384 a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	429
16779 8fce0ed4894a Specialize is_empty and numel methods for sparse matrices (debian bug #706376) David Bateman <dbateman@free.fr> parents: 15271 diff changeset	430 octave_idx_type k = 0;
8fce0ed4894a Specialize is_empty and numel methods for sparse matrices (debian bug #706376) David Bateman <dbateman@free.fr> parents: 15271 diff changeset	431 octave_idx_type nc = bnda.cols ();
8fce0ed4894a Specialize is_empty and numel methods for sparse matrices (debian bug #706376) David Bateman <dbateman@free.fr> parents: 15271 diff changeset	432 octave_idx_type nr = bnda.rows ();
8384 a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	433
16779 8fce0ed4894a Specialize is_empty and numel methods for sparse matrices (debian bug #706376) David Bateman <dbateman@free.fr> parents: 15271 diff changeset	434 for (octave_idx_type j = 0; j < nc; j++)
18083 938f01339043 maint: Use Octave coding convention for indexing vs. function calls in liboctave/array. Rik <rik@octave.org> parents: 17769 diff changeset	435 for (octave_idx_type i = bnda.cidx (j); i < bnda.cidx (j+1); i++)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	436 if (bnda.data (i))
16779 8fce0ed4894a Specialize is_empty and numel methods for sparse matrices (debian bug #706376) David Bateman <dbateman@free.fr> parents: 15271 diff changeset	437 d[k++] = j * nr + bnda.ridx (i);
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	438
8384 a99b9113c58c optimize sparse bool indexing Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	439 data = d;
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 ext = d[k-1] + 1;
2828 92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	442 }
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	443 }
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe] jwe parents: 2800 diff changeset	444
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	445 idx_vector::idx_vector_rep::~idx_vector_rep (void)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	446 {
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	447 if (aowner)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	448 delete aowner;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	449 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	450 delete [] data;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	451 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	452
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5108 diff changeset	453 octave_idx_type
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	454 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	455 {
1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	456 if (n < 0 \|\| n >= len)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	457 octave::err_invalid_index (n);
227 1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 209 diff changeset	458
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	459 return xelem (n);
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	460 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	461
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	462 idx_vector::idx_base_rep *
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	463 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	464 {
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	465 if (len == 0)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	466 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	467 count++;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	468 return this;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	469 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	470
21307 61c96c37ce69 Use std::unique_ptr to replace deprecated std::auto_ptr. Rik <rik@octave.org> parents: 21301 diff changeset	471 // This is wrapped in unique_ptr so that we don't leak on out-of-memory.
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26569 diff changeset	472 std::unique_ptr<idx_vector_rep> new_rep
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26569 diff changeset	473 (new idx_vector_rep (nullptr, len, ext, orig_dims, DIRECT));
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	474
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	475 if (ext > len*octave::math::log2 (1.0 + len))
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	476 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	477 // Use standard sort via octave_sort.
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	478 octave_idx_type *new_data = new octave_idx_type [len];
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	479 new_rep->data = new_data;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	480
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23408 diff changeset	481 std::copy_n (data, len, new_data);
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	482 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	483 lsort.set_compare (ASCENDING);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	484 lsort.sort (new_data, len);
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 if (uniq)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	487 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	488 octave_idx_type new_len = std::unique (new_data, new_data + len)
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	489 - new_data;
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	490 new_rep->len = new_len;
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21574 diff changeset	491 if (new_rep->orig_dims.ndims () == 2 && new_rep->orig_dims(0) == 1)
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	492 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	493 else
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	494 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	495 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	496 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	497 else if (uniq)
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	498 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	499 // 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	500 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	501 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	502 has[data[i]] = true;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	503
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	504 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	505 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	506 new_len += has[i];
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 new_rep->len = new_len;
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21574 diff changeset	509 if (new_rep->orig_dims.ndims () == 2 && new_rep->orig_dims(0) == 1)
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	510 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	511 else
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	512 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	513
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	514 octave_idx_type *new_data = new octave_idx_type [new_len];
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	515 new_rep->data = new_data;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	516
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	517 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	518 if (has[i])
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	519 new_data[j++] = i;
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 else
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	522 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	523 // Use two-pass bucket sort.
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	524 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	525 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	526 cnt[data[i]]++;
2966 458cea5c8356 [project @ 1997-05-12 20:17:35 by jwe] jwe parents: 2847 diff changeset	527
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	528 octave_idx_type *new_data = new octave_idx_type [len];
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	529 new_rep->data = new_data;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	530
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	531 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	532 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	533 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	534 new_data[j++] = i;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	535 }
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
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	538 return new_rep.release ();
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 idx_vector::idx_base_rep *
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	542 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	543 {
21307 61c96c37ce69 Use std::unique_ptr to replace deprecated std::auto_ptr. Rik <rik@octave.org> parents: 21301 diff changeset	544 // This is wrapped in unique_ptr so that we don't leak on out-of-memory.
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26569 diff changeset	545 std::unique_ptr<idx_vector_rep> new_rep
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26569 diff changeset	546 (new idx_vector_rep (nullptr, len, ext, orig_dims, DIRECT));
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	547
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	548 if (ext > len*octave::math::log2 (1.0 + len))
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	549 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	550 // 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	551 idx.clear (orig_dims);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	552 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	553 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	554 idx_data[i] = i;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	555
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	556 octave_idx_type *new_data = new octave_idx_type [len];
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	557 new_rep->data = new_data;
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23408 diff changeset	558 std::copy_n (data, len, new_data);
10273 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_sort<octave_idx_type> lsort;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	561 lsort.set_compare (ASCENDING);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	562 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	563 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	564 else
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	565 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	566 // Use two-pass bucket sort.
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	567 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	568
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	569 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	570 cnt[data[i]]++;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	571
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	572 idx.clear (orig_dims);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	573 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	574
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	575 octave_idx_type *new_data = new octave_idx_type [len];
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	576 new_rep->data = new_data;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	577
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	578 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	579 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	580 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	581 cnt[i] = k;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	582 k += j;
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
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	585 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	586 {
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	587 octave_idx_type j = data[i];
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	588 octave_idx_type k = cnt[j]++;
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	589 new_data[k] = j;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	590 idx_data[k] = i;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	591 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	592 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	593
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	594 return new_rep.release ();
209 5869adaa6aea [project @ 1993-11-12 10:44:40 by jwe] jwe parents: 191 diff changeset	595 }
5869adaa6aea [project @ 1993-11-12 10:44:40 by jwe] jwe parents: 191 diff changeset	596
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	597 std::ostream&
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	598 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	599 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	600 os << '[';
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	601
23408 0af9a1ae0912 maint: Use std::copy_n and std::fill_n for dim_vectors and idx_vectors. Rik <rik@octave.org> parents: 23401 diff changeset	602 for (octave_idx_type i = 0; i < len - 1; i++)
0af9a1ae0912 maint: Use std::copy_n and std::fill_n for dim_vectors and idx_vectors. Rik <rik@octave.org> parents: 23401 diff changeset	603 os << data[i] << ',' << ' ';
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	604
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	605 if (len > 0)
21943 2fc1ce5deae4 fix misleading indentation John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	606 os << data[len-1];
2fc1ce5deae4 fix misleading indentation John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	607
2fc1ce5deae4 fix misleading indentation John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	608 os << ']';
7425 fe4a43e1d1d3 [project @ 2008-01-28 09:13:01 by jwe] jwe parents: 7422 diff changeset	609
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	610 return os;
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	611 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	612
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	613 Array<double>
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	614 idx_vector::idx_vector_rep::unconvert (void) const
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	615 {
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	616 Array<double> retval (orig_dims);
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	617 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	618 retval.xelem (i) = data[i] + 1;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	619 return retval;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	620 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	621
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	622 Array<octave_idx_type>
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	623 idx_vector::idx_vector_rep::as_array (void)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	624 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	625 if (aowner)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	626 return *aowner;
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	627 else
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	628 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	629 Array<octave_idx_type> retval (orig_dims);
23401 e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	630
e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	631 if (data)
e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	632 {
e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	633 std::memcpy (retval.fortran_vec (), data, len*sizeof (octave_idx_type));
e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	634 // Delete the old copy and share the data instead to save memory.
e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	635 delete [] data;
e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	636 }
e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	637
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	638 data = retval.fortran_vec ();
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	639 aowner = new Array<octave_idx_type> (retval);
23401 e0c20a22da7e eliminate some errors exposed by -fsanitize=undefined John W. Eaton <jwe@octave.org> parents: 23386 diff changeset	640
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	641 return retval;
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	642 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	643 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	644
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	645 idx_vector::idx_mask_rep::idx_mask_rep (bool b)
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	646 : idx_base_rep (), data (nullptr), len (b ? 1 : 0), ext (0),
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23592 diff changeset	647 lsti (-1), lste (-1), aowner (nullptr), orig_dims (len, len)
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	648 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	649 if (len != 0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	650 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	651 bool *d = new bool [1];
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	652 d[0] = true;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	653 data = d;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	654 ext = 1;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	655 }
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
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	658 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	659 octave_idx_type nnz)
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	660 : idx_base_rep (), data (nullptr), len (nnz), ext (bnda.numel ()),
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23592 diff changeset	661 lsti (-1), lste (-1), aowner (nullptr), orig_dims ()
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	662 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	663 if (nnz < 0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	664 len = bnda.nnz ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	665
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	666 // We truncate the extent as much as possible. For Matlab
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	667 // 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	668 while (ext > 0 && ! bnda(ext-1))
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	669 ext--;
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 const dim_vector dv = bnda.dims ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	672
23386 f1ea44e92df8 improve compatibility for single index indexing (bug #50776) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	673 orig_dims = dv.make_nd_vector (len);
9879 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 aowner = new Array<bool> (bnda);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	676 data = bnda.data ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	677 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	678
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	679 idx_vector::idx_mask_rep::~idx_mask_rep (void)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	680 {
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	681 if (aowner)
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	682 delete aowner;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	683 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	684 delete [] data;
9879 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
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	687 octave_idx_type
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	688 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	689 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	690 if (n == lsti + 1)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	691 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	692 lsti = n;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	693 while (! data[++lste]) ;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	694 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	695 else
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	696 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	697 lsti = n++;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	698 lste = -1;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	699 while (n > 0)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	700 if (data[++lste]) --n;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	701 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	702 return lste;
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
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	705 octave_idx_type
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	706 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	707 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	708 if (n < 0 \|\| n >= len)
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	709 octave::err_invalid_index (n);
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	710
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	711 return xelem (n);
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
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	714 std::ostream&
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	715 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	716 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	717 os << '[';
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	718
23408 0af9a1ae0912 maint: Use std::copy_n and std::fill_n for dim_vectors and idx_vectors. Rik <rik@octave.org> parents: 23401 diff changeset	719 for (octave_idx_type i = 0; i < ext - 1; i++)
0af9a1ae0912 maint: Use std::copy_n and std::fill_n for dim_vectors and idx_vectors. Rik <rik@octave.org> parents: 23401 diff changeset	720 os << data[i] << ',' << ' ';
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	721
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	722 if (ext > 0)
21943 2fc1ce5deae4 fix misleading indentation John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	723 os << data[ext-1];
2fc1ce5deae4 fix misleading indentation John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	724
2fc1ce5deae4 fix misleading indentation John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	725 os << ']';
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	726
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	727 return os;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	728 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	729
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	730 Array<bool>
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	731 idx_vector::idx_mask_rep::unconvert (void) const
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	732 {
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	733 if (aowner)
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	734 return *aowner;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	735 else
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	736 {
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	737 Array<bool> retval (dim_vector (ext, 1));
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	738 for (octave_idx_type i = 0; i < ext; i++)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	739 retval.xelem (i) = data[i];
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	740 return retval;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	741 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	742 }
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	743
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	744 Array<octave_idx_type>
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	745 idx_vector::idx_mask_rep::as_array (void)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	746 {
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	747 if (aowner)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	748 return aowner->find ().reshape (orig_dims);
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	749 else
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	750 {
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	751 Array<bool> retval (orig_dims);
10425 0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	752 for (octave_idx_type i = 0, j = 0; i < ext; i++)
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	753 if (data[i])
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	754 retval.xelem (j++) = i;
0677c5d80b77 rewrite 1D sparse indexing Jaroslav Hajek <highegg@gmail.com> parents: 10370 diff changeset	755
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	756 return retval;
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	757 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	758 }
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	759
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	760 idx_vector::idx_base_rep *
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	761 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	762 {
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	763 idx.clear (len, 1);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	764 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	765 idx.xelem (i) = i;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	766
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	767 count++;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	768 return this;
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	769 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	770
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	771 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	772
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	773 idx_vector::idx_vector (const Array<bool>& bnda)
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23592 diff changeset	774 : rep (nullptr)
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	775 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	776 // 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	777 static const int factor = (2 * sizeof (octave_idx_type));
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	778 octave_idx_type nnz = bnda.nnz ();
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	779 if (nnz <= bnda.numel () / factor)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	780 rep = new idx_vector_rep (bnda, nnz);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	781 else
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	782 rep = new idx_mask_rep (bnda, nnz);
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	783 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	784
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	785 bool
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	786 idx_vector::maybe_reduce (octave_idx_type n, const idx_vector& j,
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	787 octave_idx_type nj)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	788 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	789 bool reduced = false;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	790
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	791 // Empty index always reduces.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	792 if (rep->length (n) == 0)
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	793 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	794 *this = idx_vector ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	795 return true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	796 }
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	797
8972 5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	798 // Possibly skip singleton dims.
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	799 if (n == 1 && rep->is_colon_equiv (n))
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	800 {
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	801 *this = j;
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	802 return true;
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	803 }
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	804
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	805 if (nj == 1 && j.is_colon_equiv (nj))
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	806 return true;
5fa53d1b6247 more indexing optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	807
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	808 switch (j.idx_class ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	809 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	810 case class_colon:
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	811 switch (rep->idx_class ())
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	812 {
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	813 case class_colon:
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	814 // (:,:) reduces to (:)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	815 reduced = true;
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	816 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	817
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	818 case class_scalar:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	819 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	820 // (i,:) reduces to a range.
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	821 idx_scalar_rep r = dynamic_cast<idx_scalar_rep > (rep);
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	822 octave_idx_type k = r->get_data ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	823 *this = new idx_range_rep (k, nj, n, DIRECT);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	824 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	825 }
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	826 break;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	827
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	828 case class_range:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	829 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	830 // (i:k:end,:) reduces to a range if i <= k and k divides n.
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	831 idx_range_rep r = dynamic_cast<idx_range_rep > (rep);
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	832 octave_idx_type s = r->get_start ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	833 octave_idx_type l = r->length (n);
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	834 octave_idx_type t = r->get_step ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	835 if (l*t == n)
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 this = new idx_range_rep (s, l nj, t, DIRECT);
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	838 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	839 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	840 }
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	841 break;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	842
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	843 default:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	844 break;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	845 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	846 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	847
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	848 case class_range:
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	849 switch (rep->idx_class ())
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	850 {
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	851 case class_colon:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	852 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	853 // (:,i:j) reduces to a range (the step must be 1)
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	854 idx_range_rep rj = dynamic_cast<idx_range_rep > (j.rep);
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	855 if (rj->get_step () == 1)
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	856 {
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	857 octave_idx_type sj = rj->get_start ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	858 octave_idx_type lj = rj->length (nj);
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	859 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	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 }
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	863 break;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	864
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	865 case class_scalar:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	866 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	867 // (k,i:d:j) reduces to a range.
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	868 idx_scalar_rep r = dynamic_cast<idx_scalar_rep > (rep);
e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	869 idx_range_rep rj = dynamic_cast<idx_range_rep > (j.rep);
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	870 octave_idx_type k = r->get_data ();
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	871 octave_idx_type sj = rj->get_start ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	872 octave_idx_type lj = rj->length (nj);
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	873 octave_idx_type tj = rj->get_step ();
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	874 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	875 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	876 }
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	877 break;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	878
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	879 case class_range:
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	880 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	881 // (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	882 // (ones (1, m), ones (1, n)) reduces to (ones (1, m*n))
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	883 idx_range_rep r = dynamic_cast<idx_range_rep > (rep);
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	884 octave_idx_type s = r->get_start ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	885 octave_idx_type l = r->length (n);
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	886 octave_idx_type t = r->get_step ();
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	887 idx_range_rep rj = dynamic_cast<idx_range_rep > (j.rep);
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	888 octave_idx_type sj = rj->get_start ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	889 octave_idx_type lj = rj->length (nj);
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	890 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	891 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	892 {
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	893 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	894 reduced = true;
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	895 }
3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	896 }
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	897 break;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	898
9772 3ac8ea48279b improve index reduction rules Jaroslav Hajek <highegg@gmail.com> parents: 9757 diff changeset	899 default:
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 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	903
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	904 case class_scalar:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	905 switch (rep->idx_class ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	906 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	907 case class_scalar:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	908 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	909 // (i,j) reduces to a single index.
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	910 idx_scalar_rep r = dynamic_cast<idx_scalar_rep > (rep);
e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	911 idx_scalar_rep rj = dynamic_cast<idx_scalar_rep > (j.rep);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	912 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	913 *this = new idx_scalar_rep (k, DIRECT);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	914 reduced = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	915 }
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	916 break;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	917
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	918 case class_range:
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 // (i:d:j,k) reduces to a range.
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	921 idx_range_rep r = dynamic_cast<idx_range_rep > (rep);
e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	922 idx_scalar_rep rj = dynamic_cast<idx_scalar_rep > (j.rep);
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	923 octave_idx_type s = r->get_start ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	924 octave_idx_type l = r->length (nj);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	925 octave_idx_type t = r->get_step ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	926 octave_idx_type k = rj->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	927 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	928 reduced = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	929 }
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	930 break;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	931
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	932 case class_colon:
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 // (:,k) reduces to a range.
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	935 idx_scalar_rep rj = dynamic_cast<idx_scalar_rep > (j.rep);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	936 octave_idx_type k = rj->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	937 this = new idx_range_rep (n k, n, 1, DIRECT);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	938 reduced = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	939 }
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	940 break;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	941
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	942 default:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	943 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	944 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	945 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	946
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	947 default:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	948 break;
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	949 }
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	950
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	951 return reduced;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	952 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	953
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	954 bool
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8319 diff changeset	955 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	956 octave_idx_type& l, octave_idx_type& u) const
8290 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 bool res = false;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	959
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	960 switch (rep->idx_class ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	961 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	962 case class_colon:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	963 l = 0; u = n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	964 res = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	965 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	966
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	967 case class_range:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	968 {
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	969 idx_range_rep r = dynamic_cast<idx_range_rep > (rep);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	970 if (r->get_step () == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	971 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	972 l = r->get_start ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	973 u = l + r->length (n);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	974 res = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	975 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	976 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	977 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	978
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	979 case class_scalar:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	980 {
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	981 idx_scalar_rep r = dynamic_cast<idx_scalar_rep > (rep);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	982 l = r->get_data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	983 u = l + 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	984 res = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	985 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	986 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	987
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	988 case class_mask:
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	989 {
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	990 idx_mask_rep r = dynamic_cast<idx_mask_rep > (rep);
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	991 octave_idx_type ext = r->extent (0);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	992 octave_idx_type len = r->length (0);
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	993 if (ext == len)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	994 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	995 l = 0;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	996 u = len;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	997 res = true;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	998 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	999 }
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1000
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1001 default:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1002 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1003 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1004
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1005 return res;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1006 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1007
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1008 octave_idx_type
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1009 idx_vector::increment (void) const
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1010 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1011 octave_idx_type retval = 0;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1012
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1013 switch (rep->idx_class ())
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1014 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1015 case class_colon:
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1016 retval = 1;
10702 c49911ab7ac7 implement missing copy_data case in idx_vector (bug #30099) Jaroslav Hajek <highegg@gmail.com> parents: 10620 diff changeset	1017 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1018
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1019 case class_range:
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1020 retval = dynamic_cast<idx_range_rep *> (rep) -> get_step ();
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1021 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1022
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1023 case class_vector:
10702 c49911ab7ac7 implement missing copy_data case in idx_vector (bug #30099) Jaroslav Hajek <highegg@gmail.com> parents: 10620 diff changeset	1024 case class_mask:
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1025 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1026 if (length (0) > 1)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1027 retval = elem (1) - elem (0);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1028 }
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1029 break;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1030
9757 95ad9c2a27e2 fix idx_vector construction checks Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	1031 default:
95ad9c2a27e2 fix idx_vector construction checks Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	1032 break;
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1033 }
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1034
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1035 return retval;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1036 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	1037
10475 739109ef88ee helper idx_vector methods Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1038 const octave_idx_type *
739109ef88ee helper idx_vector methods Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1039 idx_vector::raw (void)
739109ef88ee helper idx_vector methods Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1040 {
739109ef88ee helper idx_vector methods Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1041 if (rep->idx_class () != class_vector)
10479 ded9beac7582 optimize sparse matrix assembly Jaroslav Hajek <highegg@gmail.com> parents: 10475 diff changeset	1042 *this = idx_vector (as_array (), extent (0));
10475 739109ef88ee helper idx_vector methods Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1043
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	1044 idx_vector_rep r = dynamic_cast<idx_vector_rep > (rep);
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1045
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23592 diff changeset	1046 assert (r != nullptr);
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1047
10475 739109ef88ee helper idx_vector methods Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1048 return r->get_data ();
739109ef88ee helper idx_vector methods Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1049 }
739109ef88ee helper idx_vector methods Jaroslav Hajek <highegg@gmail.com> parents: 10425 diff changeset	1050
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1051 void
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1052 idx_vector::copy_data (octave_idx_type *data) const
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1053 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1054 octave_idx_type len = rep->length (0);
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1055
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1056 switch (rep->idx_class ())
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1057 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1058 case class_colon:
21019 8a65589d1a42 maint: Dereference current_liboctave_error_handler before calling. Rik <rik@octave.org> parents: 20955 diff changeset	1059 (*current_liboctave_error_handler) ("colon not allowed");
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1060 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1061
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1062 case class_range:
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1063 {
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	1064 idx_range_rep r = dynamic_cast<idx_range_rep > (rep);
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1065 octave_idx_type start = r->get_start ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1066 octave_idx_type step = r->get_step ();
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1067 octave_idx_type i, j;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1068 if (step == 1)
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1069 for (i = start, j = start + len; i < j; i++) *data++ = i;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1070 else if (step == -1)
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1071 for (i = start, j = start - len; i > j; i--) *data++ = i;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1072 else
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1073 for (i = 0, j = start; i < len; i++, j += step) *data++ = j;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1074 }
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1075 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1076
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1077 case class_scalar:
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1078 {
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	1079 idx_scalar_rep r = dynamic_cast<idx_scalar_rep > (rep);
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1080 *data = r->get_data ();
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1081 }
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1082 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1083
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1084 case class_vector:
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1085 {
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	1086 idx_vector_rep r = dynamic_cast<idx_vector_rep > (rep);
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1087 const octave_idx_type *rdata = r->get_data ();
23420 1fee389bd04b Use std::copy_n rather than std::copy for clarity in liboctave/array. Rik <rik@octave.org> parents: 23408 diff changeset	1088 std::copy_n (rdata, len, data);
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1089 }
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1090 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1091
10702 c49911ab7ac7 implement missing copy_data case in idx_vector (bug #30099) Jaroslav Hajek <highegg@gmail.com> parents: 10620 diff changeset	1092 case class_mask:
c49911ab7ac7 implement missing copy_data case in idx_vector (bug #30099) Jaroslav Hajek <highegg@gmail.com> parents: 10620 diff changeset	1093 {
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	1094 idx_mask_rep r = dynamic_cast<idx_mask_rep > (rep);
10702 c49911ab7ac7 implement missing copy_data case in idx_vector (bug #30099) Jaroslav Hajek <highegg@gmail.com> parents: 10620 diff changeset	1095 const bool *mask = r->get_data ();
c49911ab7ac7 implement missing copy_data case in idx_vector (bug #30099) Jaroslav Hajek <highegg@gmail.com> parents: 10620 diff changeset	1096 octave_idx_type ext = r->extent (0);
c49911ab7ac7 implement missing copy_data case in idx_vector (bug #30099) Jaroslav Hajek <highegg@gmail.com> parents: 10620 diff changeset	1097 for (octave_idx_type i = 0, j = 0; i < ext; i++)
c49911ab7ac7 implement missing copy_data case in idx_vector (bug #30099) Jaroslav Hajek <highegg@gmail.com> parents: 10620 diff changeset	1098 if (mask[i])
c49911ab7ac7 implement missing copy_data case in idx_vector (bug #30099) Jaroslav Hajek <highegg@gmail.com> parents: 10620 diff changeset	1099 data[j++] = i;
c49911ab7ac7 implement missing copy_data case in idx_vector (bug #30099) Jaroslav Hajek <highegg@gmail.com> parents: 10620 diff changeset	1100 }
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1101 break;
10702 c49911ab7ac7 implement missing copy_data case in idx_vector (bug #30099) Jaroslav Hajek <highegg@gmail.com> parents: 10620 diff changeset	1102
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1103 default:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1104 assert (false);
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1105 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1106 }
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
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1109 idx_vector
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1110 idx_vector::complement (octave_idx_type n) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1111 {
10491 077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1112 idx_vector retval;
077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1113 if (extent (n) > n)
077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1114 (*current_liboctave_error_handler)
077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1115 ("internal error: out of range complement index requested");
3680 b8b0f5ff28e2 [project @ 2000-06-08 20:06:17 by jwe] jwe parents: 3504 diff changeset	1116
10491 077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1117 if (idx_class () == class_mask)
077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1118 {
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	1119 idx_mask_rep r = dynamic_cast<idx_mask_rep > (rep);
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1120 octave_idx_type nz = r->length (0);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1121 octave_idx_type ext = r->extent (0);
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1122 Array<bool> mask (dim_vector (n, 1));
10491 077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1123 const bool *data = r->get_data ();
077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1124 bool *ndata = mask.fortran_vec ();
077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1125 for (octave_idx_type i = 0; i < ext; i++)
077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1126 ndata[i] = ! data[i];
23408 0af9a1ae0912 maint: Use std::copy_n and std::fill_n for dim_vectors and idx_vectors. Rik <rik@octave.org> parents: 23401 diff changeset	1127 std::fill_n (ndata + ext, n - ext, true);
10491 077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1128 retval = new idx_mask_rep (mask, n - nz);
077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1129 }
077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1130 else
077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1131 {
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1132 Array<bool> mask (dim_vector (n, 1), true);
10491 077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1133 fill (false, length (n), mask.fortran_vec ());
077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1134 retval = idx_vector (mask);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1135 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1136
10491 077fef5da460 optimize null assignment with bool masks Jaroslav Hajek <highegg@gmail.com> parents: 10489 diff changeset	1137 return retval;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1138 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1139
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1140 bool
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1141 idx_vector::is_permutation (octave_idx_type n) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1142 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1143 bool retval = false;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1144
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1145 if (is_colon_equiv (n))
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1146 retval = true;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14138 diff changeset	1147 else if (length(n) == n && extent(n) == n)
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1148 {
8379 ad8ed668e0a4 allow initialized local buffers Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	1149 OCTAVE_LOCAL_BUFFER_INIT (bool, left, n, true);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1150
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1151 retval = true;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1152
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1153 for (octave_idx_type i = 0, len = length (); i < len; i++)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1154 {
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1155 octave_idx_type k = xelem (i);
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1156 if (left[k])
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	1157 left[k] = false;
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1158 else
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1159 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1160 retval = false;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1161 break;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1162 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1163 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1164 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1165
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1166 return retval;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1167 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1168
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1169 idx_vector
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1170 idx_vector::inverse_permutation (octave_idx_type n) const
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1171 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1172 assert (n == length (n));
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1173
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1174 idx_vector retval;
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1175
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1176 switch (idx_class ())
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1177 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1178 case class_range:
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1179 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1180 if (increment () == -1)
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1181 retval = sorted ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1182 else
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1183 retval = *this;
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1184 break;
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1185 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1186 case class_vector:
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1187 {
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1188 idx_vector_rep r = dynamic_cast<idx_vector_rep > (rep);
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1189 const octave_idx_type *ri = r->get_data ();
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1190 Array<octave_idx_type> idx (orig_dimensions ());
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1191 for (octave_idx_type i = 0; i < n; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14138 diff changeset	1192 idx.xelem (ri[i]) = i;
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1193 retval = new idx_vector_rep (idx, r->extent (0), DIRECT);
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1194 break;
10512 aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1195 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1196 default:
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1197 retval = *this;
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1198 break;
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1199 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1200
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1201 return retval;
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1202 }
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1203
aac9f4265048 rewrite sparse indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 10491 diff changeset	1204 idx_vector
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1205 idx_vector::unmask (void) const
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1206 {
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1207 if (idx_class () == class_mask)
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1208 {
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23420 diff changeset	1209 idx_mask_rep r = dynamic_cast<idx_mask_rep > (rep);
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1210 const bool *data = r->get_data ();
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1211 octave_idx_type ext = r->extent (0);
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 18083 diff changeset	1212 octave_idx_type len = r->length (0);
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	1213 octave_idx_type *idata = new octave_idx_type [len];
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1214
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1215 for (octave_idx_type i = 0, j = 0; i < ext; i++)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1216 if (data[i])
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1217 idata[j++] = i;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1218
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23432 diff changeset	1219 ext = (len > 0 ? idata[len - 1] + 1 : 0);
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1220
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1221 return new idx_vector_rep (idata, len, ext, r->orig_dimensions (),
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1222 DIRECT);
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1223 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1224 else
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1225 return *this;
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1226 }
034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1227
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1228 void idx_vector::unconvert (idx_class_type& iclass,
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28636 diff changeset	1229 double& scalar, octave::range<double>& range,
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	1230 Array<double>& array, Array<bool>& mask) const
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1231 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1232 iclass = idx_class ();
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1233 switch (iclass)
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1234 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1235 case class_colon:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1236 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1237
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1238 case class_range:
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1239 {
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1240 idx_range_rep r = dynamic_cast<idx_range_rep > (rep);
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1241 range = r->unconvert ();
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1242 }
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1243 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1244
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1245 case class_scalar:
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1246 {
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1247 idx_scalar_rep r = dynamic_cast<idx_scalar_rep > (rep);
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1248 scalar = r->unconvert ();
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1249 }
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1250 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1251
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1252 case class_vector:
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1253 {
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1254 idx_vector_rep r = dynamic_cast<idx_vector_rep > (rep);
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1255 array = r->unconvert ();
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1256 }
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1257 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1258
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1259 case class_mask:
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1260 {
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1261 idx_mask_rep r = dynamic_cast<idx_mask_rep > (rep);
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1262 mask = r->unconvert ();
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1263 }
9879 034677ab6865 smarter treatment of mask indexing Jaroslav Hajek <highegg@gmail.com> parents: 9780 diff changeset	1264 break;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1265
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1266 default:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1267 assert (false);
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1268 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1269 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1270 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9124 diff changeset	1271
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1272 Array<octave_idx_type>
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1273 idx_vector::as_array (void) const
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1274 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1275 return rep->as_array ();
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1276 }
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1277
f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1278 bool
23592 80e3bfb7bd5a maint: Deprecate is_vector and replace with isvector. Rik <rik@octave.org> parents: 23450 diff changeset	1279 idx_vector::isvector (void) const
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1280 {
23592 80e3bfb7bd5a maint: Deprecate is_vector and replace with isvector. Rik <rik@octave.org> parents: 23450 diff changeset	1281 return idx_class () != class_vector \|\| orig_dimensions ().isvector ();
10516 f0266ee4aabe optimize some special indexing & assignment cases Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	1282 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1283
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1284 octave_idx_type
8677 095ae5e0a831 eliminte some compiler warnings John W. Eaton <jwe@octave.org> parents: 8384 diff changeset	1285 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	1286 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1287 if (! resize_ok && extent (z_len) > z_len)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1288 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1289 (*current_liboctave_error_handler)
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26415 diff changeset	1290 ("invalid matrix index = %" OCTAVE_IDX_TYPE_FORMAT, extent (z_len));
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21129 diff changeset	1291 // FIXME: Should we call this before calling error_handler?
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1292 rep->err = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1293 chkerr ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1294 }
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1552 diff changeset	1295
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1296 return length (z_len);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1297 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1298
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1299 octave_idx_type
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1300 idx_vector::ones_count () const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1301 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1302 octave_idx_type n = 0;
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1303
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1304 if (is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1305 n = 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1306 else
10487 942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1307 {
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1308 for (octave_idx_type i = 0; i < length (1); i++)
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1309 if (xelem (i) == 0)
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1310 n++;
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1311 }
942386d6d1a5 style fixes John W. Eaton <jwe@octave.org> parents: 10486 diff changeset	1312
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1313 return n;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1314 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1315
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1316 // Instantiate the octave_int constructors we want.
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1317 #define INSTANTIATE_SCALAR_VECTOR_REP_CONST(T) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1318 template OCTAVE_API idx_vector::idx_scalar_rep::idx_scalar_rep (T); \
8319 c374691576f6 Fix for MSVC compilation Michael Goffioul <michael.goffioul@gmail.com> parents: 8301 diff changeset	1319 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	1320
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1321 INSTANTIATE_SCALAR_VECTOR_REP_CONST (float)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1322 INSTANTIATE_SCALAR_VECTOR_REP_CONST (double)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1323 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int8)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1324 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int16)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1325 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int32)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1326 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int64)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1327 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint8)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1328 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint16)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1329 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint32)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 7774 diff changeset	1330 INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint64)
10620 6fb954475e21 fix off-by-1 error in idx_vector (bug #29851) Jaroslav Hajek <highegg@gmail.com> parents: 10516 diff changeset	1331
6fb954475e21 fix off-by-1 error in idx_vector (bug #29851) Jaroslav Hajek <highegg@gmail.com> parents: 10516 diff changeset	1332 /*
6fb954475e21 fix off-by-1 error in idx_vector (bug #29851) Jaroslav Hajek <highegg@gmail.com> parents: 10516 diff changeset	1333
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14138 diff changeset	1334 %!error id=Octave:index-out-of-bounds 1(find ([1,1] != 0))
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14138 diff changeset	1335 %!assert ((1:3)(find ([1,0,1] != 0)), [1,3])
10620 6fb954475e21 fix off-by-1 error in idx_vector (bug #29851) Jaroslav Hajek <highegg@gmail.com> parents: 10516 diff changeset	1336
6fb954475e21 fix off-by-1 error in idx_vector (bug #29851) Jaroslav Hajek <highegg@gmail.com> parents: 10516 diff changeset	1337 */

Mercurial > octave

annotate liboctave/array/idx-vector.cc @ 28638:98192ec1621f