octave-nkf: liboctave/Array.cc annotate

annotate liboctave/Array.cc @ 9601:a9b37bae1802

add a couple of missing copyright statements

author	Jaroslav Hajek <highegg@gmail.com>
date	Wed, 02 Sep 2009 09:21:36 +0200
parents	948795dc1974
children	3fc7272937ce

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

Mercurial > hg > octave-nkf

annotate liboctave/Array.cc @ 9601:a9b37bae1802