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

annotate liboctave/array/idx-vector.cc @ 20574:dd6345fd8a97

use exceptions for better invalid index error reporting (bug #45957) * lo-array-gripes.h, lo-array-gripes.cc (index_exception): New base class for indexing errors. (invalid_index, out_of_range): New classes. (gripe_index_out_of_range): New overloaded function. (gripe_invalid_index): New overloaded functions. Delete version with no arguments. (gripe_invalid_assignment_size, gripe_assignment_dimension_mismatch): Delete. Change uses of gripe functions as needed. * Cell.cc (Cell::index, Cell::assign, Cell::delete_elements): Use exceptions to collect error info about and handle indexing errors. * data.cc (Fnth_element, do_accumarray_sum, F__accumarray_sum__, do_accumarray_minmax, do_accumarray_minmax_fun, F__accumdim_sum__): Likewise. * oct-map.cc (octave_map::index, octave_map::assign, octave_map::delete_elements): Likewise. * sparse.cc (Fsparse): Likewise. * sub2ind.cc (Fsub2ind, Find2sub): Likewise. New tests. * utils.cc (dims_to_numel): Likewise. * ov-base-diag.cc (octave_base_diag<DMT, MT>::do_index_op, octave_base_diag<DMT, MT>::subsasgn): Likewise. * ov-base-mat.cc (octave_base_matrix<MT>::subsref, octave_base_matrix<MT>::assign): Likewise. * ov-base-sparse.cc (octave_base_sparse<T>::do_index_op, octave_base_sparse<T>::assign, octave_base_sparse<MT>::delete_elements): Likewise. * ov-classdef.cc (cdef_object_array::subsref, cdef_object_array::subsasgn): Likewise. * ov-java.cc (make_java_index): Likewise. * ov-perm.cc (octave_perm_matrix::do_index_op): Likewise. * ov-range.cc (octave_range::do_index_op): Likewise. * ov-re-diag.cc (octave_diag_matrix::do_index_op): Likewise. * ov-str-mat.cc (octave_char_matrix_str::do_index_op_internal): Likewise. * pt-assign.cc (tree_simple_assignment::rvalue1): Likewise. * pt-idx.cc (tree_index_expression::rvalue, tree_index_expression::lvalue): Likewise. * Array-util.cc (sub2ind): Likewise. * toplev.cc (main_loop): Also catch unhandled index_exception exceptions. * ov-base.cc (octave_base_value::index_vector): Improve error message. * ov-re-sparse.cc (octave_sparse_matrix::index_vector): Likewise. * ov-complex.cc (complex_index): New class. (gripe_complex_index): New function. (octave_complex::index_vector): Use it. * pt-id.h, pt-id.cc (tree_identifier::is_variable, tree_black_hole::is_variable): Now const. * pt-idx.cc (final_index_error): New static function. (tree_index_expression::rvalue, tree_index_expression::lvalue): Use it. * index.tst: New tests.

author	Lachlan Andrew <lachlanbis@gmail.com>
date	Fri, 02 Oct 2015 15:07:37 -0400
parents	a9574e3c6e9e
children

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

Mercurial > octave-nkf

annotate liboctave/array/idx-vector.cc @ 20574:dd6345fd8a97