octave: liboctave/Array.cc annotate

annotate liboctave/Array.cc @ 10352:a3635bc1ea19

remove Array2

author	Jaroslav Hajek <highegg@gmail.com>
date	Tue, 23 Feb 2010 16:12:27 +0100
parents	12884915a8e4
children	e5ae13b8b2c2

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

Mercurial > octave

annotate liboctave/Array.cc @ 10352:a3635bc1ea19