octave-nkf: liboctave/Array.cc annotate

annotate liboctave/Array.cc @ 10716:f7f26094021b

improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible

author	Jaroslav Hajek <highegg@gmail.com>
date	Mon, 21 Jun 2010 15:48:56 +0200
parents	5eb420d92307
children	b79924abf776

rev	line source
1993 1b57120c997b [project @ 1996-03-03 01:16:15 by jwe] jwe parents: 1989 diff changeset	1 // Template array classes
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	2 /*
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	3
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8814 diff changeset	4 Copyright (C) 2008, 2009 Jaroslav Hajek
7017 a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	5 Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2002, 2003, 2004,
a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	6 2005, 2006, 2007 John W. Eaton
9601 a9b37bae1802 add a couple of missing copyright statements Jaroslav Hajek <highegg@gmail.com> parents: 9556 diff changeset	7 Copyright (C) 2009 VZLU Prague
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	8
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	9 This file is part of Octave.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	10
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	11 Octave is free software; you can redistribute it and/or modify it
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	12 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: 6922 diff changeset	13 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6922 diff changeset	14 option) any later version.
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	15
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	16 Octave is distributed in the hope that it will be useful, but WITHOUT
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	17 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	18 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	19 for more details.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	20
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	21 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: 6922 diff changeset	22 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6922 diff changeset	23 <http://www.gnu.org/licenses/>.
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	24
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	25 */
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	26
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	27 #ifdef HAVE_CONFIG_H
1192 b6360f2d4fa6 [project @ 1995-03-30 21:38:35 by jwe] jwe parents: 1011 diff changeset	28 #include <config.h>
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	29 #endif
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	30
1367 9f9131a8d706 [project @ 1995-09-06 00:07:03 by jwe] jwe parents: 1360 diff changeset	31 #include <cassert>
4518 382cb0ed8c14 [project @ 2003-09-20 18:08:40 by jwe] jwe parents: 4517 diff changeset	32 #include <climits>
449 3cef0ce5dd7d [project @ 1994-06-05 21:58:52 by jwe] jwe parents: 386 diff changeset	33
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 2847 diff changeset	34 #include <iostream>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5632 diff changeset	35 #include <sstream>
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	36 #include <vector>
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	37 #include <algorithm>
6674 e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	38 #include <new>
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1550 diff changeset	39
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	40 #include "Array.h"
4588 19bfd295f400 [project @ 2003-11-10 17:18:48 by jwe] jwe parents: 4587 diff changeset	41 #include "Array-util.h"
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1550 diff changeset	42 #include "idx-vector.h"
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1550 diff changeset	43 #include "lo-error.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	44 #include "oct-locbuf.h"
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1550 diff changeset	45
1360 7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe] jwe parents: 1321 diff changeset	46 // One dimensional array class. Handles the reference counting for
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe] jwe parents: 1321 diff changeset	47 // all the derived classes.
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	48
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	49 template <class T>
4834 8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe] jwe parents: 4832 diff changeset	50 Array<T>::Array (const Array<T>& a, const dim_vector& dv)
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	51 : rep (a.rep), dimensions (dv),
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	52 slice_data (a.slice_data), slice_len (a.slice_len)
4834 8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe] jwe parents: 4832 diff changeset	53 {
10352 a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	54 if (dimensions.safe_numel () != a.numel ())
9731 7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	55 {
10352 a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	56 std::string dimensions_str = a.dimensions.str ();
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	57 std::string new_dims_str = dimensions.str ();
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	58
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	59 (*current_liboctave_error_handler)
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	60 ("reshape: can't reshape %s array to %s array",
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	61 dimensions_str.c_str (), new_dims_str.c_str ());
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	62 }
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	63
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	64 // This goes here because if an exception is thrown by the above,
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	65 // destructor will be never called.
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	66 rep->count++;
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	67 dimensions.chop_trailing_singletons ();
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	68 }
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	69
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	70 template <class T>
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	71 Array<T>::Array (const Array<T>& a, octave_idx_type nr, octave_idx_type nc)
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	72 : rep (a.rep), dimensions (nr, nc),
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	73 slice_data (a.slice_data), slice_len (a.slice_len)
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	74 {
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	75 if (dimensions.safe_numel () != a.numel ())
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	76 {
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	77 std::string dimensions_str = a.dimensions.str ();
a3635bc1ea19 remove Array2 Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	78 std::string new_dims_str = dimensions.str ();
9731 7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	79
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	80 (*current_liboctave_error_handler)
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	81 ("reshape: can't reshape %s array to %s array",
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	82 dimensions_str.c_str (), new_dims_str.c_str ());
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	83 }
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	84
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	85 // This goes here because if an exception is thrown by the above,
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	86 // destructor will be never called.
4834 8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe] jwe parents: 4832 diff changeset	87 rep->count++;
10095 eb8ac0eed9f1 always chop dimension vector when constructing Arrays Jaroslav Hajek <highegg@gmail.com> parents: 10075 diff changeset	88 dimensions.chop_trailing_singletons ();
4834 8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe] jwe parents: 4832 diff changeset	89 }
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe] jwe parents: 4832 diff changeset	90
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe] jwe parents: 4832 diff changeset	91 template <class T>
8524 937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	92 void
937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	93 Array<T>::fill (const T& val)
937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	94 {
937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	95 if (rep->count > 1)
937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	96 {
937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	97 --rep->count;
937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	98 rep = new ArrayRep (length (), val);
937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	99 slice_data = rep->data;
937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	100 }
937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	101 else
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	102 fill_or_memset (slice_len, val, slice_data);
8524 937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	103 }
937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	104
937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	105 template <class T>
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	106 void
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	107 Array<T>::clear (void)
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	108 {
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	109 if (--rep->count <= 0)
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	110 delete rep;
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	111
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	112 rep = nil_rep ();
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	113 rep->count++;
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	114 slice_data = rep->data;
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	115 slice_len = rep->len;
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	116
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	117 dimensions = dim_vector ();
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	118 }
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	119
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9507 diff changeset	120 template <class T>
9624 3fc7272937ce implement Array<T>::clear overloads Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	121 void
3fc7272937ce implement Array<T>::clear overloads Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	122 Array<T>::clear (const dim_vector& dv)
3fc7272937ce implement Array<T>::clear overloads Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	123 {
3fc7272937ce implement Array<T>::clear overloads Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	124 if (--rep->count <= 0)
3fc7272937ce implement Array<T>::clear overloads Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	125 delete rep;
3fc7272937ce implement Array<T>::clear overloads Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	126
9840 c0b54271904b improve safe numel() calculation for arrays Jaroslav Hajek <highegg@gmail.com> parents: 9839 diff changeset	127 rep = new ArrayRep (dv.safe_numel ());
9624 3fc7272937ce implement Array<T>::clear overloads Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	128 slice_data = rep->data;
3fc7272937ce implement Array<T>::clear overloads Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	129 slice_len = rep->len;
3fc7272937ce implement Array<T>::clear overloads Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	130
3fc7272937ce implement Array<T>::clear overloads Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	131 dimensions = dv;
10095 eb8ac0eed9f1 always chop dimension vector when constructing Arrays Jaroslav Hajek <highegg@gmail.com> parents: 10075 diff changeset	132 dimensions.chop_trailing_singletons ();
9624 3fc7272937ce implement Array<T>::clear overloads Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	133 }
3fc7272937ce implement Array<T>::clear overloads Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	134
3fc7272937ce implement Array<T>::clear overloads Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	135 template <class T>
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	136 Array<T>
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	137 Array<T>::squeeze (void) const
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	138 {
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	139 Array<T> retval = *this;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	140
4929 585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	141 if (ndims () > 2)
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	142 {
4929 585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	143 bool dims_changed = false;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	144
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	145 dim_vector new_dimensions = dimensions;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	146
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	147 int k = 0;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	148
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	149 for (int i = 0; i < ndims (); i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	150 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	151 if (dimensions(i) == 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	152 dims_changed = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	153 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	154 new_dimensions(k++) = dimensions(i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	155 }
4929 585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	156
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	157 if (dims_changed)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	158 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	159 switch (k)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	160 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	161 case 0:
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	162 new_dimensions = dim_vector (1, 1);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	163 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	164
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	165 case 1:
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	166 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	167 octave_idx_type tmp = new_dimensions(0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	168
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	169 new_dimensions.resize (2);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	170
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	171 new_dimensions(0) = tmp;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	172 new_dimensions(1) = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	173 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	174 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	175
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	176 default:
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	177 new_dimensions.resize (k);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	178 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	179 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	180 }
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	181
8524 937921654627 clean up Array and DiagArray2 Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	182 retval = Array<T> (*this, new_dimensions);
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	183 }
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	184
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	185 return retval;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	186 }
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	187
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	188 template <class T>
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	189 octave_idx_type
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	190 Array<T>::compute_index (octave_idx_type i, octave_idx_type j) const
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	191 {
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	192 return ::compute_index (i, j, dimensions);
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	193 }
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	194
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	195 template <class T>
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	196 octave_idx_type
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	197 Array<T>::compute_index (octave_idx_type i, octave_idx_type j, octave_idx_type k) const
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	198 {
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	199 return ::compute_index (i, j, k, dimensions);
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	200 }
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	201
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	202 template <class T>
8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	203 octave_idx_type
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	204 Array<T>::compute_index (const Array<octave_idx_type>& ra_idx) const
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	205 {
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	206 return ::compute_index (ra_idx, dimensions);
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	207 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	208
2049 468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe] jwe parents: 2006 diff changeset	209 template <class T>
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	210 T&
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	211 Array<T>::checkelem (octave_idx_type n)
2049 468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe] jwe parents: 2006 diff changeset	212 {
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	213 // Do checks directly to avoid recomputing slice_len.
10370 9c4daf174387 implement IDs for common liboctave exceptions Jaroslav Hajek <highegg@gmail.com> parents: 10366 diff changeset	214 if (n < 0)
9c4daf174387 implement IDs for common liboctave exceptions Jaroslav Hajek <highegg@gmail.com> parents: 10366 diff changeset	215 gripe_invalid_index ();
9c4daf174387 implement IDs for common liboctave exceptions Jaroslav Hajek <highegg@gmail.com> parents: 10366 diff changeset	216 if (n >= slice_len)
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	217 gripe_index_out_of_range (1, 1, n+1, slice_len);
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	218
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	219 return elem (n);
2049 468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe] jwe parents: 2006 diff changeset	220 }
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe] jwe parents: 2006 diff changeset	221
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3657 diff changeset	222 template <class T>
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	223 T&
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	224 Array<T>::checkelem (octave_idx_type i, octave_idx_type j)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	225 {
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	226 return elem (compute_index (i, j));
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	227 }
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	228
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	229 template <class T>
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	230 T&
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	231 Array<T>::checkelem (octave_idx_type i, octave_idx_type j, octave_idx_type k)
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	232 {
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	233 return elem (compute_index (i, j, k));
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	234 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	235
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	236 template <class T>
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	237 T&
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	238 Array<T>::checkelem (const Array<octave_idx_type>& ra_idx)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	239 {
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	240 return elem (compute_index (ra_idx));
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	241 }
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	242
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	243 template <class T>
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	244 typename Array<T>::crefT
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	245 Array<T>::checkelem (octave_idx_type n) const
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	246 {
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	247 // Do checks directly to avoid recomputing slice_len.
10370 9c4daf174387 implement IDs for common liboctave exceptions Jaroslav Hajek <highegg@gmail.com> parents: 10366 diff changeset	248 if (n < 0)
9c4daf174387 implement IDs for common liboctave exceptions Jaroslav Hajek <highegg@gmail.com> parents: 10366 diff changeset	249 gripe_invalid_index ();
9c4daf174387 implement IDs for common liboctave exceptions Jaroslav Hajek <highegg@gmail.com> parents: 10366 diff changeset	250 if (n >= slice_len)
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	251 gripe_index_out_of_range (1, 1, n+1, slice_len);
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	252
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	253 return elem (n);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	254 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	255
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	256 template <class T>
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	257 typename Array<T>::crefT
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	258 Array<T>::checkelem (octave_idx_type i, octave_idx_type j) const
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	259 {
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	260 return elem (compute_index (i, j));
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	261 }
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	262
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	263 template <class T>
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	264 typename Array<T>::crefT
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	265 Array<T>::checkelem (octave_idx_type i, octave_idx_type j, octave_idx_type k) const
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	266 {
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	267 return elem (compute_index (i, j, k));
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	268 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	269
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	270 template <class T>
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	271 typename Array<T>::crefT
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	272 Array<T>::checkelem (const Array<octave_idx_type>& ra_idx) const
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	273 {
10645 8645b7087859 abstract scalar index checking off Array<T> (prep for struct optimizations) Jaroslav Hajek <highegg@gmail.com> parents: 10636 diff changeset	274 return elem (compute_index (ra_idx));
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	275 }
9731 7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	276
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	277 template <class T>
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	278 Array<T>
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	279 Array<T>::column (octave_idx_type k) const
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	280 {
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	281 octave_idx_type r = dimensions(0);
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	282 #ifdef BOUNDS_CHECKING
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	283 if (k < 0 \|\| k > dimensions.numel (1))
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	284 gripe_index_out_of_range (2, 2, k+1, dimensions.numel (1));
9731 7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	285 #endif
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	286
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	287 return Array<T> (this, dim_vector (r, 1), kr, k*r + r);
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	288 }
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	289
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	290 template <class T>
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	291 Array<T>
9731 7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	292 Array<T>::page (octave_idx_type k) const
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	293 {
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	294 octave_idx_type r = dimensions(0), c = dimensions (1), p = r*c;
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	295 #ifdef BOUNDS_CHECKING
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	296 if (k < 0 \|\| k > dimensions.numel (2))
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	297 gripe_index_out_of_range (3, 3, k+1, dimensions.numel (2));
9731 7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	298 #endif
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	299
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	300 return Array<T> (this, dim_vector (r, c), kp, k*p + p);
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	301 }
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	302
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	303 template <class T>
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	304 Array<T>
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	305 Array<T>::linear_slice (octave_idx_type lo, octave_idx_type up) const
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	306 {
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	307 #ifdef BOUNDS_CHECKING
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	308 if (lo < 0)
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	309 gripe_index_out_of_range (1, 1, lo+1, numel ());
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	310 if (up > numel ())
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	311 gripe_index_out_of_range (1, 1, up, numel ());
9731 7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	312 #endif
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	313 if (up < lo) up = lo;
7b9cbaad68d6 extend Array<T> Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	314 return Array<T> (*this, dim_vector (up - lo, 1), lo, up);
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	315 }
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	316
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	317 // Helper class for multi-d dimension permuting (generalized transpose).
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	318 class rec_permute_helper
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	319 {
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	320 octave_idx_type dim, stride;
9012 9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	321 bool use_blk;
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	322 int top;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	323
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	324 public:
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	325 rec_permute_helper (const dim_vector& dv, const Array<octave_idx_type>& perm)
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	326 {
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	327 int n = dv.length ();
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	328 assert (n == perm.length ());
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	329
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	330 dim = new octave_idx_type [2*n];
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	331 // A hack to avoid double allocation
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	332 stride = dim + n;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	333
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	334 // Get cumulative dimensions.
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	335 OCTAVE_LOCAL_BUFFER (octave_idx_type, cdim, n+1);
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	336 cdim[0] = 1;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	337 for (int i = 1; i < n+1; i++) cdim[i] = cdim[i-1] * dv(i-1);
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	338
9012 9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	339 // Setup the permuted strides.
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	340 for (int k = 0; k < n; k++)
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	341 {
9012 9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	342 int kk = perm(k);
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	343 dim[k] = dv(kk);
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	344 stride[k] = cdim[kk];
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	345 }
9012 9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	346
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	347 // Reduce contiguous runs.
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	348 top = 0;
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	349 for (int k = 1; k < n; k++)
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	350 {
9012 9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	351 if (stride[k] == stride[top]*dim[top])
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	352 dim[top] *= dim[k];
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	353 else
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	354 {
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	355 top++;
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	356 dim[top] = dim[k];
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	357 stride[top] = stride[k];
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	358 }
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	359 }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	360
9012 9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	361 // Determine whether we can use block transposes.
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	362 use_blk = top >= 1 && stride[1] == 1 && stride[0] == dim[1];
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	363
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	364 }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	365
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	366 ~rec_permute_helper (void) { delete [] dim; }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	367
9012 9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	368 // Helper method for fast blocked transpose.
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	369 template <class T>
9121 bb62bc406ea7 reuse fast blocked transpose implementation from rec_permute_helper in Array<T>::transpose Jaroslav Hajek <highegg@gmail.com> parents: 9100 diff changeset	370 static T *
bb62bc406ea7 reuse fast blocked transpose implementation from rec_permute_helper in Array<T>::transpose Jaroslav Hajek <highegg@gmail.com> parents: 9100 diff changeset	371 blk_trans (const T src, T dest, octave_idx_type nr, octave_idx_type nc)
9012 9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	372 {
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	373 static const octave_idx_type m = 8;
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	374 OCTAVE_LOCAL_BUFFER (T, blk, m*m);
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	375 for (octave_idx_type kr = 0; kr < nr; kr += m)
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	376 for (octave_idx_type kc = 0; kc < nc; kc += m)
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	377 {
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	378 octave_idx_type lr = std::min (m, nr - kr);
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	379 octave_idx_type lc = std::min (m, nc - kc);
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	380 if (lr == m && lc == m)
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	381 {
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	382 const T ss = src + kc nr + kr;
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	383 for (octave_idx_type j = 0; j < m; j++)
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	384 for (octave_idx_type i = 0; i < m; i++)
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	385 blk[jm+i] = ss[jnr + i];
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	386 T dd = dest + kr nc + kc;
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	387 for (octave_idx_type j = 0; j < m; j++)
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	388 for (octave_idx_type i = 0; i < m; i++)
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	389 dd[jnc+i] = blk[im+j];
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	390 }
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	391 else
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	392 {
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	393 const T ss = src + kc nr + kr;
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	394 for (octave_idx_type j = 0; j < lc; j++)
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	395 for (octave_idx_type i = 0; i < lr; i++)
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	396 blk[jm+i] = ss[jnr + i];
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	397 T dd = dest + kr nc + kc;
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	398 for (octave_idx_type j = 0; j < lr; j++)
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	399 for (octave_idx_type i = 0; i < lc; i++)
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	400 dd[jnc+i] = blk[im+j];
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	401 }
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	402 }
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	403
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	404 return dest + nr*nc;
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	405 }
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	406 private:
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	407
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	408 // Recursive N-d generalized transpose
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	409 template <class T>
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	410 T do_permute (const T src, T *dest, int lev) const
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	411 {
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	412 if (lev == 0)
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	413 {
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	414 octave_idx_type step = stride[0], len = dim[0];
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	415 if (step == 1)
9773 01f897d8a130 optimize memory manipulation by arrays & indexing Jaroslav Hajek <highegg@gmail.com> parents: 9732 diff changeset	416 {
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	417 copy_or_memcpy (len, src, dest);
9773 01f897d8a130 optimize memory manipulation by arrays & indexing Jaroslav Hajek <highegg@gmail.com> parents: 9732 diff changeset	418 dest += len;
01f897d8a130 optimize memory manipulation by arrays & indexing Jaroslav Hajek <highegg@gmail.com> parents: 9732 diff changeset	419 }
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	420 else
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	421 {
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	422 for (octave_idx_type i = 0, j = 0; i < len; i++, j += step)
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	423 dest[i] = src[j];
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	424
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	425 dest += len;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	426 }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	427 }
9012 9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	428 else if (use_blk && lev == 1)
9f5e095555fc smarter algorithm for permute Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	429 dest = blk_trans (src, dest, dim[1], dim[0]);
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	430 else
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	431 {
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	432 octave_idx_type step = stride[lev], len = dim[lev];
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	433 for (octave_idx_type i = 0, j = 0; i < len; i++, j+= step)
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	434 dest = do_permute (src + i * step, dest, lev-1);
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	435 }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	436
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	437 return dest;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	438 }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	439
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	440 public:
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	441
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	442 template <class T>
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	443 void permute (const T src, T dest) const { do_permute (src, dest, top); }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	444
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	445 };
7241 da540e715d05 [project @ 2007-12-03 22:55:20 by jwe] jwe parents: 7189 diff changeset	446
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	447
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	448 template <class T>
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	449 Array<T>
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	450 Array<T>::permute (const Array<octave_idx_type>& perm_vec_arg, bool inv) const
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	451 {
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	452 Array<T> retval;
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	453
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	454 Array<octave_idx_type> perm_vec = perm_vec_arg;
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	455
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	456 dim_vector dv = dims ();
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	457
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	458 int perm_vec_len = perm_vec_arg.length ();
5148 9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	459
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	460 if (perm_vec_len < dv.length ())
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	461 (*current_liboctave_error_handler)
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	462 ("%s: invalid permutation vector", inv ? "ipermute" : "permute");
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	463
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	464 dim_vector dv_new = dim_vector::alloc (perm_vec_len);
5148 9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	465
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	466 // Append singleton dimensions as needed.
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	467 dv.resize (perm_vec_len, 1);
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	468
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	469 // Need this array to check for identical elements in permutation array.
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	470 OCTAVE_LOCAL_BUFFER_INIT (bool, checked, perm_vec_len, false);
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	471
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9624 diff changeset	472 bool identity = true;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9624 diff changeset	473
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	474 // Find dimension vector of permuted array.
5148 9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	475 for (int i = 0; i < perm_vec_len; i++)
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	476 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	477 octave_idx_type perm_elt = perm_vec.elem (i);
5148 9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	478 if (perm_elt >= perm_vec_len \|\| perm_elt < 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	479 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	480 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	481 ("%s: permutation vector contains an invalid element",
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	482 inv ? "ipermute" : "permute");
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	483
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	484 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	485 }
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	486
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	487 if (checked[perm_elt])
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	488 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	489 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	490 ("%s: permutation vector cannot contain identical elements",
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	491 inv ? "ipermute" : "permute");
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	492
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	493 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	494 }
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	495 else
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9624 diff changeset	496 {
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9624 diff changeset	497 checked[perm_elt] = true;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9624 diff changeset	498 identity = identity && perm_elt == i;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9624 diff changeset	499 }
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	500 }
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	501
9678 c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9624 diff changeset	502 if (identity)
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9624 diff changeset	503 return *this;
c929f09457b7 rewrite num2cell for speed-up + a few associated fixes Jaroslav Hajek <highegg@gmail.com> parents: 9624 diff changeset	504
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	505 if (inv)
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	506 {
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	507 for (int i = 0; i < perm_vec_len; i++)
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	508 perm_vec(perm_vec_arg(i)) = i;
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	509 }
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	510
10270 6ffed9bb5598 fix ipermute Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	511 for (int i = 0; i < perm_vec_len; i++)
6ffed9bb5598 fix ipermute Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	512 dv_new(i) = dv(perm_vec(i));
6ffed9bb5598 fix ipermute Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	513
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	514 retval = Array<T> (dv_new);
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	515
5940 0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe] jwe parents: 5837 diff changeset	516 if (numel () > 0)
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	517 {
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	518 rec_permute_helper rh (dv, perm_vec);
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	519 rh.permute (data (), retval.fortran_vec ());
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	520 }
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	521
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	522 return retval;
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	523 }
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	524
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	525 // Helper class for multi-d index reduction and recursive indexing/indexed assignment.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	526 // Rationale: we could avoid recursion using a state machine instead. However, using
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	527 // recursion is much more amenable to possible parallelization in the future.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	528 // Also, the recursion solution is cleaner and more understandable.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	529 class rec_index_helper
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	530 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	531 octave_idx_type dim, cdim;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	532 idx_vector *idx;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	533 int top;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	534
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	535 public:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	536 rec_index_helper (const dim_vector& dv, const Array<idx_vector>& ia)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	537 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	538 int n = ia.length ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	539 assert (n > 0 && (dv.length () == std::max (n, 2)));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	540
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	541 dim = new octave_idx_type [2*n];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	542 // A hack to avoid double allocation
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	543 cdim = dim + n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	544 idx = new idx_vector [n];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	545 top = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	546
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	547 dim[0] = dv(0);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	548 cdim[0] = 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	549 idx[0] = ia(0);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	550
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	551 for (int i = 1; i < n; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	552 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	553 // Try reduction...
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	554 if (idx[top].maybe_reduce (dim[top], ia(i), dv(i)))
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	555 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	556 // Reduction successful, fold dimensions.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	557 dim[top] *= dv(i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	558 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	559 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	560 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	561 // Unsuccessful, store index & cumulative dim.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	562 top++;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	563 idx[top] = ia(i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	564 dim[top] = dv(i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	565 cdim[top] = cdim[top-1] * dim[top-1];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	566 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	567 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	568 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	569
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	570 ~rec_index_helper (void) { delete [] idx; delete [] dim; }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	571
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	572 private:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	573
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	574 // Recursive N-d indexing
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	575 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	576 T do_index (const T src, T *dest, int lev) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	577 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	578 if (lev == 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	579 dest += idx[0].index (src, dim[0], dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	580 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	581 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	582 octave_idx_type n = idx[lev].length (dim[lev]), d = cdim[lev];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	583 for (octave_idx_type i = 0; i < n; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	584 dest = do_index (src + d*idx[lev].xelem (i), dest, lev-1);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	585 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	586
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	587 return dest;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	588 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	589
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	590 // Recursive N-d indexed assignment
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	591 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	592 const T do_assign (const T src, T *dest, int lev) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	593 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	594 if (lev == 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	595 src += idx[0].assign (src, dim[0], dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	596 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	597 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	598 octave_idx_type n = idx[lev].length (dim[lev]), d = cdim[lev];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	599 for (octave_idx_type i = 0; i < n; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	600 src = do_assign (src, dest + d*idx[lev].xelem (i), lev-1);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	601 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	602
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	603 return src;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	604 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	605
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	606 // Recursive N-d indexed assignment
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	607 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	608 void do_fill (const T& val, T *dest, int lev) const
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	609 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	610 if (lev == 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	611 idx[0].fill (val, dim[0], dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	612 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	613 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	614 octave_idx_type n = idx[lev].length (dim[lev]), d = cdim[lev];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	615 for (octave_idx_type i = 0; i < n; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	616 do_fill (val, dest + d*idx[lev].xelem (i), lev-1);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	617 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	618 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	619
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	620 public:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	621
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	622 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	623 void index (const T src, T dest) const { do_index (src, dest, top); }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	624
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	625 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	626 void assign (const T src, T dest) const { do_assign (src, dest, top); }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	627
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	628 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	629 void fill (const T& val, T *dest) const { do_fill (val, dest, top); }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	630
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	631 bool is_cont_range (octave_idx_type& l,
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	632 octave_idx_type& u) const
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	633 {
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	634 return top == 0 && idx[0].is_cont_range (dim[0], l, u);
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	635 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	636 };
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	637
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	638 // Helper class for multi-d recursive resizing
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	639 // This handles resize () in an efficient manner, touching memory only
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	640 // once (apart from reinitialization)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	641 class rec_resize_helper
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	642 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	643 octave_idx_type cext, sext, *dext;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	644 int n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	645
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	646 public:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	647 rec_resize_helper (const dim_vector& ndv, const dim_vector& odv)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	648 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	649 int l = ndv.length ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	650 assert (odv.length () == l);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	651 octave_idx_type ld = 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	652 int i = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	653 for (; i < l-1 && ndv(i) == odv(i); i++) ld *= ndv(i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	654 n = l - i;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	655 cext = new octave_idx_type[3*n];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	656 // Trick to avoid three allocations
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	657 sext = cext + n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	658 dext = sext + n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	659
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	660 octave_idx_type sld = ld, dld = ld;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	661 for (int j = 0; j < n; j++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	662 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	663 cext[j] = std::min (ndv(i+j), odv(i+j));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	664 sext[j] = sld *= odv(i+j);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	665 dext[j] = dld *= ndv(i+j);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	666 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	667 cext[0] *= ld;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	668 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	669
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	670 ~rec_resize_helper (void) { delete [] cext; }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	671
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	672 private:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	673 // recursive resizing
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	674 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	675 void do_resize_fill (const T* src, T *dest, const T& rfv, int lev) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	676 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	677 if (lev == 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	678 {
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	679 copy_or_memcpy (cext[0], src, dest);
6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	680 fill_or_memset (dext[0] - cext[0], rfv, dest + cext[0]);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	681 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	682 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	683 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	684 octave_idx_type sd = sext[lev-1], dd = dext[lev-1], k;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	685 for (k = 0; k < cext[lev]; k++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	686 do_resize_fill (src + k * sd, dest + k * dd, rfv, lev - 1);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	687
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	688 fill_or_memset (dext[lev] - k * dd, rfv, dest + k * dd);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	689 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	690 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	691 public:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	692 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	693 void resize_fill (const T* src, T *dest, const T& rfv) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	694 { do_resize_fill (src, dest, rfv, n-1); }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	695
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	696 };
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	697
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	698 template <class T>
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	699 Array<T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	700 Array<T>::index (const idx_vector& i) const
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	701 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	702 octave_idx_type n = numel ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	703 Array<T> retval;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	704
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	705 if (i.is_colon ())
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	706 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	707 // A(:) produces a shallow copy as a column vector.
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	708 retval = Array<T> (*this, dim_vector (n, 1));
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	709 }
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4545 diff changeset	710 else
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	711 {
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	712 if (i.extent (n) != n)
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	713 gripe_index_out_of_range (1, 1, i.extent (n), n); // throws
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	714
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	715 // FIXME -- this is the only place where orig_dimensions are used.
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	716 dim_vector rd = i.orig_dimensions ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	717 octave_idx_type il = i.length (n);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	718
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	719 // FIXME -- this is for Matlab compatibility. Matlab 2007 given
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	720 //
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	721 // b = ones(3,1)
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	722 //
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	723 // yields the following:
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	724 //
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	725 // b(zeros(0,0)) gives []
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	726 // b(zeros(1,0)) gives zeros(0,1)
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	727 // b(zeros(0,1)) gives zeros(0,1)
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	728 // b(zeros(0,m)) gives zeros(0,m)
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	729 // b(zeros(m,0)) gives zeros(m,0)
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	730 // b(1:2) gives ones(2,1)
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	731 // b(ones(2)) gives ones(2) etc.
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	732 //
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	733 // As you can see, the behaviour is weird, but the tests end up pretty
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	734 // simple. Nah, I don't want to suggest that this is ad hoc :)
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	735
9987 bb30843c4929 fix subscripting of vectors by N-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9921 diff changeset	736 if (ndims () == 2 && n != 1 && rd.is_vector ())
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	737 {
9987 bb30843c4929 fix subscripting of vectors by N-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9921 diff changeset	738 if (columns () == 1)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	739 rd = dim_vector (il, 1);
9987 bb30843c4929 fix subscripting of vectors by N-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 9921 diff changeset	740 else if (rows () == 1)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	741 rd = dim_vector (1, il);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	742 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	743
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	744 octave_idx_type l, u;
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	745 if (il != 0 && i.is_cont_range (n, l, u))
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	746 // If suitable, produce a shallow slice.
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	747 retval = Array<T> (*this, rd, l, u);
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	748 else
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	749 {
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	750 // Don't use resize here to avoid useless initialization for POD
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	751 // types.
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	752 retval = Array<T> (rd);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	753
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	754 if (il != 0)
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	755 i.index (data (), n, retval.fortran_vec ());
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	756 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	757 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	758
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	759 return retval;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	760 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	761
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	762 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	763 Array<T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	764 Array<T>::index (const idx_vector& i, const idx_vector& j) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	765 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	766 // Get dimensions, allowing Fortran indexing in the 2nd dim.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	767 dim_vector dv = dimensions.redim (2);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	768 octave_idx_type r = dv(0), c = dv(1);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	769 Array<T> retval;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	770
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	771 if (i.is_colon () && j.is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	772 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	773 // A(:,:) produces a shallow copy.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	774 retval = Array<T> (*this, dv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	775 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	776 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	777 {
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	778 if (i.extent (r) != r)
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	779 gripe_index_out_of_range (2, 1, i.extent (r), r); // throws
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	780 if (j.extent (c) != c)
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	781 gripe_index_out_of_range (2, 2, i.extent (c), c); // throws
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	782
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	783 octave_idx_type n = numel (), il = i.length (r), jl = j.length (c);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	784
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	785 idx_vector ii (i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	786
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	787 if (ii.maybe_reduce (r, j, c))
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	788 {
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	789 octave_idx_type l, u;
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	790 if (ii.length () > 0 && ii.is_cont_range (n, l, u))
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	791 // If suitable, produce a shallow slice.
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	792 retval = Array<T> (*this, dim_vector (il, jl), l, u);
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	793 else
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	794 {
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	795 // Don't use resize here to avoid useless initialization for POD types.
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	796 retval = Array<T> (dim_vector (il, jl));
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	797
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	798 ii.index (data (), n, retval.fortran_vec ());
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	799 }
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	800 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	801 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	802 {
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	803 // Don't use resize here to avoid useless initialization for POD types.
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	804 retval = Array<T> (dim_vector (il, jl));
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	805
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	806 const T* src = data ();
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	807 T *dest = retval.fortran_vec ();
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	808
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	809 for (octave_idx_type k = 0; k < jl; k++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	810 dest += i.index (src + r * j.xelem (k), r, dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	811 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	812 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	813
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	814 return retval;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	815 }
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	816
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	817 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	818 Array<T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	819 Array<T>::index (const Array<idx_vector>& ia) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	820 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	821 int ial = ia.length ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	822 Array<T> retval;
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4586 diff changeset	823
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	824 // FIXME: is this dispatching necessary?
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	825 if (ial == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	826 retval = index (ia(0));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	827 else if (ial == 2)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	828 retval = index (ia(0), ia(1));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	829 else if (ial > 0)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	830 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	831 // Get dimensions, allowing Fortran indexing in the last dim.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	832 dim_vector dv = dimensions.redim (ial);
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	833
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	834 // Check for out of bounds conditions.
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	835 bool all_colons = true;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	836 for (int i = 0; i < ial; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	837 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	838 if (ia(i).extent (dv(i)) != dv(i))
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	839 gripe_index_out_of_range (ial, i+1, ia(i).extent (dv(i)), dv(i)); // throws
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	840
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	841 all_colons = all_colons && ia(i).is_colon ();
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	842 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	843
4870 2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe] jwe parents: 4834 diff changeset	844
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	845 if (all_colons)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	846 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	847 // A(:,:,...,:) produces a shallow copy.
10095 eb8ac0eed9f1 always chop dimension vector when constructing Arrays Jaroslav Hajek <highegg@gmail.com> parents: 10075 diff changeset	848 dv.chop_trailing_singletons ();
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	849 retval = Array<T> (*this, dv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	850 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	851 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	852 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	853 // Form result dimensions.
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	854 dim_vector rdv = dim_vector::alloc (ial);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	855 for (int i = 0; i < ial; i++) rdv(i) = ia(i).length (dv(i));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	856 rdv.chop_trailing_singletons ();
4870 2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe] jwe parents: 4834 diff changeset	857
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	858 // Prepare for recursive indexing
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	859 rec_index_helper rh (dv, ia);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	860
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	861 octave_idx_type l, u;
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	862 if (rh.is_cont_range (l, u))
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	863 // If suitable, produce a shallow slice.
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	864 retval = Array<T> (*this, rdv, l, u);
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	865 else
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	866 {
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	867 // Don't use resize here to avoid useless initialization for POD types.
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	868 retval = Array<T> (rdv);
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	869
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	870 // Do it.
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	871 rh.index (data (), retval.fortran_vec ());
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	872 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	873 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	874 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	875
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	876 return retval;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	877 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	878
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	879 // The default fill value. Override if you want a different one.
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	880
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	881 template <class T>
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	882 const T& Array<T>::resize_fill_value ()
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	883 {
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	884 static T zero = T ();
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	885 return zero;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	886 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	887
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	888 // Yes, we could do resize using index & assign. However, that would
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	889 // possibly involve a lot more memory traffic than we actually need.
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	890
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	891 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	892 void
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	893 Array<T>::resize1 (octave_idx_type n, const T& rfv)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	894 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	895 if (n >= 0 && ndims () == 2)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	896 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	897 dim_vector dv;
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	898 // This is driven by Matlab's behaviour of giving a row vector
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	899 // on some out-of-bounds assignments. Specifically, Matlab
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	900 // allows a(i) with out-of-bouds i when a is either of 0x0, 1x0,
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	901 // 1x1, 0xN, and gives a row vector in all cases (yes, even the
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	902 // last one, search me why). Giving a column vector would make
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	903 // much more sense (given the way trailing singleton dims are
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	904 // treated).
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	905 bool invalid = false;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	906 if (rows () == 0 \|\| rows () == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	907 dv = dim_vector (1, n);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	908 else if (columns () == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	909 dv = dim_vector (n, 1);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	910 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	911 invalid = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	912
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	913 if (invalid)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	914 gripe_invalid_resize ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	915 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	916 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	917 octave_idx_type nx = numel ();
9100 1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	918 if (n == nx - 1 && n > 0)
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	919 {
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	920 // Stack "pop" operation.
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	921 if (rep->count == 1)
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	922 slice_data[slice_len-1] = T ();
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	923 slice_len--;
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	924 dimensions = dv;
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	925 }
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	926 else if (n == nx + 1 && nx > 0)
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	927 {
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	928 // Stack "push" operation.
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	929 if (rep->count == 1 && slice_data + slice_len < rep->data + rep->len)
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	930 {
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	931 slice_data[slice_len++] = rfv;
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	932 dimensions = dv;
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	933 }
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	934 else
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	935 {
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	936 static const octave_idx_type max_stack_chunk = 1024;
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	937 octave_idx_type nn = n + std::min (nx, max_stack_chunk);
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	938 Array<T> tmp (Array<T> (nn, 1), dv, 0, n);
9100 1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	939 T *dest = tmp.fortran_vec ();
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	940
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	941 copy_or_memcpy (nx, data (), dest);
9100 1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	942 dest[nx] = rfv;
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	943
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	944 *this = tmp;
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	945 }
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	946 }
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	947 else if (n != nx)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	948 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	949 Array<T> tmp = Array<T> (dv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	950 T *dest = tmp.fortran_vec ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	951
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	952 octave_idx_type n0 = std::min (n, nx), n1 = n - n0;
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	953 copy_or_memcpy (n0, data (), dest);
6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	954 fill_or_memset (n1, rfv, dest + n0);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	955
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	956 *this = tmp;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	957 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	958 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	959 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	960 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	961 gripe_invalid_resize ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	962 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	963
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	964 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	965 void
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	966 Array<T>::resize (octave_idx_type r, octave_idx_type c, const T& rfv)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	967 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	968 if (r >= 0 && c >= 0 && ndims () == 2)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	969 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	970 octave_idx_type rx = rows (), cx = columns ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	971 if (r != rx \|\| c != cx)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	972 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	973 Array<T> tmp = Array<T> (dim_vector (r, c));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	974 T *dest = tmp.fortran_vec ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	975
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	976 octave_idx_type r0 = std::min (r, rx), r1 = r - r0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	977 octave_idx_type c0 = std::min (c, cx), c1 = c - c0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	978 const T *src = data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	979 if (r == rx)
9773 01f897d8a130 optimize memory manipulation by arrays & indexing Jaroslav Hajek <highegg@gmail.com> parents: 9732 diff changeset	980 {
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	981 copy_or_memcpy (r * c0, src, dest);
9773 01f897d8a130 optimize memory manipulation by arrays & indexing Jaroslav Hajek <highegg@gmail.com> parents: 9732 diff changeset	982 dest += r * c0;
01f897d8a130 optimize memory manipulation by arrays & indexing Jaroslav Hajek <highegg@gmail.com> parents: 9732 diff changeset	983 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	984 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	985 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	986 for (octave_idx_type k = 0; k < c0; k++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	987 {
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	988 copy_or_memcpy (r0, src, dest);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	989 src += rx;
9773 01f897d8a130 optimize memory manipulation by arrays & indexing Jaroslav Hajek <highegg@gmail.com> parents: 9732 diff changeset	990 dest += r0;
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	991 fill_or_memset (r1, rfv, dest);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	992 dest += r1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	993 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	994 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	995
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	996 fill_or_memset (r * c1, rfv, dest);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	997
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	998 *this = tmp;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	999 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1000 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1001 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1002 gripe_invalid_resize ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1003
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1004 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1005
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1006 template<class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1007 void
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1008 Array<T>::resize (const dim_vector& dv, const T& rfv)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1009 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1010 int dvl = dv.length ();
8784 374cb30311a8 remove dead branch in Array.cc Jaroslav Hajek <highegg@gmail.com> parents: 8760 diff changeset	1011 if (dvl == 2)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1012 resize (dv(0), dv(1), rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1013 else if (dimensions != dv)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1014 {
8799 f6dc6eb57045 improve resize & resize on assignment Jaroslav Hajek <highegg@gmail.com> parents: 8784 diff changeset	1015 if (dimensions.length () <= dvl && ! dv.any_neg ())
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1016 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1017 Array<T> tmp (dv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1018 // Prepare for recursive resizing.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1019 rec_resize_helper rh (dv, dimensions.redim (dvl));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1020
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1021 // Do it.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1022 rh.resize_fill (data (), tmp.fortran_vec (), rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1023 *this = tmp;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1024 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1025 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1026 gripe_invalid_resize ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1027 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1028 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1029
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1030 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1031 Array<T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1032 Array<T>::index (const idx_vector& i, bool resize_ok, const T& rfv) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1033 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1034 Array<T> tmp = *this;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1035 if (resize_ok)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1036 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1037 octave_idx_type n = numel (), nx = i.extent (n);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1038 if (n != nx)
8563 3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1039 {
3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1040 if (i.is_scalar ())
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1041 return Array<T> (1, 1, rfv);
8563 3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1042 else
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1043 tmp.resize1 (nx, rfv);
8563 3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1044 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1045
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1046 if (tmp.numel () != nx)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1047 return Array<T> ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1048 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1049
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1050 return tmp.index (i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1051 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1052
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1053 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1054 Array<T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1055 Array<T>::index (const idx_vector& i, const idx_vector& j,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1056 bool resize_ok, const T& rfv) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1057 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1058 Array<T> tmp = *this;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1059 if (resize_ok)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1060 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1061 dim_vector dv = dimensions.redim (2);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1062 octave_idx_type r = dv(0), c = dv(1);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1063 octave_idx_type rx = i.extent (r), cx = j.extent (c);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1064 if (r != rx \|\| c != cx)
8563 3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1065 {
3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1066 if (i.is_scalar () && j.is_scalar ())
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1067 return Array<T> (1, 1, rfv);
8563 3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1068 else
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1069 tmp.resize (rx, cx, rfv);
8563 3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1070 }
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	1071
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1072 if (tmp.rows () != rx \|\| tmp.columns () != cx)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1073 return Array<T> ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1074 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1075
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1076 return tmp.index (i, j);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1077 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1078
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1079 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1080 Array<T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1081 Array<T>::index (const Array<idx_vector>& ia,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1082 bool resize_ok, const T& rfv) const
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1083 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1084 Array<T> tmp = *this;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1085 if (resize_ok)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1086 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1087 int ial = ia.length ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1088 dim_vector dv = dimensions.redim (ial);
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	1089 dim_vector dvx = dim_vector::alloc (ial);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1090 for (int i = 0; i < ial; i++) dvx(i) = ia(i).extent (dv (i));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1091 if (! (dvx == dv))
8563 3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1092 {
3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1093 bool all_scalars = true;
3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1094 for (int i = 0; i < ial; i++)
3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1095 all_scalars = all_scalars && ia(i).is_scalar ();
3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1096 if (all_scalars)
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1097 return Array<T> (1, 1, rfv);
8563 3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1098 else
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1099 tmp.resize (dvx, rfv);
8563 3a3421a9f0bb optimize resizable indexing with scalars Jaroslav Hajek <highegg@gmail.com> parents: 8527 diff changeset	1100 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1101
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1102 if (tmp.dimensions != dvx)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1103 return Array<T> ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1104 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1105
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1106 return tmp.index (ia);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1107 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1108
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1109
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1110 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1111 void
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1112 Array<T>::assign (const idx_vector& i, const Array<T>& rhs, const T& rfv)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1113 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1114 octave_idx_type n = numel (), rhl = rhs.numel ();
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4545 diff changeset	1115
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1116 if (rhl == 1 \|\| i.length (n) == rhl)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1117 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1118 octave_idx_type nx = i.extent (n);
9886 cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1119 bool colon = i.is_colon_equiv (nx);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1120 // Try to resize first if necessary.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1121 if (nx != n)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1122 {
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1123 // Optimize case A = []; A(1:n) = X with A empty.
9886 cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1124 if (dimensions.zero_by_zero () && colon)
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1125 {
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1126 if (rhl == 1)
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1127 *this = Array<T> (dim_vector (1, nx), rhs(0));
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1128 else
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1129 *this = Array<T> (rhs, dim_vector (1, nx));
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1130 return;
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1131 }
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1132
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1133 resize1 (nx, rfv);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1134 n = numel ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1135 }
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	1136
9886 cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1137 if (colon)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1138 {
9058 2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1139 // A(:) = X makes a full fill or a shallow copy.
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1140 if (rhl == 1)
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1141 fill (rhs(0));
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1142 else
9058 2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1143 *this = rhs.reshape (dimensions);
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1144 }
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1145 else
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1146 {
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1147 if (rhl == 1)
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1148 i.fill (rhs(0), n, fortran_vec ());
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1149 else
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1150 i.assign (rhs.data (), n, fortran_vec ());
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1151 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1152 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1153 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1154 gripe_invalid_assignment_size ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1155 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1156
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1157 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1158 void
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1159 Array<T>::assign (const idx_vector& i, const idx_vector& j,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1160 const Array<T>& rhs, const T& rfv)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1161 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1162 // Get RHS extents, discarding singletons.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1163 dim_vector rhdv = rhs.dims ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1164 // Get LHS extents, allowing Fortran indexing in the second dim.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1165 dim_vector dv = dimensions.redim (2);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1166 // Check for out-of-bounds and form resizing dimensions.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1167 dim_vector rdv;
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1168 // In the special when all dimensions are zero, colons are allowed
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1169 // to inquire the shape of RHS. The rules are more obscure, so we
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1170 // solve that elsewhere.
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1171 if (dv.all_zero ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1172 rdv = zero_dims_inquire (i, j, rhdv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1173 else
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1174 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1175 rdv(0) = i.extent (dv(0));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1176 rdv(1) = j.extent (dv(1));
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1177 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1178
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1179 bool isfill = rhs.numel () == 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1180 octave_idx_type il = i.length (rdv(0)), jl = j.length (rdv(1));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1181 rhdv.chop_all_singletons ();
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1182 bool match = (isfill
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1183 \|\| (rhdv.length () == 2 && il == rhdv(0) && jl == rhdv(1)));
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1184 match = match \|\| (il == 1 && jl == rhdv(0) && rhdv(1) == 1);
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4545 diff changeset	1185
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1186 if (match)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1187 {
9886 cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1188 bool all_colons = (i.is_colon_equiv (rdv(0))
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1189 && j.is_colon_equiv (rdv(1)));
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1190 // Resize if requested.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1191 if (rdv != dv)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1192 {
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1193 // Optimize case A = []; A(1:m, 1:n) = X
9886 cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1194 if (dv.zero_by_zero () && all_colons)
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1195 {
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1196 if (isfill)
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1197 *this = Array<T> (rdv, rhs(0));
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1198 else
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1199 *this = Array<T> (rhs, rdv);
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1200 return;
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1201 }
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8563 diff changeset	1202
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1203 resize (rdv, rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1204 dv = dimensions;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1205 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1206
9886 cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1207 if (all_colons)
9058 2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1208 {
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1209 // A(:,:) = X makes a full fill or a shallow copy
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1210 if (isfill)
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1211 fill (rhs(0));
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1212 else
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1213 *this = rhs.reshape (dimensions);
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1214 }
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1215 else
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1216 {
9058 2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1217 // The actual work.
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1218 octave_idx_type n = numel (), r = dv (0), c = dv (1);
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1219 idx_vector ii (i);
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1220
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1221 const T* src = rhs.data ();
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1222 T *dest = fortran_vec ();
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1223
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1224 // Try reduction first.
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1225 if (ii.maybe_reduce (r, j, c))
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1226 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1227 if (isfill)
9058 2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1228 ii.fill (*src, n, dest);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1229 else
9058 2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1230 ii.assign (src, n, dest);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1231 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1232 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1233 {
9058 2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1234 if (isfill)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1235 {
9058 2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1236 for (octave_idx_type k = 0; k < jl; k++)
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1237 i.fill (src, r, dest + r j.xelem (k));
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1238 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1239 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1240 {
9058 2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1241 for (octave_idx_type k = 0; k < jl; k++)
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1242 src += i.assign (src, r, dest + r * j.xelem (k));
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1243 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1244 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1245 }
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	1246 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1247 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1248 gripe_assignment_dimension_mismatch ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1249 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1250
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1251 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1252 void
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1253 Array<T>::assign (const Array<idx_vector>& ia,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1254 const Array<T>& rhs, const T& rfv)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1255 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1256 int ial = ia.length ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1257
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1258 // FIXME: is this dispatching necessary / desirable?
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1259 if (ial == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1260 assign (ia(0), rhs, rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1261 else if (ial == 2)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1262 assign (ia(0), ia(1), rhs, rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1263 else if (ial > 0)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1264 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1265 // Get RHS extents, discarding singletons.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1266 dim_vector rhdv = rhs.dims ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1267
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1268 // Get LHS extents, allowing Fortran indexing in the second dim.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1269 dim_vector dv = dimensions.redim (ial);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1270
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1271 // Get the extents forced by indexing.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1272 dim_vector rdv;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1273
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1274 // In the special when all dimensions are zero, colons are
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1275 // allowed to inquire the shape of RHS. The rules are more
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1276 // obscure, so we solve that elsewhere.
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1277 if (dv.all_zero ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1278 rdv = zero_dims_inquire (ia, rhdv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1279 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1280 {
9507 b096d11237be dim_vector improvements Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	1281 rdv = dim_vector::alloc (ial);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1282 for (int i = 0; i < ial; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1283 rdv(i) = ia(i).extent (dv(i));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1284 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1285
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1286 // Check whether LHS and RHS match, up to singleton dims.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1287 bool match = true, all_colons = true, isfill = rhs.numel () == 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1288
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1289 rhdv.chop_all_singletons ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1290 int j = 0, rhdvl = rhdv.length ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1291 for (int i = 0; i < ial; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1292 {
9886 cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1293 all_colons = all_colons && ia(i).is_colon_equiv (rdv(i));
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1294 octave_idx_type l = ia(i).length (rdv(i));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1295 if (l == 1) continue;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1296 match = match && j < rhdvl && l == rhdv(j++);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1297 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1298
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1299 match = match && (j == rhdvl \|\| rhdv(j) == 1);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1300 match = match \|\| isfill;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1301
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1302 if (match)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1303 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1304 // Resize first if necessary.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1305 if (rdv != dv)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1306 {
9886 cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1307 // Optimize case A = []; A(1:m, 1:n) = X
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1308 if (dv.zero_by_zero () && all_colons)
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1309 {
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1310 rdv.chop_trailing_singletons ();
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1311 if (isfill)
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1312 *this = Array<T> (rdv, rhs(0));
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1313 else
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1314 *this = Array<T> (rhs, rdv);
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1315 return;
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1316 }
cddd5c3d5f04 fix & extend special-case optimizations for indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 9878 diff changeset	1317
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1318 resize (rdv, rfv);
10095 eb8ac0eed9f1 always chop dimension vector when constructing Arrays Jaroslav Hajek <highegg@gmail.com> parents: 10075 diff changeset	1319 dv = rdv;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1320 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1321
9058 2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1322 if (all_colons)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1323 {
9058 2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1324 // A(:,:,...,:) = X makes a full fill or a shallow copy.
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1325 if (isfill)
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1326 fill (rhs(0));
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1327 else
9058 2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1328 *this = rhs.reshape (dimensions);
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1329 }
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1330 else
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1331 {
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1332 // Do the actual work.
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1333
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1334 // Prepare for recursive indexing
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1335 rec_index_helper rh (dv, ia);
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1336
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1337 // Do it.
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1338 if (isfill)
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1339 rh.fill (rhs(0), fortran_vec ());
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1340 else
2da105bf2507 remove redundant checks from Array<T>::index Jaroslav Hajek <highegg@gmail.com> parents: 9046 diff changeset	1341 rh.assign (rhs.data (), fortran_vec ());
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1342 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1343 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1344 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1345 gripe_assignment_dimension_mismatch ();
4553 c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe] jwe parents: 4548 diff changeset	1346 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1347 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1348
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1349 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1350 void
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1351 Array<T>::delete_elements (const idx_vector& i)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1352 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1353 octave_idx_type n = numel ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1354 if (i.is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1355 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1356 *this = Array<T> ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1357 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1358 else if (i.length (n) != 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1359 {
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	1360 if (i.extent (n) != n)
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	1361 gripe_del_index_out_of_range (true, i.extent (n), n);
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	1362
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1363 octave_idx_type l, u;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1364 bool col_vec = ndims () == 2 && columns () == 1 && rows () != 1;
10610 f5f6bde82e19 fix null assignment bug #29785 Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	1365 if (i.is_scalar () && i(0) == n-1 && dimensions.is_vector ())
9100 1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	1366 {
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	1367 // Stack "pop" operation.
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1368 resize1 (n-1);
9100 1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	1369 }
1a8bbfb2f7cf optimize simple stack operations on arrays Jaroslav Hajek <highegg@gmail.com> parents: 9058 diff changeset	1370 else if (i.is_cont_range (n, l, u))
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1371 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1372 // Special case deleting a contiguous range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1373 octave_idx_type m = n + l - u;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1374 Array<T> tmp (dim_vector (col_vec ? m : 1, !col_vec ? m : 1));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1375 const T *src = data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1376 T *dest = tmp.fortran_vec ();
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	1377 copy_or_memcpy (l, src, dest);
6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	1378 copy_or_memcpy (n - u, src + u, dest + l);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1379 *this = tmp;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1380 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1381 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1382 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1383 // Use index.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1384 *this = index (i.complement (n));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1385 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1386 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1387 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1388
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1389 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1390 void
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1391 Array<T>::delete_elements (int dim, const idx_vector& i)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1392 {
8302 f2e050b62199 fix dim check in Array<T>::delete_elements Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	1393 if (dim < 0 \|\| dim >= ndims ())
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1394 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1395 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1396 ("invalid dimension in delete_elements");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1397 return;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1398 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1399
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1400 octave_idx_type n = dimensions (dim);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1401 if (i.is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1402 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1403 *this = Array<T> ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1404 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1405 else if (i.length (n) != 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1406 {
10366 e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	1407 if (i.extent (n) != n)
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	1408 gripe_del_index_out_of_range (false, i.extent (n), n);
e5ae13b8b2c2 improve Array indexing error messages Jaroslav Hajek <highegg@gmail.com> parents: 10352 diff changeset	1409
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1410 octave_idx_type l, u;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1411
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1412 if (i.is_cont_range (n, l, u))
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1413 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1414 // Special case deleting a contiguous range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1415 octave_idx_type nd = n + l - u, dl = 1, du = 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1416 dim_vector rdv = dimensions;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1417 rdv(dim) = nd;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1418 for (int k = 0; k < dim; k++) dl *= dimensions(k);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1419 for (int k = dim + 1; k < ndims (); k++) du *= dimensions(k);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1420
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1421 // Special case deleting a contiguous range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1422 Array<T> tmp = Array<T> (rdv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1423 const T *src = data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1424 T *dest = tmp.fortran_vec ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1425 l = dl; u = dl; n *= dl;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1426 for (octave_idx_type k = 0; k < du; k++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1427 {
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	1428 copy_or_memcpy (l, src, dest);
9773 01f897d8a130 optimize memory manipulation by arrays & indexing Jaroslav Hajek <highegg@gmail.com> parents: 9732 diff changeset	1429 dest += l;
9780 6dafc60dde31 rename oct-mem functions Jaroslav Hajek <highegg@gmail.com> parents: 9773 diff changeset	1430 copy_or_memcpy (n - u, src + u, dest);
9773 01f897d8a130 optimize memory manipulation by arrays & indexing Jaroslav Hajek <highegg@gmail.com> parents: 9732 diff changeset	1431 dest += n - u;
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1432 src += n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1433 }
4870 2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe] jwe parents: 4834 diff changeset	1434
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1435 *this = tmp;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1436 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1437 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1438 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1439 // Use index.
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1440 Array<idx_vector> ia (ndims (), 1, idx_vector::colon);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1441 ia (dim) = i.complement (n);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1442 *this = index (ia);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1443 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1444 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1445 }
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	1446
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1447 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1448 void
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1449 Array<T>::delete_elements (const Array<idx_vector>& ia)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1450 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1451 if (ia.length () == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1452 delete_elements (ia(0));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1453 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1454 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1455 int len = ia.length (), k, dim = -1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1456 for (k = 0; k < len; k++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1457 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1458 if (! ia(k).is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1459 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1460 if (dim < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1461 dim = k;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1462 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1463 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1464 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1465 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1466 if (dim < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1467 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1468 dim_vector dv = dimensions;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1469 dv(0) = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1470 *this = Array<T> (dv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1471 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1472 else if (k == len)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1473 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1474 delete_elements (dim, ia(dim));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1475 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1476 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1477 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1478 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1479 ("A null assignment can only have one non-colon index.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1480 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1481 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1482
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1483 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1484
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1485 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1486 Array<T>&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1487 Array<T>::insert (const Array<T>& a, octave_idx_type r, octave_idx_type c)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1488 {
10115 ed49cef7e005 simplify Array::insert methods Jaroslav Hajek <highegg@gmail.com> parents: 10113 diff changeset	1489 idx_vector i (r, r + a.rows ());
ed49cef7e005 simplify Array::insert methods Jaroslav Hajek <highegg@gmail.com> parents: 10113 diff changeset	1490 idx_vector j (c, c + a.columns ());
4786 fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1491 if (ndims () == 2 && a.ndims () == 2)
10115 ed49cef7e005 simplify Array::insert methods Jaroslav Hajek <highegg@gmail.com> parents: 10113 diff changeset	1492 assign (i, j, a);
4786 fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1493 else
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1494 {
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1495 Array<idx_vector> idx (a.ndims (), 1);
10115 ed49cef7e005 simplify Array::insert methods Jaroslav Hajek <highegg@gmail.com> parents: 10113 diff changeset	1496 idx(0) = i;
ed49cef7e005 simplify Array::insert methods Jaroslav Hajek <highegg@gmail.com> parents: 10113 diff changeset	1497 idx(1) = j;
ed49cef7e005 simplify Array::insert methods Jaroslav Hajek <highegg@gmail.com> parents: 10113 diff changeset	1498 for (int k = 0; k < a.ndims (); k++)
ed49cef7e005 simplify Array::insert methods Jaroslav Hajek <highegg@gmail.com> parents: 10113 diff changeset	1499 idx(k) = idx_vector (0, a.dimensions(k));
ed49cef7e005 simplify Array::insert methods Jaroslav Hajek <highegg@gmail.com> parents: 10113 diff changeset	1500 assign (idx, a);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1501 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1502
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1503 return *this;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1504 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1505
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1506 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1507 Array<T>&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1508 Array<T>::insert (const Array<T>& a, const Array<octave_idx_type>& ra_idx)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1509 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1510 octave_idx_type n = ra_idx.length ();
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	1511 Array<idx_vector> idx (n, 1);
10115 ed49cef7e005 simplify Array::insert methods Jaroslav Hajek <highegg@gmail.com> parents: 10113 diff changeset	1512 const dim_vector dva = a.dims ().redim (n);
ed49cef7e005 simplify Array::insert methods Jaroslav Hajek <highegg@gmail.com> parents: 10113 diff changeset	1513 for (octave_idx_type k = 0; k < n; k++)
ed49cef7e005 simplify Array::insert methods Jaroslav Hajek <highegg@gmail.com> parents: 10113 diff changeset	1514 idx(k) = idx_vector (ra_idx (k), ra_idx (k) + dva(k));
ed49cef7e005 simplify Array::insert methods Jaroslav Hajek <highegg@gmail.com> parents: 10113 diff changeset	1515
ed49cef7e005 simplify Array::insert methods Jaroslav Hajek <highegg@gmail.com> parents: 10113 diff changeset	1516 assign (idx, a);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1517
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1518 return *this;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1519 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1520
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1521
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1522 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1523 Array<T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1524 Array<T>::transpose (void) const
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1525 {
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4545 diff changeset	1526 assert (ndims () == 2);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4545 diff changeset	1527
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1528 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1529 octave_idx_type nc = dim2 ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1530
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1531 if (nr >= 8 && nc >= 8)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1532 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1533 Array<T> result (dim_vector (nc, nr));
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1534
9121 bb62bc406ea7 reuse fast blocked transpose implementation from rec_permute_helper in Array<T>::transpose Jaroslav Hajek <highegg@gmail.com> parents: 9100 diff changeset	1535 // Reuse the implementation used for permuting.
bb62bc406ea7 reuse fast blocked transpose implementation from rec_permute_helper in Array<T>::transpose Jaroslav Hajek <highegg@gmail.com> parents: 9100 diff changeset	1536
bb62bc406ea7 reuse fast blocked transpose implementation from rec_permute_helper in Array<T>::transpose Jaroslav Hajek <highegg@gmail.com> parents: 9100 diff changeset	1537 rec_permute_helper::blk_trans (data (), result.fortran_vec (), nr, nc);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1538
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1539 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1540 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1541 else if (nr > 1 && nc > 1)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1542 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1543 Array<T> result (dim_vector (nc, nr));
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1544
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1545 for (octave_idx_type j = 0; j < nc; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1546 for (octave_idx_type i = 0; i < nr; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1547 result.xelem (j, i) = xelem (i, j);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1548
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1549 return result;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1550 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1551 else
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1552 {
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1553 // Fast transpose for vectors and empty matrices.
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1554 return Array<T> (*this, dim_vector (nc, nr));
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1555 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1556 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1557
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1558 template <class T>
8028 f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1559 static T
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1560 no_op_fcn (const T& x)
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1561 {
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1562 return x;
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1563 }
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1564
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1565 template <class T>
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1566 Array<T>
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1567 Array<T>::hermitian (T (*fcn) (const T&)) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1568 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1569 assert (ndims () == 2);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1570
8028 f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1571 if (! fcn)
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1572 fcn = no_op_fcn<T>;
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1573
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1574 octave_idx_type nr = dim1 ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1575 octave_idx_type nc = dim2 ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1576
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1577 if (nr >= 8 && nc >= 8)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1578 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1579 Array<T> result (dim_vector (nc, nr));
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1580
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1581 // Blocked transpose to attempt to avoid cache misses.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1582
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1583 // Don't use OCTAVE_LOCAL_BUFFER here as it doesn't work with bool
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1584 // on some compilers.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1585 T buf[64];
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1586
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1587 octave_idx_type ii = 0, jj;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1588 for (jj = 0; jj < (nc - 8 + 1); jj += 8)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1589 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1590 for (ii = 0; ii < (nr - 8 + 1); ii += 8)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1591 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1592 // Copy to buffer
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1593 for (octave_idx_type j = jj, k = 0, idxj = jj * nr;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1594 j < jj + 8; j++, idxj += nr)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1595 for (octave_idx_type i = ii; i < ii + 8; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1596 buf[k++] = xelem (i + idxj);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1597
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1598 // Copy from buffer
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1599 for (octave_idx_type i = ii, idxi = ii * nc; i < ii + 8;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1600 i++, idxi += nc)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1601 for (octave_idx_type j = jj, k = i - ii; j < jj + 8;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1602 j++, k+=8)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1603 result.xelem (j + idxi) = fcn (buf[k]);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1604 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1605
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1606 if (ii < nr)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1607 for (octave_idx_type j = jj; j < jj + 8; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1608 for (octave_idx_type i = ii; i < nr; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1609 result.xelem (j, i) = fcn (xelem (i, j));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1610 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1611
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1612 for (octave_idx_type j = jj; j < nc; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1613 for (octave_idx_type i = 0; i < nr; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1614 result.xelem (j, i) = fcn (xelem (i, j));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1615
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1616 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1617 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1618 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1619 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1620 Array<T> result (dim_vector (nc, nr));
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1621
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1622 for (octave_idx_type j = 0; j < nc; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1623 for (octave_idx_type i = 0; i < nr; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1624 result.xelem (j, i) = fcn (xelem (i, j));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1625
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1626 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1627 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1628 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1629
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1630 /*
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1631
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1632 %% Tranpose tests for matrices of the tile size and plus or minus a row
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1633 %% and with four tiles.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1634
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1635 %!shared m7, mt7, m8, mt8, m9, mt9
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1636 %! m7 = reshape (1 : 7*8, 8, 7);
7796 762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1637 %! mt7 = [1:8; 9:16; 17:24; 25:32; 33:40; 41:48; 49:56];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1638 %! m8 = reshape (1 : 8*8, 8, 8);
7796 762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1639 %! mt8 = mt8 = [mt7; 57:64];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1640 %! m9 = reshape (1 : 9*8, 8, 9);
7796 762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1641 %! mt9 = [mt8; 65:72];
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1642
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1643 %!assert(m7', mt7)
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1644 %!assert((1im7).', 1i mt7)
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1645 %!assert((1im7)', conj (1i mt7))
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1646 %!assert(m8', mt8)
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1647 %!assert((1im8).', 1i mt8)
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1648 %!assert((1im8)', conj (1i mt8))
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1649 %!assert(m9', mt9)
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1650 %!assert((1im9).', 1i mt9)
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1651 %!assert((1im9)', conj (1i mt9))
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1652 %!assert([m7, m8; m7, m8]', [mt7, mt7; mt8, mt8])
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1653 %!assert((1i[m7, m8; m7, m8]).', 1i [mt7, mt7; mt8, mt8])
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1654 %!assert((1i[m7, m8; m7, m8])', conj (1i [mt7, mt7; mt8, mt8]))
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1655 %!assert([m8, m8; m8, m8]', [mt8, mt8; mt8, mt8])
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1656 %!assert((1i[m8, m8; m8, m8]).', 1i [mt8, mt8; mt8, mt8])
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1657 %!assert((1i[m8, m8; m8, m8])', conj (1i [mt8, mt8; mt8, mt8]))
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1658 %!assert([m9, m8; m9, m8]', [mt9, mt9; mt8, mt8])
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1659 %!assert((1i[m9, m8; m9, m8]).', 1i [mt9, mt9; mt8, mt8])
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1660 %!assert((1i[m9, m8; m9, m8])', conj (1i [mt9, mt9; mt8, mt8]))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1661
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1662 */
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1663
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1664 template <class T>
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1665 T *
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1666 Array<T>::fortran_vec (void)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1667 {
6881 cd2c6a69a70d [project @ 2007-09-07 21:48:09 by jwe] jwe parents: 6867 diff changeset	1668 make_unique ();
cd2c6a69a70d [project @ 2007-09-07 21:48:09 by jwe] jwe parents: 6867 diff changeset	1669
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	1670 return slice_data;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1671 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1672
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1673 // Non-real types don't have NaNs.
4517 b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1674 template <class T>
8725 d5af326a3ede [mq]: sort-traits John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	1675 inline bool
d5af326a3ede [mq]: sort-traits John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	1676 sort_isnan (typename ref_param<T>::type)
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1677 {
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1678 return false;
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1679 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1680
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1681 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1682 Array<T>
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	1683 Array<T>::sort (int dim, sortmode mode) const
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1684 {
10703 5eb420d92307 fix sort and nth_element when trailing singleton dim is specified Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	1685 if (dim < 0)
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1686 {
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1687 (*current_liboctave_error_handler)
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1688 ("sort: invalid dimension");
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1689 return Array<T> ();
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1690 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1691
8651 ea8e65ca234f reduce memory usage in sorting Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	1692 Array<T> m (dims ());
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1693
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1694 dim_vector dv = m.dims ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1695
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1696 if (m.length () < 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1697 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1698
10703 5eb420d92307 fix sort and nth_element when trailing singleton dim is specified Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	1699 if (dim >= dv.length ())
5eb420d92307 fix sort and nth_element when trailing singleton dim is specified Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	1700 dv.resize (dim+1, 1);
5eb420d92307 fix sort and nth_element when trailing singleton dim is specified Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	1701
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1702 octave_idx_type ns = dv(dim);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1703 octave_idx_type iter = dv.numel () / ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1704 octave_idx_type stride = 1;
8505 124dd27bedae Array.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8410 diff changeset	1705
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1706 for (int i = 0; i < dim; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1707 stride *= dv(i);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1708
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1709 T *v = m.fortran_vec ();
8651 ea8e65ca234f reduce memory usage in sorting Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	1710 const T *ov = data ();
ea8e65ca234f reduce memory usage in sorting Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	1711
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1712 octave_sort<T> lsort;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1713
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1714 if (mode)
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1715 lsort.set_compare (mode);
7463 2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7443 diff changeset	1716 else
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1717 return m;
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1718
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1719 if (stride == 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1720 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1721 for (octave_idx_type j = 0; j < iter; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1722 {
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1723 // copy and partition out NaNs.
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1724 // FIXME: impact on integer types noticeable?
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1725 octave_idx_type kl = 0, ku = ns;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1726 for (octave_idx_type i = 0; i < ns; i++)
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1727 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1728 T tmp = ov[i];
8725 d5af326a3ede [mq]: sort-traits John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	1729 if (sort_isnan<T> (tmp))
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1730 v[--ku] = tmp;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1731 else
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1732 v[kl++] = tmp;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1733 }
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1734
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1735 // sort.
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1736 lsort.sort (v, kl);
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1737
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1738 if (ku < ns)
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1739 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1740 // NaNs are in reverse order
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1741 std::reverse (v + ku, v + ns);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1742 if (mode == DESCENDING)
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1743 std::rotate (v, v + ku, v + ns);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1744 }
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1745
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1746 v += ns;
8651 ea8e65ca234f reduce memory usage in sorting Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	1747 ov += ns;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1748 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1749 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1750 else
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1751 {
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1752 OCTAVE_LOCAL_BUFFER (T, buf, ns);
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1753
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1754 for (octave_idx_type j = 0; j < iter; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1755 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1756 octave_idx_type offset = j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1757 octave_idx_type offset2 = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1758
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1759 while (offset >= stride)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1760 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1761 offset -= stride;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1762 offset2++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1763 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1764
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1765 offset += offset2 * stride * ns;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1766
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1767 // gather and partition out NaNs.
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1768 // FIXME: impact on integer types noticeable?
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1769 octave_idx_type kl = 0, ku = ns;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1770 for (octave_idx_type i = 0; i < ns; i++)
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1771 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1772 T tmp = ov[i*stride + offset];
8725 d5af326a3ede [mq]: sort-traits John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	1773 if (sort_isnan<T> (tmp))
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1774 buf[--ku] = tmp;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1775 else
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1776 buf[kl++] = tmp;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1777 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1778
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1779 // sort.
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1780 lsort.sort (buf, kl);
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1781
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1782 if (ku < ns)
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1783 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1784 // NaNs are in reverse order
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1785 std::reverse (buf + ku, buf + ns);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1786 if (mode == DESCENDING)
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1787 std::rotate (buf, buf + ku, buf + ns);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1788 }
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1789
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1790 // scatter.
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1791 for (octave_idx_type i = 0; i < ns; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1792 v[i*stride + offset] = buf[i];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1793 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1794 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1795
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1796 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1797 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1798
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1799 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1800 Array<T>
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	1801 Array<T>::sort (Array<octave_idx_type> &sidx, int dim,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1802 sortmode mode) const
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1803 {
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1804 if (dim < 0 \|\| dim >= ndims ())
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1805 {
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1806 (*current_liboctave_error_handler)
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1807 ("sort: invalid dimension");
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1808 return Array<T> ();
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1809 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1810
8651 ea8e65ca234f reduce memory usage in sorting Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	1811 Array<T> m (dims ());
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1812
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1813 dim_vector dv = m.dims ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1814
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1815 if (m.length () < 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1816 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1817 sidx = Array<octave_idx_type> (dv);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1818 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1819 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1820
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1821 octave_idx_type ns = dv(dim);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1822 octave_idx_type iter = dv.numel () / ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1823 octave_idx_type stride = 1;
8505 124dd27bedae Array.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8410 diff changeset	1824
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1825 for (int i = 0; i < dim; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1826 stride *= dv(i);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1827
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1828 T *v = m.fortran_vec ();
8651 ea8e65ca234f reduce memory usage in sorting Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	1829 const T *ov = data ();
ea8e65ca234f reduce memory usage in sorting Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	1830
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1831 octave_sort<T> lsort;
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1832
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1833 sidx = Array<octave_idx_type> (dv);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1834 octave_idx_type *vi = sidx.fortran_vec ();
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1835
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1836 if (mode)
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1837 lsort.set_compare (mode);
7463 2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7443 diff changeset	1838 else
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1839 return m;
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1840
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1841 if (stride == 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1842 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1843 for (octave_idx_type j = 0; j < iter; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1844 {
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1845 // copy and partition out NaNs.
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1846 // FIXME: impact on integer types noticeable?
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1847 octave_idx_type kl = 0, ku = ns;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1848 for (octave_idx_type i = 0; i < ns; i++)
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1849 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1850 T tmp = ov[i];
8725 d5af326a3ede [mq]: sort-traits John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	1851 if (sort_isnan<T> (tmp))
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1852 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1853 --ku;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1854 v[ku] = tmp;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1855 vi[ku] = i;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1856 }
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1857 else
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1858 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1859 v[kl] = tmp;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1860 vi[kl] = i;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1861 kl++;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1862 }
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1863 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1864
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1865 // sort.
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1866 lsort.sort (v, vi, kl);
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1867
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1868 if (ku < ns)
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1869 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1870 // NaNs are in reverse order
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1871 std::reverse (v + ku, v + ns);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1872 std::reverse (vi + ku, vi + ns);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1873 if (mode == DESCENDING)
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1874 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1875 std::rotate (v, v + ku, v + ns);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1876 std::rotate (vi, vi + ku, vi + ns);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1877 }
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1878 }
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1879
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1880 v += ns;
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1881 vi += ns;
8651 ea8e65ca234f reduce memory usage in sorting Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	1882 ov += ns;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1883 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1884 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1885 else
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1886 {
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1887 OCTAVE_LOCAL_BUFFER (T, buf, ns);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1888 OCTAVE_LOCAL_BUFFER (octave_idx_type, bufi, ns);
8651 ea8e65ca234f reduce memory usage in sorting Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	1889
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1890 for (octave_idx_type j = 0; j < iter; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1891 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1892 octave_idx_type offset = j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1893 octave_idx_type offset2 = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1894
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1895 while (offset >= stride)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1896 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1897 offset -= stride;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1898 offset2++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1899 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1900
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1901 offset += offset2 * stride * ns;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1902
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1903 // gather and partition out NaNs.
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1904 // FIXME: impact on integer types noticeable?
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1905 octave_idx_type kl = 0, ku = ns;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1906 for (octave_idx_type i = 0; i < ns; i++)
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1907 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1908 T tmp = ov[i*stride + offset];
8725 d5af326a3ede [mq]: sort-traits John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	1909 if (sort_isnan<T> (tmp))
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1910 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1911 --ku;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1912 buf[ku] = tmp;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1913 bufi[ku] = i;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1914 }
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1915 else
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1916 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1917 buf[kl] = tmp;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1918 bufi[kl] = i;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1919 kl++;
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1920 }
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1921 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1922
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1923 // sort.
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1924 lsort.sort (buf, bufi, kl);
8700 314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1925
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1926 if (ku < ns)
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1927 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1928 // NaNs are in reverse order
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1929 std::reverse (buf + ku, buf + ns);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1930 std::reverse (bufi + ku, bufi + ns);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1931 if (mode == DESCENDING)
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1932 {
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1933 std::rotate (buf, buf + ku, buf + ns);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1934 std::rotate (bufi, bufi + ku, bufi + ns);
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1935 }
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1936 }
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1937
314be237cd5b sorting optimizations Jaroslav Hajek <highegg@gmail.com> parents: 8651 diff changeset	1938 // scatter.
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1939 for (octave_idx_type i = 0; i < ns; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1940 v[i*stride + offset] = buf[i];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1941 for (octave_idx_type i = 0; i < ns; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1942 vi[i*stride + offset] = bufi[i];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1943 }
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1944 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1945
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1946 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1947 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1948
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	1949 template <class T>
8725 d5af326a3ede [mq]: sort-traits John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	1950 typename Array<T>::compare_fcn_type
9920 56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1951 safe_comparator (sortmode mode, const Array<T>& /* a */,
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1952 bool /* allow_chk */)
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1953 {
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1954 if (mode == ASCENDING)
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1955 return octave_sort<T>::ascending_compare;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1956 else if (mode == DESCENDING)
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1957 return octave_sort<T>::descending_compare;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1958 else
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1959 return 0;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1960 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1961
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1962 template <class T>
9920 56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1963 sortmode
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1964 Array<T>::is_sorted (sortmode mode) const
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1965 {
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1966 octave_sort<T> lsort;
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1967
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1968 octave_idx_type n = numel ();
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1969
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1970 if (n <= 1)
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1971 return mode ? mode : ASCENDING;
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1972
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1973 if (! mode)
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1974 {
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1975 // Auto-detect mode.
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1976 compare_fcn_type compare
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	1977 = safe_comparator (ASCENDING, *this, false);
9920 56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1978
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1979 if (compare (elem (n-1), elem (0)))
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1980 mode = DESCENDING;
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1981 else
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1982 mode = ASCENDING;
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1983 }
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1984
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1985 if (mode)
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1986 {
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1987 lsort.set_compare (safe_comparator (mode, *this, false));
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1988
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1989 if (! lsort.is_sorted (data (), n))
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1990 mode = UNSORTED;
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1991 }
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1992
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1993 return mode;
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1994
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1995 }
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1996
56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	1997 template <class T>
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1998 Array<octave_idx_type>
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	1999 Array<T>::sort_rows_idx (sortmode mode) const
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2000 {
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2001 Array<octave_idx_type> idx;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2002
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2003 octave_sort<T> lsort (safe_comparator (mode, *this, true));
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2004
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2005 octave_idx_type r = rows (), c = cols ();
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2006
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	2007 idx = Array<octave_idx_type> (r, 1);
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2008
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2009 lsort.sort_rows (data (), idx.fortran_vec (), r, c);
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2010
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2011 return idx;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2012 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2013
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2014
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2015 template <class T>
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2016 sortmode
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2017 Array<T>::is_sorted_rows (sortmode mode) const
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2018 {
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2019 octave_sort<T> lsort;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2020
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2021 octave_idx_type r = rows (), c = cols ();
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2022
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2023 if (r <= 1 \|\| c == 0)
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2024 return mode ? mode : ASCENDING;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2025
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2026 if (! mode)
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2027 {
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2028 // Auto-detect mode.
8725 d5af326a3ede [mq]: sort-traits John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	2029 compare_fcn_type compare
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2030 = safe_comparator (ASCENDING, *this, false);
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2031
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2032 octave_idx_type i;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2033 for (i = 0; i < cols (); i++)
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2034 {
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2035 T l = elem (0, i), u = elem (rows () - 1, i);
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2036 if (compare (l, u))
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2037 {
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2038 if (mode == DESCENDING)
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2039 {
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2040 mode = UNSORTED;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2041 break;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2042 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2043 else
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2044 mode = ASCENDING;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2045 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2046 else if (compare (u, l))
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2047 {
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2048 if (mode == ASCENDING)
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2049 {
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2050 mode = UNSORTED;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2051 break;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2052 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2053 else
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2054 mode = DESCENDING;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2055 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2056 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2057 if (! mode && i == cols ())
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2058 mode = ASCENDING;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2059 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2060
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2061 if (mode)
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2062 {
9920 56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	2063 lsort.set_compare (safe_comparator (mode, *this, false));
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2064
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2065 if (! lsort.is_sorted_rows (data (), r, c))
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2066 mode = UNSORTED;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2067 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2068
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2069 return mode;
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2070
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2071 }
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2072
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2073 // Do a binary lookup in a sorted array.
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2074 template <class T>
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2075 octave_idx_type
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2076 Array<T>::lookup (const T& value, sortmode mode) const
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2077 {
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2078 octave_idx_type n = numel ();
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2079 octave_sort<T> lsort;
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2080
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2081 if (mode == UNSORTED)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2082 {
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2083 // auto-detect mode
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2084 if (n > 1 && lsort.descending_compare (elem (0), elem (n-1)))
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2085 mode = DESCENDING;
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2086 else
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2087 mode = ASCENDING;
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2088 }
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2089
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2090 lsort.set_compare (mode);
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2091
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2092 return lsort.lookup (data (), n, value);
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2093 }
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2094
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2095 template <class T>
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2096 Array<octave_idx_type>
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2097 Array<T>::lookup (const Array<T>& values, sortmode mode) const
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2098 {
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2099 octave_idx_type n = numel (), nval = values.numel ();
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2100 octave_sort<T> lsort;
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2101 Array<octave_idx_type> idx (values.dims ());
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2102
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2103 if (mode == UNSORTED)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2104 {
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2105 // auto-detect mode
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2106 if (n > 1 && lsort.descending_compare (elem (0), elem (n-1)))
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2107 mode = DESCENDING;
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2108 else
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2109 mode = ASCENDING;
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2110 }
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2111
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2112 lsort.set_compare (mode);
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2113
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2114 // This determines the split ratio between the O(M*log2(N)) and O(M+N) algorithms.
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2115 static const double ratio = 1.0;
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2116 sortmode vmode = UNSORTED;
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2117
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2118 // Attempt the O(M+N) algorithm if M is large enough.
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2119 if (nval > ratio * n / xlog2 (n + 1.0))
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2120 {
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2121 vmode = values.is_sorted ();
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2122 // The table must not contain a NaN.
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2123 if ((vmode == ASCENDING && sort_isnan<T> (values(nval-1)))
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2124 \|\| (vmode == DESCENDING && sort_isnan<T> (values(0))))
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2125 vmode = UNSORTED;
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2126 }
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2127
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2128 if (vmode != UNSORTED)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2129 lsort.lookup_sorted (data (), n, values.data (), nval,
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2130 idx.fortran_vec (), vmode != mode);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2131 else
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2132 lsort.lookup (data (), n, values.data (), nval, idx.fortran_vec ());
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2133
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2134 return idx;
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2135 }
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2136
9025 484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2137 template <class T>
9878 ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2138 octave_idx_type
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2139 Array<T>::nnz (void) const
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2140 {
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2141 const T *src = data ();
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2142 octave_idx_type nel = nelem (), retval = 0;
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2143 const T zero = T ();
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2144 for (octave_idx_type i = 0; i < nel; i++)
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2145 if (src[i] != zero)
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2146 retval++;
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2147
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2148 return retval;
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2149 }
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2150
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2151 template <class T>
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9310 diff changeset	2152 Array<octave_idx_type>
9025 484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2153 Array<T>::find (octave_idx_type n, bool backward) const
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2154 {
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2155 Array<octave_idx_type> retval;
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2156 const T *src = data ();
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2157 octave_idx_type nel = nelem ();
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2158 const T zero = T ();
9310 256c0db275b6 fix behavior of find Jaroslav Hajek <highegg@gmail.com> parents: 9237 diff changeset	2159 if (n < 0 \|\| n >= nel)
9025 484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2160 {
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2161 // We want all elements, which means we'll almost surely need
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2162 // to resize. So count first, then allocate array of exact size.
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2163 octave_idx_type cnt = 0;
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2164 for (octave_idx_type i = 0; i < nel; i++)
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2165 cnt += src[i] != zero;
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2166
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	2167 retval.clear (cnt, 1);
9025 484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2168 octave_idx_type *dest = retval.fortran_vec ();
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2169 for (octave_idx_type i = 0; i < nel; i++)
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2170 if (src[i] != zero) *dest++ = i;
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2171 }
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2172 else
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2173 {
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2174 // We want a fixed max number of elements, usually small. So be
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2175 // optimistic, alloc the array in advance, and then resize if
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2176 // needed.
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	2177 retval.clear (n, 1);
9025 484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2178 if (backward)
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2179 {
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2180 // Do the search as a series of successive single-element searches.
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2181 octave_idx_type k = 0, l = nel - 1;
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2182 for (; k < n; k++)
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2183 {
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2184 for (;l >= 0 && src[l] == zero; l--) ;
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2185 if (l >= 0)
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2186 retval(k) = l--;
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2187 else
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2188 break;
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2189 }
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2190 if (k < n)
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	2191 retval.resize (k, 1);
9310 256c0db275b6 fix behavior of find Jaroslav Hajek <highegg@gmail.com> parents: 9237 diff changeset	2192 octave_idx_type *rdata = retval.fortran_vec ();
256c0db275b6 fix behavior of find Jaroslav Hajek <highegg@gmail.com> parents: 9237 diff changeset	2193 std::reverse (rdata, rdata + k);
9025 484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2194 }
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2195 else
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2196 {
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2197 // Do the search as a series of successive single-element searches.
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2198 octave_idx_type k = 0, l = 0;
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2199 for (; k < n; k++)
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2200 {
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2201 for (;l != nel && src[l] == zero; l++) ;
9029 2df28ad88b0e small fix in Array::find Jaroslav Hajek <highegg@gmail.com> parents: 9025 diff changeset	2202 if (l != nel)
9025 484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2203 retval(k) = l++;
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2204 else
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2205 break;
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2206 }
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2207 if (k < n)
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	2208 retval.resize (k, 1);
9025 484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2209 }
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2210 }
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2211
9046 88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2212 // Fixup return dimensions, for Matlab compatibility.
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2213 // find(zeros(0,0)) -> zeros(0,0)
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2214 // find(zeros(1,0)) -> zeros(1,0)
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2215 // find(zeros(0,1)) -> zeros(0,1)
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2216 // find(zeros(0,X)) -> zeros(0,1)
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2217 // find(zeros(1,1)) -> zeros(0,0) !!!! WHY?
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2218 // find(zeros(0,1,0)) -> zeros(0,0)
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2219 // find(zeros(0,1,0,1)) -> zeros(0,0) etc
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2220
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2221 if ((numel () == 1 && retval.is_empty ())
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2222 \|\| (rows () == 0 && dims ().numel (1) == 0))
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2223 retval.dimensions = dim_vector ();
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2224 else if (rows () == 1 && ndims () == 2)
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2225 retval.dimensions = dim_vector (1, retval.length ());
88bf56bbccca make Array::find already return Matlab-compatible dimensions Jaroslav Hajek <highegg@gmail.com> parents: 9029 diff changeset	2226
9025 484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2227 return retval;
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2228 }
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2229
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2230 template <class T>
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2231 Array<T>
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2232 Array<T>::nth_element (const idx_vector& n, int dim) const
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2233 {
10703 5eb420d92307 fix sort and nth_element when trailing singleton dim is specified Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	2234 if (dim < 0)
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2235 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2236 (*current_liboctave_error_handler)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2237 ("nth_element: invalid dimension");
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2238 return Array<T> ();
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2239 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2240
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2241 dim_vector dv = dims ();
10703 5eb420d92307 fix sort and nth_element when trailing singleton dim is specified Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	2242 if (dim >= dv.length ())
5eb420d92307 fix sort and nth_element when trailing singleton dim is specified Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	2243 dv.resize (dim+1, 1);
5eb420d92307 fix sort and nth_element when trailing singleton dim is specified Jaroslav Hajek <highegg@gmail.com> parents: 10681 diff changeset	2244
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2245 octave_idx_type ns = dv(dim);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2246
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2247 octave_idx_type nn = n.length (ns);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2248
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2249 dv(dim) = std::min (nn, ns);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2250 dv.chop_trailing_singletons ();
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2251
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2252 Array<T> m (dv);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2253
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2254 if (m.numel () == 0)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2255 return m;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2256
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2257 sortmode mode = UNSORTED;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2258 octave_idx_type lo = 0;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2259
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2260 switch (n.idx_class ())
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2261 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2262 case idx_vector::class_scalar:
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2263 mode = ASCENDING;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2264 lo = n(0);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2265 break;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2266 case idx_vector::class_range:
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2267 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2268 octave_idx_type inc = n.increment ();
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2269 if (inc == 1)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2270 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2271 mode = ASCENDING;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2272 lo = n(0);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2273 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2274 else if (inc == -1)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2275 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2276 mode = DESCENDING;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2277 lo = ns - 1 - n(0);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2278 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2279 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2280 default:
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2281 break;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2282 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2283
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2284 if (mode == UNSORTED)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2285 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2286 (*current_liboctave_error_handler)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2287 ("nth_element: n must be a scalar or a contiguous range");
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2288 return Array<T> ();
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2289 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2290
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2291 octave_idx_type up = lo + nn;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2292
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2293 if (lo < 0 \|\| up > ns)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2294 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2295 (*current_liboctave_error_handler)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2296 ("nth_element: invalid element index");
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2297 return Array<T> ();
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2298 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2299
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2300 octave_idx_type iter = numel () / ns;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2301 octave_idx_type stride = 1;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2302
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2303 for (int i = 0; i < dim; i++)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2304 stride *= dv(i);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2305
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2306 T *v = m.fortran_vec ();
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2307 const T *ov = data ();
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2308
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2309 OCTAVE_LOCAL_BUFFER (T, buf, ns);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2310
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2311 octave_sort<T> lsort;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2312 lsort.set_compare (mode);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2313
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2314 for (octave_idx_type j = 0; j < iter; j++)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2315 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2316 octave_idx_type kl = 0, ku = ns;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2317
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2318 if (stride == 1)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2319 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2320 // copy without NaNs.
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2321 // FIXME: impact on integer types noticeable?
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2322 for (octave_idx_type i = 0; i < ns; i++)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2323 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2324 T tmp = ov[i];
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2325 if (sort_isnan<T> (tmp))
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2326 buf[--ku] = tmp;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2327 else
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2328 buf[kl++] = tmp;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2329 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2330
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2331 ov += ns;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2332 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2333 else
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2334 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2335 octave_idx_type offset = j % stride;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2336 // copy without NaNs.
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2337 // FIXME: impact on integer types noticeable?
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2338 for (octave_idx_type i = 0; i < ns; i++)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2339 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2340 T tmp = ov[offset + i*stride];
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2341 if (sort_isnan<T> (tmp))
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2342 buf[--ku] = tmp;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2343 else
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2344 buf[kl++] = tmp;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2345 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2346
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2347 if (offset == stride-1)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2348 ov += ns*stride;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2349 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2350
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2351 if (ku == ns)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2352 lsort.nth_element (buf, ns, lo, up);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2353 else if (mode == ASCENDING)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2354 lsort.nth_element (buf, ku, lo, std::min (ku, up));
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2355 else
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2356 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2357 octave_idx_type nnan = ns - ku;
10258 e317791645c4 64-bit fixes John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2358 octave_idx_type zero = 0;
e317791645c4 64-bit fixes John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2359 lsort.nth_element (buf, ku, std::max (lo - nnan, zero),
e317791645c4 64-bit fixes John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	2360 std::max (up - nnan, zero));
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2361 std::rotate (buf, buf + ku, buf + ns);
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2362 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2363
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2364 if (stride == 1)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2365 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2366 for (octave_idx_type i = 0; i < nn; i++)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2367 v[i] = buf[lo + i];
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2368
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2369 v += nn;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2370 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2371 else
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2372 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2373 octave_idx_type offset = j % stride;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2374 for (octave_idx_type i = 0; i < nn; i++)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2375 v[offset + stride * i] = buf[lo + i];
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2376 if (offset == stride-1)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2377 v += nn*stride;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2378 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2379 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2380
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2381 return m;
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2382 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2383
9025 484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2384
9237 3c1762c7e787 Add missing xxx_API decoration and remove misplaced ones Michael Goffioul <michael.goffioul@gmail.com> parents: 9222 diff changeset	2385 #define INSTANTIATE_ARRAY_SORT(T) template class OCTAVE_API octave_sort<T>;
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2386
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2387 #define NO_INSTANTIATE_ARRAY_SORT(T) \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2388 \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2389 template <> Array<T> \
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2390 Array<T>::sort (int, sortmode) const { return *this; } \
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2391 \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2392 template <> Array<T> \
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2393 Array<T>::sort (Array<octave_idx_type> &sidx, int, sortmode) const \
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2394 { sidx = Array<octave_idx_type> (); return *this; } \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2395 \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2396 template <> sortmode \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2397 Array<T>::is_sorted (sortmode) const \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2398 { return UNSORTED; } \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2399 \
8725 d5af326a3ede [mq]: sort-traits John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	2400 Array<T>::compare_fcn_type \
9920 56fbe170d354 fix issorted with NaNs in middle Jaroslav Hajek <highegg@gmail.com> parents: 9886 diff changeset	2401 safe_comparator (sortmode, const Array<T>&, bool) \
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2402 { return 0; } \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2403 \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2404 template <> Array<octave_idx_type> \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2405 Array<T>::sort_rows_idx (sortmode) const \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2406 { return Array<octave_idx_type> (); } \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2407 \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2408 template <> sortmode \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2409 Array<T>::is_sorted_rows (sortmode) const \
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2410 { return UNSORTED; } \
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2411 \
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2412 template <> octave_idx_type \
9222 7bd406e12e4d instantiate Array<void > in liboctave Jaroslav Hajek <highegg@gmail.com>* parents: 9201 diff changeset	2413 Array<T>::lookup (T const &, sortmode) const \
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2414 { return 0; } \
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2415 template <> Array<octave_idx_type> \
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9920 diff changeset	2416 Array<T>::lookup (const Array<T>&, sortmode) const \
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8799 diff changeset	2417 { return Array<octave_idx_type> (); } \
9878 ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2418 \
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2419 template <> octave_idx_type \
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2420 Array<T>::nnz (void) const\
ead4f9c82a9a implement Array<T>::nnz Jaroslav Hajek <highegg@gmail.com> parents: 9840 diff changeset	2421 { return 0; } \
9025 484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2422 template <> Array<octave_idx_type> \
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2423 Array<T>::find (octave_idx_type, bool) const\
484756d558d6 add Array<T>::find Jaroslav Hajek <highegg@gmail.com> parents: 9012 diff changeset	2424 { return Array<octave_idx_type> (); } \
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2425 \
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2426 template <> Array<T> \
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9678 diff changeset	2427 Array<T>::nth_element (const idx_vector&, int) const { return Array<T> (); } \
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2428
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2429
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2430 template <class T>
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2431 Array<T>
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2432 Array<T>::diag (octave_idx_type k) const
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2433 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2434 dim_vector dv = dims ();
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2435 octave_idx_type nd = dv.length ();
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2436 Array<T> d;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2437
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2438 if (nd > 2)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2439 (*current_liboctave_error_handler) ("Matrix must be 2-dimensional");
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2440 else
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2441 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2442 octave_idx_type nnr = dv (0);
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2443 octave_idx_type nnc = dv (1);
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2444
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2445 if (nnr == 0 \|\| nnc == 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2446 ; // do nothing
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2447 else if (nnr != 1 && nnc != 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2448 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2449 if (k > 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2450 nnc -= k;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2451 else if (k < 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2452 nnr += k;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2453
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2454 if (nnr > 0 && nnc > 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2455 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2456 octave_idx_type ndiag = (nnr < nnc) ? nnr : nnc;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2457
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2458 d.resize (dim_vector (ndiag, 1));
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2459
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2460 if (k > 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2461 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2462 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2463 d.xelem (i) = elem (i, i+k);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2464 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2465 else if (k < 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2466 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2467 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2468 d.xelem (i) = elem (i-k, i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2469 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2470 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2471 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2472 for (octave_idx_type i = 0; i < ndiag; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2473 d.xelem (i) = elem (i, i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2474 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2475 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2476 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2477 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2478 ("diag: requested diagonal out of range");
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2479 }
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2480 else if (nnr != 0 && nnc != 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2481 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2482 octave_idx_type roff = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2483 octave_idx_type coff = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2484 if (k > 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2485 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2486 roff = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2487 coff = k;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2488 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2489 else if (k < 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2490 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2491 roff = -k;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2492 coff = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2493 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2494
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2495 if (nnr == 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2496 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2497 octave_idx_type n = nnc + std::abs (k);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2498 d = Array<T> (dim_vector (n, n), resize_fill_value ());
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2499
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2500 for (octave_idx_type i = 0; i < nnc; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2501 d.xelem (i+roff, i+coff) = elem (0, i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2502 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2503 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2504 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2505 octave_idx_type n = nnr + std::abs (k);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2506 d = Array<T> (dim_vector (n, n), resize_fill_value ());
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2507
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2508 for (octave_idx_type i = 0; i < nnr; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2509 d.xelem (i+roff, i+coff) = elem (i, 0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2510 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2511 }
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2512 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2513
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2514 return d;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2515 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2516
4517 b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	2517 template <class T>
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2518 Array<T>
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2519 Array<T>::cat (int dim, octave_idx_type n, const Array<T> *array_list)
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2520 {
10716 f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2521 // Default concatenation.
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2522 bool (dim_vector::*concat_rule) (const dim_vector&, int) = &dim_vector::concat;
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2523
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2524 if (dim == -1 \|\| dim == -2)
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2525 {
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2526 concat_rule = &dim_vector::hvcat;
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2527 dim = -dim - 1;
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2528 }
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2529 else if (dim < 0)
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2530 (*current_liboctave_error_handler)
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2531 ("cat: invalid dimension");
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2532
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10533 diff changeset	2533 if (n == 1)
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10533 diff changeset	2534 return array_list[0];
10681 0ba9bd294421 make cat() (hopefully) more matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10674 diff changeset	2535 else if (n == 0)
0ba9bd294421 make cat() (hopefully) more matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10674 diff changeset	2536 return Array<T> ();
0ba9bd294421 make cat() (hopefully) more matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10674 diff changeset	2537
0ba9bd294421 make cat() (hopefully) more matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10674 diff changeset	2538 dim_vector dv = array_list[0].dims ();
10716 f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2539
10681 0ba9bd294421 make cat() (hopefully) more matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10674 diff changeset	2540 for (octave_idx_type i = 1; i < n; i++)
10716 f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2541 if (! (dv.*concat_rule) (array_list[i].dims (), dim))
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2542 (*current_liboctave_error_handler)
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2543 ("cat: dimension mismatch");
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2544
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2545 Array<T> retval (dv);
10716 f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2546
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2547 if (retval.is_empty ())
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2548 return retval;
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2549
10533 f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2550 int nidx = std::max (dv.length (), dim + 1);
f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2551 Array<idx_vector> idxa (nidx, 1, idx_vector::colon);
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2552 octave_idx_type l = 0;
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2553
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2554 for (octave_idx_type i = 0; i < n; i++)
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2555 {
10716 f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2556 // NOTE: This takes some thinking, but no matter what the above rules
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2557 // are, an empty array can always be skipped at this point, because
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2558 // the result dimensions are already determined, and there is no way
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2559 // an empty array may contribute a nonzero piece along the dimension
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2560 // at this point, unless an empty array can be promoted to a non-empty
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2561 // one (which makes no sense). I repeat, no way, think about it.
f7f26094021b improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10703 diff changeset	2562 if (array_list[i].is_empty ())
10533 f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2563 continue;
f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2564
f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2565 octave_quit ();
f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2566
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2567 octave_idx_type u;
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2568 if (dim < array_list[i].ndims ())
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2569 u = l + array_list[i].dims ()(dim);
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2570 else
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2571 u = l + 1;
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2572
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2573 idxa(dim) = idx_vector (l, u);
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2574
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2575 retval.assign (idxa, array_list[i]);
10533 f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2576
f094ac9bc93e reuse Array<T>::cat and Sparse<T>::cat in cat/horzcat/vertcat Jaroslav Hajek <highegg@gmail.com> parents: 10531 diff changeset	2577 l = u;
10531 2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2578 }
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2579
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2580 return retval;
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2581 }
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2582
2dd8ea8bfd71 basic cat functionality in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10512 diff changeset	2583 template <class T>
4517 b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	2584 void
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3657 diff changeset	2585 Array<T>::print_info (std::ostream& os, const std::string& prefix) const
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3657 diff changeset	2586 {
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	2587 os << prefix << "rep address: " << rep << '\n'
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	2588 << prefix << "rep->len: " << rep->len << '\n'
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	2589 << prefix << "rep->data: " << static_cast<void *> (rep->data) << '\n'
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	2590 << prefix << "rep->count: " << rep->count << '\n'
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	2591 << prefix << "slice_data: " << static_cast<void *> (slice_data) << '\n'
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	2592 << prefix << "slice_len: " << slice_len << '\n';
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	2593
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	2594 // 2D info:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	2595 //
4657 a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe] jwe parents: 4656 diff changeset	2596 // << pefix << "rows: " << rows () << "\n"
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	2597 // << prefix << "cols: " << cols () << "\n";
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3657 diff changeset	2598 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3657 diff changeset	2599
9201 472f0e22aa60 guard against implicit instantiation Jaroslav Hajek <highegg@gmail.com> parents: 9121 diff changeset	2600 template <class T>
10674 e3064439d6b4 new Array method for internal use Jaroslav Hajek <highegg@gmail.com> parents: 10673 diff changeset	2601 bool Array<T>::optimize_dimensions (const dim_vector& dv)
e3064439d6b4 new Array method for internal use Jaroslav Hajek <highegg@gmail.com> parents: 10673 diff changeset	2602 {
e3064439d6b4 new Array method for internal use Jaroslav Hajek <highegg@gmail.com> parents: 10673 diff changeset	2603 bool retval = dimensions == dv;
e3064439d6b4 new Array method for internal use Jaroslav Hajek <highegg@gmail.com> parents: 10673 diff changeset	2604 if (retval)
e3064439d6b4 new Array method for internal use Jaroslav Hajek <highegg@gmail.com> parents: 10673 diff changeset	2605 dimensions = dv;
e3064439d6b4 new Array method for internal use Jaroslav Hajek <highegg@gmail.com> parents: 10673 diff changeset	2606
e3064439d6b4 new Array method for internal use Jaroslav Hajek <highegg@gmail.com> parents: 10673 diff changeset	2607 return retval;
e3064439d6b4 new Array method for internal use Jaroslav Hajek <highegg@gmail.com> parents: 10673 diff changeset	2608 }
e3064439d6b4 new Array method for internal use Jaroslav Hajek <highegg@gmail.com> parents: 10673 diff changeset	2609
e3064439d6b4 new Array method for internal use Jaroslav Hajek <highegg@gmail.com> parents: 10673 diff changeset	2610 template <class T>
9201 472f0e22aa60 guard against implicit instantiation Jaroslav Hajek <highegg@gmail.com> parents: 9121 diff changeset	2611 void Array<T>::instantiation_guard ()
472f0e22aa60 guard against implicit instantiation Jaroslav Hajek <highegg@gmail.com> parents: 9121 diff changeset	2612 {
472f0e22aa60 guard against implicit instantiation Jaroslav Hajek <highegg@gmail.com> parents: 9121 diff changeset	2613 // This guards against accidental implicit instantiations.
472f0e22aa60 guard against implicit instantiation Jaroslav Hajek <highegg@gmail.com> parents: 9121 diff changeset	2614 // Array<T> instances should always be explicit and use INSTANTIATE_ARRAY.
472f0e22aa60 guard against implicit instantiation Jaroslav Hajek <highegg@gmail.com> parents: 9121 diff changeset	2615 T::__xXxXx__();
472f0e22aa60 guard against implicit instantiation Jaroslav Hajek <highegg@gmail.com> parents: 9121 diff changeset	2616 }
472f0e22aa60 guard against implicit instantiation Jaroslav Hajek <highegg@gmail.com> parents: 9121 diff changeset	2617
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2618 #define INSTANTIATE_ARRAY(T, API) \
9201 472f0e22aa60 guard against implicit instantiation Jaroslav Hajek <highegg@gmail.com> parents: 9121 diff changeset	2619 template <> void Array<T>::instantiation_guard () { } \
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2620 template class API Array<T>
e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	2621
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2622 // FIXME: is this used?
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2623
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2624 template <class T>
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2625 std::ostream&
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2626 operator << (std::ostream& os, const Array<T>& a)
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2627 {
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2628 dim_vector a_dims = a.dims ();
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2629
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2630 int n_dims = a_dims.length ();
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2631
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2632 os << n_dims << "-dimensional array";
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2633
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2634 if (n_dims)
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2635 os << " (" << a_dims.str () << ")";
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2636
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2637 os <<"\n\n";
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2638
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2639 if (n_dims)
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2640 {
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2641 os << "data:";
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2642
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	2643 Array<octave_idx_type> ra_idx (n_dims, 1, 0);
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2644
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2645 // Number of times the first 2d-array is to be displayed.
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2646
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2647 octave_idx_type m = 1;
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2648 for (int i = 2; i < n_dims; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2649 m *= a_dims(i);
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2650
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2651 if (m == 1)
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2652 {
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2653 octave_idx_type rows = 0;
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2654 octave_idx_type cols = 0;
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2655
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2656 switch (n_dims)
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2657 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2658 case 2:
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2659 rows = a_dims(0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2660 cols = a_dims(1);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2661
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2662 for (octave_idx_type j = 0; j < rows; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2663 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2664 ra_idx(0) = j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2665 for (octave_idx_type k = 0; k < cols; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2666 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2667 ra_idx(1) = k;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2668 os << " " << a.elem(ra_idx);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2669 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2670 os << "\n";
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2671 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2672 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2673
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2674 default:
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2675 rows = a_dims(0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2676
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2677 for (octave_idx_type k = 0; k < rows; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2678 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2679 ra_idx(0) = k;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2680 os << " " << a.elem(ra_idx);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2681 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2682 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2683 }
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2684
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2685 os << "\n";
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2686 }
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2687 else
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2688 {
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2689 octave_idx_type rows = a_dims(0);
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2690 octave_idx_type cols = a_dims(1);
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2691
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2692 for (int i = 0; i < m; i++)
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2693 {
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2694 os << "\n(:,:,";
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2695
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2696 for (int j = 2; j < n_dims - 1; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2697 os << ra_idx(j) + 1 << ",";
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2698
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2699 os << ra_idx(n_dims - 1) + 1 << ") = \n";
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2700
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2701 for (octave_idx_type j = 0; j < rows; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2702 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2703 ra_idx(0) = j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2704
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2705 for (octave_idx_type k = 0; k < cols; k++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2706 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2707 ra_idx(1) = k;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2708 os << " " << a.elem(ra_idx);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2709 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2710
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2711 os << "\n";
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2712 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2713
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2714 os << "\n";
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2715
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2716 if (i != m - 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10270 diff changeset	2717 increment_index (ra_idx, a_dims, 2);
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2718 }
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2719 }
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2720 }
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2721
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2722 return os;
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9731 diff changeset	2723 }

Mercurial > hg > octave-nkf

annotate liboctave/Array.cc @ 10716:f7f26094021b