octave-lyh: liboctave/Array.cc annotate

annotate liboctave/Array.cc @ 8523:ad3afaaa19c1

implement non-copying contiguous range indexing

author	Jaroslav Hajek <highegg@gmail.com>
date	Thu, 15 Jan 2009 07:22:24 +0100
parents	124dd27bedae
children	937921654627

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
7017 a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	4 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	5 2005, 2006, 2007 John W. Eaton
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	6 Copyright (C) 2008, 2009 Jaroslav Hajek <highegg@gmail.com>
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	7
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	8 This file is part of Octave.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	9
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	10 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	11 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	12 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	13 option) any later version.
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	14
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	15 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	16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	17 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	18 for more details.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	19
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	20 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	21 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	22 <http://www.gnu.org/licenses/>.
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	23
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 #ifdef HAVE_CONFIG_H
1192 b6360f2d4fa6 [project @ 1995-03-30 21:38:35 by jwe] jwe parents: 1011 diff changeset	27 #include <config.h>
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	28 #endif
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	29
1367 9f9131a8d706 [project @ 1995-09-06 00:07:03 by jwe] jwe parents: 1360 diff changeset	30 #include <cassert>
4518 382cb0ed8c14 [project @ 2003-09-20 18:08:40 by jwe] jwe parents: 4517 diff changeset	31 #include <climits>
449 3cef0ce5dd7d [project @ 1994-06-05 21:58:52 by jwe] jwe parents: 386 diff changeset	32
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 2847 diff changeset	33 #include <iostream>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5632 diff changeset	34 #include <sstream>
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	35 #include <vector>
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	36 #include <algorithm>
6674 e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	37 #include <new>
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1550 diff changeset	38
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	39 #include "Array.h"
4588 19bfd295f400 [project @ 2003-11-10 17:18:48 by jwe] jwe parents: 4587 diff changeset	40 #include "Array-util.h"
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1550 diff changeset	41 #include "idx-vector.h"
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1550 diff changeset	42 #include "lo-error.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	43 #include "oct-locbuf.h"
1560 27a03373de41 [project @ 1995-10-12 07:22:26 by jwe] jwe parents: 1550 diff changeset	44
1360 7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe] jwe parents: 1321 diff changeset	45 // One dimensional array class. Handles the reference counting for
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe] jwe parents: 1321 diff changeset	46 // all the derived classes.
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	47
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	48 template <class T>
4834 8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe] jwe parents: 4832 diff changeset	49 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	50 : rep (a.rep), dimensions (dv),
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	51 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	52 {
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe] jwe parents: 4832 diff changeset	53 rep->count++;
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe] jwe parents: 4832 diff changeset	54
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe] jwe parents: 4832 diff changeset	55 if (a.numel () < dv.numel ())
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe] jwe parents: 4832 diff changeset	56 (*current_liboctave_error_handler)
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe] jwe parents: 4832 diff changeset	57 ("Array::Array (const Array&, const dim_vector&): dimension mismatch");
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe] jwe parents: 4832 diff changeset	58 }
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 template <class T>
1619 1a35c8c91349 [project @ 1995-11-04 11:07:21 by jwe] jwe parents: 1574 diff changeset	61 Array<T>::~Array (void)
1a35c8c91349 [project @ 1995-11-04 11:07:21 by jwe] jwe parents: 1574 diff changeset	62 {
1a35c8c91349 [project @ 1995-11-04 11:07:21 by jwe] jwe parents: 1574 diff changeset	63 if (--rep->count <= 0)
1a35c8c91349 [project @ 1995-11-04 11:07:21 by jwe] jwe parents: 1574 diff changeset	64 delete rep;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	65 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	66
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	67 template <class T>
7717 ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	68 Array<T>&
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	69 Array<T>::operator = (const Array<T>& a)
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	70 {
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	71 if (this != &a)
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	72 {
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	73 if (--rep->count <= 0)
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	74 delete rep;
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	75
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	76 rep = a.rep;
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	77 rep->count++;
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	78
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	79 dimensions = a.dimensions;
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	80 slice_data = a.slice_data;
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	81 slice_len = a.slice_len;
7717 ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	82 }
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	83
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	84 return *this;
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	85 }
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	86
ff918ee1a983 Delete idx in Sparse<T> and Array<T> operator = David Bateman <dbateman@free.fr> parents: 7646 diff changeset	87 template <class T>
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	88 Array<T>
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	89 Array<T>::squeeze (void) const
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	90 {
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	91 Array<T> retval = *this;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	92
4929 585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	93 if (ndims () > 2)
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	94 {
4929 585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	95 bool dims_changed = false;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	96
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	97 dim_vector new_dimensions = dimensions;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	98
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	99 int k = 0;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	100
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	101 for (int i = 0; i < ndims (); i++)
4759 364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe] jwe parents: 4757 diff changeset	102 {
4929 585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	103 if (dimensions(i) == 1)
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	104 dims_changed = true;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	105 else
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	106 new_dimensions(k++) = dimensions(i);
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	107 }
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	108
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	109 if (dims_changed)
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 switch (k)
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	112 {
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	113 case 0:
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	114 new_dimensions = dim_vector (1, 1);
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	115 break;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	116
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	117 case 1:
4759 364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe] jwe parents: 4757 diff changeset	118 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	119 octave_idx_type tmp = new_dimensions(0);
4929 585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	120
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	121 new_dimensions.resize (2);
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	122
4759 364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe] jwe parents: 4757 diff changeset	123 new_dimensions(0) = tmp;
364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe] jwe parents: 4757 diff changeset	124 new_dimensions(1) = 1;
364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe] jwe parents: 4757 diff changeset	125 }
4929 585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	126 break;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	127
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	128 default:
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	129 new_dimensions.resize (k);
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	130 break;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe] jwe parents: 4916 diff changeset	131 }
4759 364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe] jwe parents: 4757 diff changeset	132 }
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	133
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5765 diff changeset	134 // FIXME -- it would be better if we did not have to do
5047 36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe] jwe parents: 5039 diff changeset	135 // this, so we could share the data while still having different
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe] jwe parents: 5039 diff changeset	136 // dimension vectors.
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe] jwe parents: 5039 diff changeset	137
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	138 retval.make_unique ();
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 retval.dimensions = new_dimensions;
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
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	143 return retval;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	144 }
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	145
6674 e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	146 // KLUGE
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	147
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	148 // 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	149 // 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	150 // 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	151 // 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	152 // 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	153 // 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	154 // indices.
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	155
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	156 // A guess (should be quite conservative).
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	157 #define MALLOC_OVERHEAD 1024
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	158
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	159 template <class T>
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	160 octave_idx_type
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	161 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	162 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	163 static int nl;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	164 static double dl
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	165 = frexp (static_cast<double>
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	166 (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	167
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	168 int nr, nc;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	169 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	170 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	171
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	172 int nt = nr + nc;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	173 double dt = dr * dc;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	174
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	175 if (dt < 0.5)
4513 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 nt--;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	178 dt *= 2;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	179 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	180
6674 e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	181 if (nt < nl \|\| (nt == nl && dt < dl))
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	182 return r * c;
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	183 else
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	184 {
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	185 throw std::bad_alloc ();
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	186 return 0;
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	187 }
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	188 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	189
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	190 template <class T>
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	191 octave_idx_type
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	192 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	193 {
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	194 static int nl;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	195 static double dl
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	196 = frexp (static_cast<double>
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	197 (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	198
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	199 int nr, nc, np;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	200 double dr = frexp (static_cast<double> (r), &nr);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	201 double dc = frexp (static_cast<double> (c), &nc);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	202 double dp = frexp (static_cast<double> (p), &np);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	203
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	204 int nt = nr + nc + np;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	205 double dt = dr * dc * dp;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	206
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	207 if (dt < 0.5)
659 fe75d98598d6 [project @ 1994-08-29 21:23:06 by jwe] jwe parents: 645 diff changeset	208 {
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	209 nt--;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	210 dt *= 2;
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	211
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	212 if (dt < 0.5)
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	213 {
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	214 nt--;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	215 dt *= 2;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	216 }
659 fe75d98598d6 [project @ 1994-08-29 21:23:06 by jwe] jwe parents: 645 diff changeset	217 }
1619 1a35c8c91349 [project @ 1995-11-04 11:07:21 by jwe] jwe parents: 1574 diff changeset	218
6674 e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	219 if (nt < nl \|\| (nt == nl && dt < dl))
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	220 return r * c * p;
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	221 else
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	222 {
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	223 throw std::bad_alloc ();
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	224 return 0;
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	225 }
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	226 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	227
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	228 template <class T>
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	229 octave_idx_type
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	230 Array<T>::get_size (const dim_vector& ra_idx)
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	231 {
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	232 static int nl;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	233 static double dl
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	234 = frexp (static_cast<double>
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	235 (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	236
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	237 int n = ra_idx.length ();
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 int nt = 0;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	240 double dt = 1;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	241
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	242 for (int i = 0; i < n; i++)
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	243 {
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	244 int nra_idx;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	245 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	246
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	247 nt += nra_idx;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	248 dt *= dra_idx;
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	249
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	250 if (dt < 0.5)
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	251 {
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	252 nt--;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	253 dt *= 2;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4530 diff changeset	254 }
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	255 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	256
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	257 if (nt < nl \|\| (nt == nl && dt < dl))
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	258 {
6674 e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	259 octave_idx_type retval = 1;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	260
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	261 for (int i = 0; i < n; i++)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	262 retval *= ra_idx(i);
6674 e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	263
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	264 return retval;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	265 }
6674 e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	266 else
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	267 {
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	268 throw std::bad_alloc ();
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	269 return 0;
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe] jwe parents: 6553 diff changeset	270 }
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	271 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	272
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	273 #undef MALLOC_OVERHEAD
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	274
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	275 template <class T>
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	276 octave_idx_type
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	277 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	278 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	279 octave_idx_type retval = -1;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	280
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	281 int n = dimensions.length ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	282
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	283 if (n > 0 && n == ra_idx.length ())
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	284 {
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	285 retval = ra_idx(--n);
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	286
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	287 while (--n >= 0)
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 retval *= dimensions(n);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	290 retval += ra_idx(n);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	291 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	292 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	293 else
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	294 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	295 ("Array<T>::compute_index: invalid ra_idxing operation");
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	296
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	297 return retval;
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	298 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	299
2049 468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe] jwe parents: 2006 diff changeset	300 template <class T>
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe] jwe parents: 2006 diff changeset	301 T
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	302 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	303 {
2109 356f70c8fcbd [project @ 1996-04-30 12:31:30 by jwe] jwe parents: 2049 diff changeset	304 (*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	305 return T ();
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe] jwe parents: 2006 diff changeset	306 }
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe] jwe parents: 2006 diff changeset	307
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe] jwe parents: 2006 diff changeset	308 template <class T>
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe] jwe parents: 2006 diff changeset	309 T&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	310 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	311 {
2109 356f70c8fcbd [project @ 1996-04-30 12:31:30 by jwe] jwe parents: 2049 diff changeset	312 (*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	313 static T foo;
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe] jwe parents: 2006 diff changeset	314 return foo;
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe] jwe parents: 2006 diff changeset	315 }
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe] jwe parents: 2006 diff changeset	316
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3657 diff changeset	317 template <class T>
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	318 T
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	319 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	320 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	321 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	322 ("%s (%d, %d): range error", fcn, i, j);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	323 return T ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	324 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	325
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	326 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	327 T&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	328 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	329 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	330 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	331 ("%s (%d, %d): range error", fcn, i, j);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	332 static T foo;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	333 return foo;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	334 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	335
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	336 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	337 T
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	338 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	339 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	340 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	341 ("%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	342 return T ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	343 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	344
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	345 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	346 T&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	347 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	348 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	349 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	350 ("%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	351 static T foo;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	352 return foo;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	353 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	354
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	355 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	356 T
6867 83619ae96c1d [project @ 2007-09-06 12:08:44 by dbateman] dbateman parents: 6674 diff changeset	357 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	358 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5632 diff changeset	359 std::ostringstream buf;
4661 12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	360
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	361 buf << fcn << " (";
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	362
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	363 octave_idx_type n = ra_idx.length ();
4661 12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	364
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	365 if (n > 0)
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	366 buf << ra_idx(0);
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	367
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	368 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	369 buf << ", " << ra_idx(i);
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	370
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	371 buf << "): range error";
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	372
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5632 diff changeset	373 std::string buf_str = buf.str ();
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5632 diff changeset	374
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5632 diff changeset	375 (*current_liboctave_error_handler) (buf_str.c_str ());
4513 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 return T ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	378 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	379
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	380 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	381 T&
6867 83619ae96c1d [project @ 2007-09-06 12:08:44 by dbateman] dbateman parents: 6674 diff changeset	382 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	383 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5632 diff changeset	384 std::ostringstream buf;
4661 12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	385
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	386 buf << fcn << " (";
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	387
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	388 octave_idx_type n = ra_idx.length ();
4661 12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	389
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	390 if (n > 0)
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	391 buf << ra_idx(0);
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	392
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	393 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	394 buf << ", " << ra_idx(i);
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	395
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	396 buf << "): range error";
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe] jwe parents: 4657 diff changeset	397
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5632 diff changeset	398 std::string buf_str = buf.str ();
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5632 diff changeset	399
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5632 diff changeset	400 (*current_liboctave_error_handler) (buf_str.c_str ());
4513 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 static T foo;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	403 return foo;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	404 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	405
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	406 template <class T>
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	407 Array<T>
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	408 Array<T>::reshape (const dim_vector& new_dims) const
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	409 {
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	410 Array<T> retval;
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	411
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	412 if (dimensions != new_dims)
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	413 {
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	414 if (dimensions.numel () == new_dims.numel ())
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	415 retval = Array<T> (*this, new_dims);
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	416 else
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	417 (*current_liboctave_error_handler) ("reshape: size mismatch");
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	418 }
4916 c45f14873b5e [project @ 2004-07-26 14:35:12 by jwe] jwe parents: 4915 diff changeset	419 else
c45f14873b5e [project @ 2004-07-26 14:35:12 by jwe] jwe parents: 4915 diff changeset	420 retval = *this;
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	421
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	422 return retval;
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	423 }
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	424
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	425 // Helper class for multi-d dimension permuting (generalized transpose).
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	426 class rec_permute_helper
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	427 {
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	428 octave_idx_type dim, stride;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	429 int top;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	430
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	431 public:
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	432 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	433 {
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	434 int n = dv.length ();
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	435 assert (n == perm.length ());
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	436
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	437 dim = new octave_idx_type [2*n];
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	438 // A hack to avoid double allocation
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	439 stride = dim + n;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	440 top = 0;
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 // Get cumulative dimensions.
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	443 OCTAVE_LOCAL_BUFFER (octave_idx_type, cdim, n+1);
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	444 cdim[0] = 1;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	445 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	446
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	447 int k = 0;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	448 // Reduce leading identity
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	449 for (; k < n && perm(k) == k; k++) ;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	450 if (k > 0)
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	451 {
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	452 dim[0] = cdim[k];
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	453 stride[0] = 1;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	454 }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	455 else
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	456 top = -1;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	457
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	458 // Setup the permuted strides.
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	459 for (; k < n; k++)
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	460 {
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	461 ++top;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	462 int kk = perm(k);
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	463 dim[top] = dv(kk);
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	464 stride[top] = cdim[kk];
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	465 }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	466
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	467 }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	468
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	469 ~rec_permute_helper (void) { delete [] dim; }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	470
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	471 private:
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	472
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	473 // Recursive N-d generalized transpose
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	474 template <class T>
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	475 T do_permute (const T src, T *dest, int lev) const
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 if (lev == 0)
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	478 {
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	479 octave_idx_type step = stride[0], len = dim[0];
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	480 if (step == 1)
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	481 dest = std::copy (src, src + len, dest);
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	482 else
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	483 {
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	484 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	485 dest[i] = src[j];
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	486
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	487 dest += len;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	488 }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	489
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	490 }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	491 else
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	492 {
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	493 octave_idx_type step = stride[lev], len = dim[lev];
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	494 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	495 dest = do_permute (src + i * step, dest, lev-1);
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	496 }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	497
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	498 return dest;
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	499 }
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	500
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	501 public:
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	502
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	503 template <class T>
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	504 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	505
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	506 };
7241 da540e715d05 [project @ 2007-12-03 22:55:20 by jwe] jwe parents: 7189 diff changeset	507
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	508
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4553 diff changeset	509 template <class T>
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	510 Array<T>
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	511 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	512 {
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	513 Array<T> retval;
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	514
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	515 Array<octave_idx_type> perm_vec = perm_vec_arg;
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	516
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	517 dim_vector dv = dims ();
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	518 dim_vector dv_new;
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	519
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	520 int perm_vec_len = perm_vec_arg.length ();
5148 9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	521
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	522 if (perm_vec_len < dv.length ())
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	523 (*current_liboctave_error_handler)
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	524 ("%s: invalid permutation vector", inv ? "ipermute" : "permute");
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	525
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	526 dv_new.resize (perm_vec_len);
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	527
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	528 // Append singleton dimensions as needed.
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	529 dv.resize (perm_vec_len, 1);
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	530
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	531 // Need this array to check for identical elements in permutation array.
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	532 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	533
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	534 // Find dimension vector of permuted array.
5148 9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	535 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	536 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	537 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	538 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	539 {
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	540 (*current_liboctave_error_handler)
5148 9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	541 ("%s: permutation vector contains an invalid element",
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	542 inv ? "ipermute" : "permute");
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	543
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	544 return retval;
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	545 }
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	546
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	547 if (checked[perm_elt])
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	548 {
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	549 (*current_liboctave_error_handler)
5148 9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	550 ("%s: permutation vector cannot contain identical elements",
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	551 inv ? "ipermute" : "permute");
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	552
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	553 return retval;
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	554 }
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	555 else
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	556 checked[perm_elt] = true;
5148 9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	557
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe] jwe parents: 5120 diff changeset	558 dv_new(i) = dv(perm_elt);
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	559 }
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	560
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	561 if (inv)
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	562 {
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	563 for (int i = 0; i < perm_vec_len; i++)
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	564 perm_vec(perm_vec_arg(i)) = i;
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	565 }
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	566
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	567 retval = Array<T> (dv_new);
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	568
5940 0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe] jwe parents: 5837 diff changeset	569 if (numel () > 0)
5607 4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe] jwe parents: 5535 diff changeset	570 {
8410 ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	571 rec_permute_helper rh (dv, perm_vec);
ba24ecd4c019 optimize permute Jaroslav Hajek <highegg@gmail.com> parents: 8390 diff changeset	572 rh.permute (data (), retval.fortran_vec ());
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	573 }
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	574
5340 15843d76156d [project @ 2005-05-06 16:26:58 by jwe] jwe parents: 5338 diff changeset	575 retval.chop_trailing_singletons ();
5338 c4b55d47122e [project @ 2005-05-05 17:28:51 by jwe] jwe parents: 5307 diff changeset	576
4593 77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	577 return retval;
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	578 }
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe] jwe parents: 4592 diff changeset	579
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	580 // 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	581 // 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	582 // 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	583 // Also, the recursion solution is cleaner and more understandable.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	584 class rec_index_helper
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	585 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	586 octave_idx_type dim, cdim;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	587 idx_vector *idx;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	588 int top;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	589
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	590 public:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	591 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	592 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	593 int n = ia.length ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	594 assert (n > 0 && (dv.length () == std::max (n, 2)));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	595
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	596 dim = new octave_idx_type [2*n];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	597 // A hack to avoid double allocation
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	598 cdim = dim + n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	599 idx = new idx_vector [n];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	600 top = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	601
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	602 dim[0] = dv(0);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	603 cdim[0] = 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	604 idx[0] = ia(0);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	605
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	606 for (int i = 1; i < n; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	607 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	608 // Try reduction...
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	609 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	610 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	611 // Reduction successful, fold dimensions.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	612 dim[top] *= dv(i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	613 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	614 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	615 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	616 // Unsuccessful, store index & cumulative dim.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	617 top++;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	618 idx[top] = ia(i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	619 dim[top] = dv(i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	620 cdim[top] = cdim[top-1] * dim[top-1];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	621 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	622 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	623 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	624
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	625 ~rec_index_helper (void) { delete [] idx; delete [] dim; }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	626
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	627 private:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	628
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	629 // Recursive N-d indexing
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	630 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	631 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	632 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	633 if (lev == 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	634 dest += idx[0].index (src, dim[0], dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	635 else
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 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	638 for (octave_idx_type i = 0; i < n; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	639 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	640 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	641
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	642 return dest;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	643 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	644
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	645 // Recursive N-d indexed assignment
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	646 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	647 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	648 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	649 if (lev == 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	650 src += idx[0].assign (src, dim[0], dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	651 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	652 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	653 octave_idx_type n = idx[lev].length (dim[lev]), d = cdim[lev];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	654 for (octave_idx_type i = 0; i < n; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	655 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	656 }
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 return src;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	659 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	660
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	661 // Recursive N-d indexed assignment
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	662 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	663 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	664 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	665 if (lev == 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	666 idx[0].fill (val, dim[0], dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	667 else
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 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	670 for (octave_idx_type i = 0; i < n; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	671 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	672 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	673 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	674
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	675 public:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	676
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	677 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	678 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	679
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	680 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	681 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	682
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	683 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	684 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	685
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	686 bool is_cont_range (octave_idx_type& l,
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	687 octave_idx_type& u) const
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	688 {
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	689 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	690 }
8290 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
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	693 // Helper class for multi-d recursive resizing
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	694 // This handles resize () in an efficient manner, touching memory only
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	695 // once (apart from reinitialization)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	696 class rec_resize_helper
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	697 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	698 octave_idx_type cext, sext, *dext;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	699 int n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	700
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	701 public:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	702 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	703 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	704 int l = ndv.length ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	705 assert (odv.length () == l);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	706 octave_idx_type ld = 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	707 int i = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	708 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	709 n = l - i;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	710 cext = new octave_idx_type[3*n];
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	711 // Trick to avoid three allocations
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	712 sext = cext + n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	713 dext = sext + n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	714
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	715 octave_idx_type sld = ld, dld = ld;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	716 for (int j = 0; j < n; j++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	717 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	718 cext[j] = std::min (ndv(i+j), odv(i+j));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	719 sext[j] = sld *= odv(i+j);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	720 dext[j] = dld *= ndv(i+j);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	721 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	722 cext[0] *= ld;
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
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	725 ~rec_resize_helper (void) { delete [] cext; }
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 private:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	728 // recursive resizing
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	729 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	730 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	731 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	732 if (lev == 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	733 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	734 T* destc = std::copy (src, src + cext[0], dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	735 std::fill (destc, dest + dext[0], rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	736 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	737 else
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 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	740 for (k = 0; k < cext[lev]; k++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	741 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	742
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	743 std::fill (dest + k * dd, dest + dext[lev], rfv);
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 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	746 public:
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	747 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	748 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	749 { do_resize_fill (src, dest, rfv, n-1); }
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 };
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	752
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	753 static void gripe_index_out_of_range (void)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	754 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	755 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	756 ("A(I): Index exceeds matrix dimension.");
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	757 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	758
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	759 template <class T>
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	760 Array<T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	761 Array<T>::index (const idx_vector& i) const
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	762 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	763 octave_idx_type n = numel ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	764 Array<T> retval;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	765
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	766 if (i.is_colon ())
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	767 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	768 // 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	769 retval = Array<T> (*this, dim_vector (n, 1));
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	770 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	771 else if (i.extent (n) != n)
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4545 diff changeset	772 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	773 gripe_index_out_of_range ();
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4545 diff changeset	774 }
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4545 diff changeset	775 else
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	776 {
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	777 // 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	778 dim_vector rd = i.orig_dimensions ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	779 octave_idx_type il = i.length (n);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	780
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	781 // FIXME -- this is for Matlab compatibility. Matlab 2007 given
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	782 //
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	783 // b = ones(3,1)
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	784 //
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	785 // yields the following:
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	786 //
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	787 // b(zeros(0,0)) gives []
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	788 // b(zeros(1,0)) gives zeros(0,1)
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	789 // b(zeros(0,1)) gives zeros(0,1)
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	790 // b(zeros(0,m)) gives zeros(0,m)
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	791 // b(zeros(m,0)) gives zeros(m,0)
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	792 // b(1:2) gives ones(2,1)
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	793 // b(ones(2)) gives ones(2) etc.
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	794 //
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	795 // 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	796 // 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	797
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	798 if (ndims () == 2 && n != 1)
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 if (columns () == 1 && rd(0) == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	801 rd = dim_vector (il, 1);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	802 else if (rows () == 1 && rd(1) == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	803 rd = dim_vector (1, il);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	804 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	805
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	806 octave_idx_type l, u;
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	807 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	808 // If suitable, produce a shallow slice.
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	809 retval = Array<T> (*this, rd, l, u);
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	810 else
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	811 {
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	812 // 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	813 // types.
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	814 retval = Array<T> (rd);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	815
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	816 if (il != 0)
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	817 i.index (data (), n, retval.fortran_vec ());
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	818 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	819 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	820
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	821 return retval;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	822 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	823
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	824 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	825 Array<T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	826 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	827 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	828 // Get dimensions, allowing Fortran indexing in the 2nd dim.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	829 dim_vector dv = dimensions.redim (2);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	830 octave_idx_type r = dv(0), c = dv(1);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	831 Array<T> retval;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	832
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	833 if (i.is_colon () && j.is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	834 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	835 // A(:,:) produces a shallow copy.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	836 retval = Array<T> (*this, dv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	837 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	838 else if (i.extent (r) != r \|\| j.extent (c) != c)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	839 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	840 gripe_index_out_of_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	841 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	842 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	843 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	844 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	845
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	846 idx_vector ii (i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	847
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	848 if (ii.maybe_reduce (r, j, c))
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	849 {
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	850 octave_idx_type l, u;
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	851 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	852 // If suitable, produce a shallow slice.
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	853 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	854 else
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	855 {
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	856 // 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	857 retval = Array<T> (dim_vector (il, jl));
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	858
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	859 ii.index (data (), n, retval.fortran_vec ());
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	860 }
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	861 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	862 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	863 {
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	864 // 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	865 retval = Array<T> (dim_vector (il, jl));
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	866
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	867 const T* src = data ();
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	868 T *dest = retval.fortran_vec ();
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	869
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	870 for (octave_idx_type k = 0; k < jl; k++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	871 dest += i.index (src + r * j.xelem (k), r, dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	872 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	873 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	874
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	875 return retval;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	876 }
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	877
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	878 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	879 Array<T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	880 Array<T>::index (const Array<idx_vector>& ia) const
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 int ial = ia.length ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	883 Array<T> retval;
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4586 diff changeset	884
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	885 // FIXME: is this dispatching necessary?
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	886 if (ial == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	887 retval = index (ia(0));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	888 else if (ial == 2)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	889 retval = index (ia(0), ia(1));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	890 else if (ial > 0)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	891 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	892 // Get dimensions, allowing Fortran indexing in the last dim.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	893 dim_vector dv = dimensions.redim (ial);
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	894
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	895 // Check for out of bounds conditions.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	896 bool all_colons = true, mismatch = false;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	897 for (int i = 0; i < ial; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	898 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	899 if (ia(i).extent (dv(i)) != dv(i))
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	900 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	901 mismatch = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	902 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	903 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	904 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	905 all_colons = all_colons && ia(i).is_colon ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	906 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	907
4870 2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe] jwe parents: 4834 diff changeset	908
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	909 if (mismatch)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	910 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	911 gripe_index_out_of_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	912 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	913 else if (all_colons)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	914 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	915 // A(:,:,...,:) produces a shallow copy.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	916 retval = Array<T> (*this, dv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	917 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	918 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	919 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	920 // Form result dimensions.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	921 dim_vector rdv;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	922 rdv.resize (ial);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	923 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	924 rdv.chop_trailing_singletons ();
4870 2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe] jwe parents: 4834 diff changeset	925
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	926 // Prepare for recursive indexing
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	927 rec_index_helper rh (dv, ia);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	928
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	929 octave_idx_type l, u;
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	930 if (rh.is_cont_range (l, u))
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	931 // If suitable, produce a shallow slice.
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	932 retval = Array<T> (*this, rdv, l, u);
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	933 else
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	934 {
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	935 // 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	936 retval = Array<T> (rdv);
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	937
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	938 // Do it.
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	939 rh.index (data (), retval.fortran_vec ());
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	940 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	941 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	942 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	943
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	944 return retval;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	945 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	946
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	947 // FIXME -- the following is a common error message to resize,
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	948 // regardless of whether it's called from assign or elsewhere. It
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	949 // seems OK to me, but eventually the gripe can be specialized.
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	950 // Anyway, propagating various error messages into procedure is, IMHO,
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	951 // a nonsense. If anything, we should change error handling here (and
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	952 // throughout liboctave) to allow custom handling of errors
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	953 static void gripe_invalid_resize (void)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	954 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	955 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	956 ("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	957 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	958
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	959 // 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	960
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	961 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	962 T Array<T>::resize_fill_value ()
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	963 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	964 return T ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	965 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	966
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	967 // Yes, we could do resize using index & assign. However, that would
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	968 // 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	969
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	970 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	971 void
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	972 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	973 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	974 if (n >= 0 && ndims () == 2)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	975 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	976 dim_vector dv;
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	977 // 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	978 // on some out-of-bounds assignments. Specifically, Matlab
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	979 // 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	980 // 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	981 // last one, search me why). Giving a column vector would make
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	982 // much more sense (given the way trailing singleton dims are
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	983 // treated).
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	984 bool invalid = false;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	985 if (rows () == 0 \|\| rows () == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	986 dv = dim_vector (1, n);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	987 else if (columns () == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	988 dv = dim_vector (n, 1);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	989 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	990 invalid = true;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	991
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	992 if (invalid)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	993 gripe_invalid_resize ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	994 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	995 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	996 octave_idx_type nx = numel ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	997 if (n != nx)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	998 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	999 Array<T> tmp = Array<T> (dv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1000 T *dest = tmp.fortran_vec ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1001
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1002 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	1003 dest = std::copy (data (), data () + n0, dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1004 std::fill (dest, dest + n1, rfv);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1005
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1006 *this = tmp;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1007 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1008 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1009 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1010 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1011 gripe_invalid_resize ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1012 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1013
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1014 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1015 void
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1016 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	1017 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1018 if (r >= 0 && c >= 0 && ndims () == 2)
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 octave_idx_type rx = rows (), cx = columns ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1021 if (r != rx \|\| c != cx)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1022 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1023 Array<T> tmp = Array<T> (dim_vector (r, c));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1024 T *dest = tmp.fortran_vec ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1025
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1026 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	1027 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	1028 const T *src = data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1029 if (r == rx)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1030 dest = std::copy (src, src + r * c0, dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1031 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1032 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1033 for (octave_idx_type k = 0; k < c0; k++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1034 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1035 dest = std::copy (src, src + r0, dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1036 src += rx;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1037 std::fill (dest, dest + r1, rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1038 dest += r1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1039 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1040 }
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 std::fill (dest, dest + r * c1, rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1043
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1044 *this = tmp;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1045 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1046 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1047 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1048 gripe_invalid_resize ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1049
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1050 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1051
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1052 template<class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1053 void
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1054 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	1055 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1056 int dvl = dv.length ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1057 if (dvl == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1058 resize (dv(0), rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1059 else if (dvl == 2)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1060 resize (dv(0), dv(1), rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1061 else if (dimensions != dv)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1062 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1063 if (dimensions.length () <= dvl)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1064 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1065 Array<T> tmp (dv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1066 // Prepare for recursive resizing.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1067 rec_resize_helper rh (dv, dimensions.redim (dvl));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1068
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1069 // Do it.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1070 rh.resize_fill (data (), tmp.fortran_vec (), rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1071 *this = tmp;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1072 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1073 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1074 gripe_invalid_resize ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1075 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1076 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1077
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1078 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1079 Array<T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1080 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	1081 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1082 Array<T> tmp = *this;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1083 if (resize_ok)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1084 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1085 octave_idx_type n = numel (), nx = i.extent (n);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1086 if (n != nx)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1087 tmp.resize_fill (nx, rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1088
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1089 if (tmp.numel () != nx)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1090 return Array<T> ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1091 }
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 return tmp.index (i);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1094 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1095
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1096 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1097 Array<T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1098 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	1099 bool resize_ok, const T& rfv) const
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 Array<T> tmp = *this;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1102 if (resize_ok)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1103 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1104 dim_vector dv = dimensions.redim (2);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1105 octave_idx_type r = dv(0), c = dv(1);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1106 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	1107 if (r != rx \|\| c != cx)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1108 tmp.resize_fill (rx, cx, rfv);
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	1109
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1110 if (tmp.rows () != rx \|\| tmp.columns () != cx)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1111 return Array<T> ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1112 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1113
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1114 return tmp.index (i, j);
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 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1118 Array<T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1119 Array<T>::index (const Array<idx_vector>& ia,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1120 bool resize_ok, const T& rfv) const
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 Array<T> tmp = *this;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1123 if (resize_ok)
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 int ial = ia.length ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1126 dim_vector dv = dimensions.redim (ial);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1127 dim_vector dvx; dvx.resize (ial);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1128 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	1129 if (! (dvx == dv))
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1130 tmp.resize_fill (dvx, rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1131
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1132 if (tmp.dimensions != dvx)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1133 return Array<T> ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1134 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1135
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1136 return tmp.index (ia);
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
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1139
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1140 static void
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1141 gripe_invalid_assignment_size (void)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1142 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1143 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1144 ("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	1145 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1146
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1147 static void
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1148 gripe_assignment_dimension_mismatch (void)
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 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1151 ("A(I,J,...) = X: dimensions mismatch");
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1152 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1153
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1154 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1155 void
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1156 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	1157 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1158 octave_idx_type n = numel (), rhl = rhs.numel ();
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4545 diff changeset	1159
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1160 if (rhl == 1 \|\| i.length (n) == rhl)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1161 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1162 octave_idx_type nx = i.extent (n);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1163 // Try to resize first if necessary.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1164 if (nx != n)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1165 {
8390 49901b624316 optimize repmat for scalar & matrix case Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	1166 // A simple optimization. Things like A(1:N) = x will skip fill on
49901b624316 optimize repmat for scalar & matrix case Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	1167 // resizing, if A is 0x0.
49901b624316 optimize repmat for scalar & matrix case Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	1168 if (rows () == 0 && columns () == 0 && ndims () == 2
49901b624316 optimize repmat for scalar & matrix case Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	1169 && rhl == 1 && i.is_colon_equiv (nx))
49901b624316 optimize repmat for scalar & matrix case Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	1170 *this = Array<T> (dim_vector (1, nx));
49901b624316 optimize repmat for scalar & matrix case Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	1171 else
49901b624316 optimize repmat for scalar & matrix case Jaroslav Hajek <highegg@gmail.com> parents: 8379 diff changeset	1172 resize_fill (nx, rfv);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1173 n = numel ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1174 }
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	1175
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1176 // If the resizing was ambiguous, resize has already griped.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1177 if (nx == n)
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 if (i.is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1180 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1181 // A(:) = X makes a full fill or a shallow copy.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1182 if (rhl == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1183 fill (rhs(0));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1184 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1185 *this = rhs.reshape (dimensions);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1186 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1187 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1188 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1189 if (rhl == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1190 i.fill (rhs(0), n, fortran_vec ());
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1191 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1192 i.assign (rhs.data (), n, fortran_vec ());
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1193 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1194 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1195 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1196 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1197 gripe_invalid_assignment_size ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1198 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1199
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1200 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1201 void
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1202 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	1203 const Array<T>& rhs, const T& rfv)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1204 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1205 // Get RHS extents, discarding singletons.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1206 dim_vector rhdv = rhs.dims ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1207 // Get LHS extents, allowing Fortran indexing in the second dim.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1208 dim_vector dv = dimensions.redim (2);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1209 // Check for out-of-bounds and form resizing dimensions.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1210 dim_vector rdv;
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1211 // In the special when all dimensions are zero, colons are allowed
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1212 // 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	1213 // solve that elsewhere.
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1214 if (dv.all_zero ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1215 rdv = zero_dims_inquire (i, j, rhdv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1216 else
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1217 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1218 rdv(0) = i.extent (dv(0));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1219 rdv(1) = j.extent (dv(1));
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1220 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1221
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1222 bool isfill = rhs.numel () == 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1223 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	1224 rhdv.chop_all_singletons ();
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1225 bool match = (isfill
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1226 \|\| (rhdv.length () == 2 && il == rhdv(0) && jl == rhdv(1)));
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1227 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	1228
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1229 if (match)
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 // Resize if requested.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1232 if (rdv != dv)
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 resize (rdv, rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1235 dv = dimensions;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1236 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1237
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1238 // If the resizing was invalid, resize has already griped.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1239 if (dv == rdv)
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 if (i.is_colon () && j.is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1242 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1243 // A(:,:) = X makes a full fill or a shallow copy
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1244 if (isfill)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1245 fill (rhs(0));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1246 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1247 *this = rhs.reshape (dimensions);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1248 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1249 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1250 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1251 // The actual work.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1252 octave_idx_type n = numel (), r = rows (), c = columns ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1253 idx_vector ii (i);
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	1254
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1255 const T* src = rhs.data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1256 T *dest = fortran_vec ();
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	1257
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1258 // Try reduction first.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1259 if (ii.maybe_reduce (r, j, c))
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1260 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1261 if (isfill)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1262 ii.fill (*src, n, dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1263 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1264 ii.assign (src, n, dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1265 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1266 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1267 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1268 if (isfill)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1269 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1270 for (octave_idx_type k = 0; k < jl; k++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1271 i.fill (src, r, dest + r j.xelem (k));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1272 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1273 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1274 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1275 for (octave_idx_type k = 0; k < jl; k++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1276 src += i.assign (src, r, dest + r * j.xelem (k));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1277 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1278 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1279 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1280
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1281 }
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	1282
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	1283 }
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1284 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1285 gripe_assignment_dimension_mismatch ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1286 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1287
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1288 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1289 void
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1290 Array<T>::assign (const Array<idx_vector>& ia,
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1291 const Array<T>& rhs, const T& rfv)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1292 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1293 int ial = ia.length ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1294
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1295 // FIXME: is this dispatching necessary / desirable?
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1296 if (ial == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1297 assign (ia(0), rhs, rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1298 else if (ial == 2)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1299 assign (ia(0), ia(1), rhs, rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1300 else if (ial > 0)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1301 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1302 // Get RHS extents, discarding singletons.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1303 dim_vector rhdv = rhs.dims ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1304
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1305 // Get LHS extents, allowing Fortran indexing in the second dim.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1306 dim_vector dv = dimensions.redim (ial);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1307
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1308 // Get the extents forced by indexing.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1309 dim_vector rdv;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1310
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1311 // In the special when all dimensions are zero, colons are
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1312 // allowed to inquire the shape of RHS. The rules are more
9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1313 // obscure, so we solve that elsewhere.
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1314 if (dv.all_zero ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1315 rdv = zero_dims_inquire (ia, rhdv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1316 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1317 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1318 rdv.resize (ial);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1319 for (int i = 0; i < ial; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1320 rdv(i) = ia(i).extent (dv(i));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1321 }
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 // Check whether LHS and RHS match, up to singleton dims.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1324 bool match = true, all_colons = true, isfill = rhs.numel () == 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1325
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1326 rhdv.chop_all_singletons ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1327 int j = 0, rhdvl = rhdv.length ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1328 for (int i = 0; i < ial; i++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1329 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1330 all_colons = all_colons && ia(i).is_colon ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1331 octave_idx_type l = ia(i).length (rdv(i));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1332 if (l == 1) continue;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1333 match = match && j < rhdvl && l == rhdv(j++);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1334 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1335
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1336 match = match && (j == rhdvl \|\| rhdv(j) == 1);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1337 match = match \|\| isfill;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1338
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1339 if (match)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1340 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1341 // Resize first if necessary.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1342 if (rdv != dv)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1343 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1344 resize_fill (rdv, rfv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1345 dv = dimensions;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1346 chop_trailing_singletons ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1347 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1348
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1349 // If the resizing was invalid, resize has already griped.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1350 if (dv == rdv)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1351 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1352 if (all_colons)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1353 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1354 // A(:,:,...,:) = X makes a full fill or a shallow copy.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1355 if (isfill)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1356 fill (rhs(0));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1357 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1358 *this = rhs.reshape (dimensions);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1359 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1360 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1361 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1362 // Do the actual work.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1363
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1364 // Prepare for recursive indexing
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1365 rec_index_helper rh (dv, ia);
4553 c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe] jwe parents: 4548 diff changeset	1366
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1367 // Do it.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1368 if (isfill)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1369 rh.fill (rhs(0), fortran_vec ());
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1370 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1371 rh.assign (rhs.data (), fortran_vec ());
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 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1374 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1375 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1376 gripe_assignment_dimension_mismatch ();
4553 c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe] jwe parents: 4548 diff changeset	1377 }
8290 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
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1380 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1381 void
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1382 Array<T>::delete_elements (const idx_vector& i)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1383 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1384 octave_idx_type n = numel ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1385 if (i.is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1386 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1387 *this = Array<T> ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1388 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1389 else if (i.extent (n) != n)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1390 {
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1391 gripe_index_out_of_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1392 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1393 else if (i.length (n) != 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1394 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1395 octave_idx_type l, u;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1396
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1397 bool col_vec = ndims () == 2 && columns () == 1 && rows () != 1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1398 if (i.is_cont_range (n, l, u))
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1399 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1400 // Special case deleting a contiguous range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1401 octave_idx_type m = n + l - u;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1402 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	1403 const T *src = data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1404 T *dest = tmp.fortran_vec ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1405 dest = std::copy (src, src + l, dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1406 dest = std::copy (src + u, src + n, dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1407 *this = tmp;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1408 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1409 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1410 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1411 // Use index.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1412 *this = index (i.complement (n));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1413 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1414 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1415 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1416
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1417 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1418 void
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1419 Array<T>::delete_elements (int dim, const idx_vector& i)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1420 {
8302 f2e050b62199 fix dim check in Array<T>::delete_elements Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	1421 if (dim < 0 \|\| dim >= ndims ())
8290 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 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1424 ("invalid dimension in delete_elements");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1425 return;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1426 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1427
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1428 octave_idx_type n = dimensions (dim);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1429 if (i.is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1430 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1431 *this = Array<T> ();
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 else if (i.extent (n) != n)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1434 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1435 gripe_index_out_of_range ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1436 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1437 else if (i.length (n) != 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1438 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1439 octave_idx_type l, u;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1440
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1441 if (i.is_cont_range (n, l, u))
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1442 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1443 // Special case deleting a contiguous range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1444 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	1445 dim_vector rdv = dimensions;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1446 rdv(dim) = nd;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1447 for (int k = 0; k < dim; k++) dl *= dimensions(k);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1448 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	1449
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1450 // Special case deleting a contiguous range.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1451 Array<T> tmp = Array<T> (rdv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1452 const T *src = data ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1453 T *dest = tmp.fortran_vec ();
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1454 l = dl; u = dl; n *= dl;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1455 for (octave_idx_type k = 0; k < du; k++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1456 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1457 dest = std::copy (src, src + l, dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1458 dest = std::copy (src + u, src + n, dest);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1459 src += n;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1460 }
4870 2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe] jwe parents: 4834 diff changeset	1461
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1462 *this = tmp;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1463 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1464 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1465 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1466 // Use index.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1467 Array<idx_vector> ia (ndims (), idx_vector::colon);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1468 ia (dim) = i.complement (n);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1469 *this = index (ia);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1470 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1471 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1472 }
4747 3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe] jwe parents: 4746 diff changeset	1473
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1474 template <class T>
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1475 void
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1476 Array<T>::delete_elements (const Array<idx_vector>& ia)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1477 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1478 if (ia.length () == 1)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1479 delete_elements (ia(0));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1480 else
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 int len = ia.length (), k, dim = -1;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1483 for (k = 0; k < len; k++)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1484 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1485 if (! ia(k).is_colon ())
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1486 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1487 if (dim < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1488 dim = k;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1489 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1490 break;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1491 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1492 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1493 if (dim < 0)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1494 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1495 dim_vector dv = dimensions;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1496 dv(0) = 0;
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1497 *this = Array<T> (dv);
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1498 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1499 else if (k == len)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1500 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1501 delete_elements (dim, ia(dim));
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1502 }
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1503 else
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1504 {
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1505 (*current_liboctave_error_handler)
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1506 ("A null assignment can only have one non-colon index.");
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1507 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1508 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1509
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1510 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1511
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1512 // FIXME: Remove these methods or implement them using assign.
7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1513
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1514 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1515 Array<T>&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1516 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	1517 {
4786 fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1518 if (ndims () == 2 && a.ndims () == 2)
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1519 insert2 (a, r, c);
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1520 else
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1521 insertN (a, r, c);
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1522
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1523 return *this;
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1524 }
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1525
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1526
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1527 template <class T>
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1528 Array<T>&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1529 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	1530 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1531 octave_idx_type a_rows = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1532 octave_idx_type a_cols = a.cols ();
4786 fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1533
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1534 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	1535 {
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1536 (*current_liboctave_error_handler) ("range error for insert");
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1537 return *this;
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1538 }
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1539
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1540 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	1541 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	1542 elem (r+i, c+j) = a.elem (i, j);
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1543
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1544 return *this;
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1545 }
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1546
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1547 template <class T>
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe] jwe parents: 4765 diff changeset	1548 Array<T>&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1549 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	1550 {
4806 d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1551 dim_vector dv = dims ();
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1552
4765 e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1553 dim_vector a_dv = a.dims ();
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1554
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1555 int n = a_dv.length ();
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1556
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1557 if (n == dimensions.length ())
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1558 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1559 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	1560
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1561 a_ra_idx.elem (0) = r;
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1562 a_ra_idx.elem (1) = c;
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1563
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1564 for (int i = 0; i < n; i++)
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1565 {
4806 d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1566 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	1567 {
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1568 (*current_liboctave_error_handler)
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1569 ("Array<T>::insert: range error for insert");
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1570 return *this;
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1571 }
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1572 }
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1573
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1574 octave_idx_type n_elt = a.numel ();
4806 d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1575
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1576 const T *a_data = a.data ();
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1577
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1578 octave_idx_type iidx = 0;
4806 d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1579
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1580 octave_idx_type a_rows = a_dv(0);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1581
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1582 octave_idx_type this_rows = dv(0);
4806 d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1583
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1584 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	1585
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1586 octave_idx_type count_pages = 0;
4806 d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1587
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1588 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	1589 {
4806 d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1590 if (i != 0 && i % a_rows == 0)
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1591 iidx += (this_rows - a_rows);
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1592
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1593 if (i % numel_page == 0)
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1594 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	1595
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4796 diff changeset	1596 elem (iidx++) = a_data[i];
4765 e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1597 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1598 }
4765 e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1599 else
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1600 (*current_liboctave_error_handler)
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4762 diff changeset	1601 ("Array<T>::insert: invalid indexing operation");
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1602
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1603 return *this;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1604 }
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 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1607 Array<T>&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1608 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	1609 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1610 octave_idx_type n = ra_idx.length ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1611
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1612 if (n == dimensions.length ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1613 {
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4898 diff changeset	1614 dim_vector dva = a.dims ();
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4898 diff changeset	1615 dim_vector dv = dims ();
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4898 diff changeset	1616 int len_a = dva.length ();
5120 eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1617 int non_full_dim = 0;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1618
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1619 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	1620 {
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4898 diff changeset	1621 if (ra_idx(i) < 0 \|\| (ra_idx(i) +
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4898 diff changeset	1622 (i < len_a ? dva(i) : 1)) > dimensions(i))
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1623 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1624 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1625 ("Array<T>::insert: range error for insert");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1626 return *this;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1627 }
5120 eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1628
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1629 if (dv(i) != (i < len_a ? dva(i) : 1))
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1630 non_full_dim++;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1631 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1632
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4898 diff changeset	1633 if (dva.numel ())
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4898 diff changeset	1634 {
5120 eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1635 if (non_full_dim < 2)
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4898 diff changeset	1636 {
5120 eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1637 // Special case for fast concatenation
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1638 const T *a_data = a.data ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1639 octave_idx_type numel_to_move = 1;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1640 octave_idx_type skip = 0;
5120 eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1641 for (int i = 0; i < len_a; i++)
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1642 if (ra_idx(i) == 0 && dva(i) == dv(i))
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1643 numel_to_move *= dva(i);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1644 else
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1645 {
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1646 skip = numel_to_move * (dv(i) - dva(i));
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1647 numel_to_move *= dva(i);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1648 break;
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1649 }
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1650
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1651 octave_idx_type jidx = ra_idx(n-1);
5120 eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1652 for (int i = n-2; i >= 0; i--)
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1653 {
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1654 jidx *= dv(i);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1655 jidx += ra_idx(i);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1656 }
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1657
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1658 octave_idx_type iidx = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1659 octave_idx_type moves = dva.numel () / numel_to_move;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1660 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	1661 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1662 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	1663 elem (jidx++) = a_data[iidx++];
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1664 jidx += skip;
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1665 }
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4898 diff changeset	1666 }
5120 eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1667 else
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4898 diff changeset	1668 {
5120 eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1669 // Generic code
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1670 const T *a_data = a.data ();
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1671 int nel = a.numel ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1672 Array<octave_idx_type> a_idx (n, 0);
5120 eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1673
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1674 for (int i = 0; i < nel; i++)
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1675 {
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1676 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	1677 for (int j = n-2; j >= 0; j--)
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1678 {
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1679 iidx *= dv(j);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1680 iidx += a_idx(j) + ra_idx(j);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1681 }
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1682
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1683 elem (iidx) = a_data[i];
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1684
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1685 increment_index (a_idx, dva);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe] jwe parents: 5108 diff changeset	1686 }
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4898 diff changeset	1687 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4898 diff changeset	1688 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1689 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1690 else
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1691 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1692 ("Array<T>::insert: invalid indexing operation");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1693
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1694 return *this;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1695 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1696
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	1697
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1698 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1699 Array<T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1700 Array<T>::transpose (void) const
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1701 {
4548 820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4545 diff changeset	1702 assert (ndims () == 2);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe] jwe parents: 4545 diff changeset	1703
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1704 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1705 octave_idx_type nc = dim2 ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1706
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1707 if (nr >= 8 && nc >= 8)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1708 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1709 Array<T> result (dim_vector (nc, nr));
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1710
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1711 // Blocked transpose to attempt to avoid cache misses.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1712
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1713 // 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	1714 // on some compilers.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1715 T buf[64];
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1716
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1717 octave_idx_type ii = 0, jj;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1718 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	1719 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1720 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	1721 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1722 // Copy to buffer
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1723 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	1724 j < jj + 8; j++, idxj += nr)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1725 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	1726 buf[k++] = xelem (i + idxj);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1727
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1728 // Copy from buffer
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1729 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	1730 i++, idxi += nc)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1731 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	1732 j++, k+=8)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1733 result.xelem (j + idxi) = buf[k];
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1734 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1735
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1736 if (ii < nr)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1737 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	1738 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	1739 result.xelem (j, i) = xelem (i, j);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1740 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1741
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1742 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	1743 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	1744 result.xelem (j, i) = xelem (i, j);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1745
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1746 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1747 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1748 else if (nr > 1 && nc > 1)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1749 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1750 Array<T> result (dim_vector (nc, nr));
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1751
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1752 for (octave_idx_type j = 0; j < nc; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5265 diff changeset	1753 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	1754 result.xelem (j, i) = xelem (i, j);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1755
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1756 return result;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1757 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1758 else
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1759 {
8333 9238637cb81c style fixes John W. Eaton <jwe@octave.org> parents: 8302 diff changeset	1760 // Fast transpose for vectors and empty matrices.
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1761 return Array<T> (*this, dim_vector (nc, nr));
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1762 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1763 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1764
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1765 template <class T>
8028 f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1766 static T
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1767 no_op_fcn (const T& x)
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1768 {
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1769 return x;
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1770 }
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1771
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1772 template <class T>
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1773 Array<T>
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1774 Array<T>::hermitian (T (*fcn) (const T&)) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1775 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1776 assert (ndims () == 2);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1777
8028 f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1778 if (! fcn)
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1779 fcn = no_op_fcn<T>;
f0fbf47c914c avoid null pointer call in Array<T>::hermitian Jaroslav Hajek <highegg@gmail.com> parents: 7796 diff changeset	1780
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1781 octave_idx_type nr = dim1 ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1782 octave_idx_type nc = dim2 ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1783
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1784 if (nr >= 8 && nc >= 8)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1785 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1786 Array<T> result (dim_vector (nc, nr));
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1787
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1788 // Blocked transpose to attempt to avoid cache misses.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1789
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1790 // 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	1791 // on some compilers.
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1792 T buf[64];
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1793
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1794 octave_idx_type ii = 0, jj;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1795 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	1796 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1797 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	1798 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1799 // Copy to buffer
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1800 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	1801 j < jj + 8; j++, idxj += nr)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1802 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	1803 buf[k++] = xelem (i + idxj);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1804
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1805 // Copy from buffer
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1806 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	1807 i++, idxi += nc)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1808 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	1809 j++, k+=8)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1810 result.xelem (j + idxi) = fcn (buf[k]);
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
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1813 if (ii < nr)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1814 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	1815 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	1816 result.xelem (j, i) = fcn (xelem (i, j));
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1817 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1818
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1819 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	1820 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	1821 result.xelem (j, i) = fcn (xelem (i, j));
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1822
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1823 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1824 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1825 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1826 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1827 Array<T> result (dim_vector (nc, nr));
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1828
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1829 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	1830 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	1831 result.xelem (j, i) = fcn (xelem (i, j));
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1832
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1833 return result;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1834 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1835 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1836
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1837 /*
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1838
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1839 %% 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	1840 %% and with four tiles.
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 %!shared m7, mt7, m8, mt8, m9, mt9
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1843 %! 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	1844 %! 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	1845 %! 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	1846 %! mt8 = mt8 = [mt7; 57:64];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1847 %! 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	1848 %! mt9 = [mt8; 65:72];
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1849
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1850 %!assert(m7', mt7)
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1851 %!assert((1im7).', 1i mt7)
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1852 %!assert((1im7)', conj (1i mt7))
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1853 %!assert(m8', mt8)
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1854 %!assert((1im8).', 1i mt8)
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1855 %!assert((1im8)', conj (1i mt8))
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1856 %!assert(m9', mt9)
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1857 %!assert((1im9).', 1i mt9)
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1858 %!assert((1im9)', conj (1i mt9))
762801c50b21 Fix tests for transpose in Array.cc David Bateman <dbateman@free.fr> parents: 7789 diff changeset	1859 %!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	1860 %!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	1861 %!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	1862 %!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	1863 %!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	1864 %!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	1865 %!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	1866 %!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	1867 %!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	1868
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7717 diff changeset	1869 */
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 template <class T>
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1872 T *
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1873 Array<T>::fortran_vec (void)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1874 {
6881 cd2c6a69a70d [project @ 2007-09-07 21:48:09 by jwe] jwe parents: 6867 diff changeset	1875 make_unique ();
cd2c6a69a70d [project @ 2007-09-07 21:48:09 by jwe] jwe parents: 6867 diff changeset	1876
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	1877 return slice_data;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1878 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1879
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	1880 template <class T>
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3657 diff changeset	1881 void
4517 b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1882 Array<T>::maybe_delete_dims (void)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1883 {
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4586 diff changeset	1884 int nd = dimensions.length ();
4517 b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1885
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1886 dim_vector new_dims (1, 1);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1887
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1888 bool delete_dims = true;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1889
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4586 diff changeset	1890 for (int i = nd - 1; i >= 0; i--)
4517 b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1891 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1892 if (delete_dims)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1893 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1894 if (dimensions(i) != 1)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1895 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1896 delete_dims = false;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1897
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1898 new_dims = dim_vector (i + 1, dimensions(i));
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1899 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1900 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1901 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1902 new_dims(i) = dimensions(i);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1903 }
4530 e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe] jwe parents: 4518 diff changeset	1904
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4586 diff changeset	1905 if (nd != new_dims.length ())
4517 b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1906 dimensions = new_dims;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1907 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1908
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	1909 template <class T>
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1910 bool
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1911 ascending_compare (T a, T b)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1912 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1913 return (a < b);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1914 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1915
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1916 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1917 bool
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1918 descending_compare (T a, T b)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1919 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1920 return (a > b);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1921 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1922
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1923 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1924 bool
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1925 ascending_compare (vec_index<T> a, vec_index<T> b)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1926 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1927 return (a->vec < b->vec);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1928 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1929
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1930 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1931 bool
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1932 descending_compare (vec_index<T> a, vec_index<T> b)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1933 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1934 return (a->vec > b->vec);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1935 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1936
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1937 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1938 Array<T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1939 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	1940 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1941 Array<T> m = *this;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1942
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1943 dim_vector dv = m.dims ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1944
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1945 if (m.length () < 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1946 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1947
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1948 octave_idx_type ns = dv(dim);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1949 octave_idx_type iter = dv.numel () / ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1950 octave_idx_type stride = 1;
8505 124dd27bedae Array.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8410 diff changeset	1951
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1952 for (int i = 0; i < dim; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1953 stride *= dv(i);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1954
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1955 T *v = m.fortran_vec ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1956 octave_sort<T> lsort;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1957
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1958 if (mode == ASCENDING)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1959 lsort.set_compare (ascending_compare);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1960 else if (mode == DESCENDING)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1961 lsort.set_compare (descending_compare);
7463 2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7443 diff changeset	1962 else
2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7443 diff changeset	1963 abort ();
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1964
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1965 if (stride == 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1966 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1967 for (octave_idx_type j = 0; j < iter; j++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1968 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1969 lsort.sort (v, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1970 v += ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1971 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1972 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1973 else
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1974 {
8379 ad8ed668e0a4 allow initialized local buffers Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	1975 OCTAVE_LOCAL_BUFFER (T, pvi, ns);
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1976
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1977 for (octave_idx_type j = 0; j < iter; j++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1978 {
8505 124dd27bedae Array.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8410 diff changeset	1979 octave_idx_type offset = j;
124dd27bedae Array.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8410 diff changeset	1980 octave_idx_type offset2 = 0;
124dd27bedae Array.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8410 diff changeset	1981
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1982 while (offset >= stride)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1983 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1984 offset -= stride;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1985 offset2++;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1986 }
8505 124dd27bedae Array.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8410 diff changeset	1987
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1988 offset += offset2 * stride * ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1989
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1990 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1991 pvi[i] = v[i*stride + offset];
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1992
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1993 lsort.sort (pvi, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1994
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1995 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1996 v[i*stride + offset] = pvi[i];
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 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	1999
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2000 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2001 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2002
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2003 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2004 Array<T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2005 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	2006 sortmode mode) const
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 Array<T> m = *this;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2009
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2010 dim_vector dv = m.dims ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2011
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2012 if (m.length () < 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2013 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2014 sidx = Array<octave_idx_type> (dv);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2015 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2016 }
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 octave_idx_type ns = dv(dim);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2019 octave_idx_type iter = dv.numel () / ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2020 octave_idx_type stride = 1;
8505 124dd27bedae Array.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8410 diff changeset	2021
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2022 for (int i = 0; i < dim; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2023 stride *= dv(i);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2024
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2025 T *v = m.fortran_vec ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2026 octave_sort<vec_index<T> *> indexed_sort;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2027
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2028 if (mode == ASCENDING)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2029 indexed_sort.set_compare (ascending_compare);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2030 else if (mode == DESCENDING)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2031 indexed_sort.set_compare (descending_compare);
7463 2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7443 diff changeset	2032 else
2467639bd8c0 eliminate UNDEFINED sort mode John W. Eaton <jwe@octave.org> parents: 7443 diff changeset	2033 abort ();
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2034
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2035 OCTAVE_LOCAL_BUFFER (vec_index<T> *, vi, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2036 OCTAVE_LOCAL_BUFFER (vec_index<T>, vix, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2037
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2038 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2039 vi[i] = &vix[i];
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2040
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2041 sidx = Array<octave_idx_type> (dv);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2042
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2043 if (stride == 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2044 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2045 for (octave_idx_type j = 0; j < iter; j++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2046 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2047 octave_idx_type offset = j * ns;
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 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2050 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2051 vi[i]->vec = v[i];
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2052 vi[i]->indx = i;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2053 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2054
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2055 indexed_sort.sort (vi, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2056
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2057 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2058 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2059 v[i] = vi[i]->vec;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2060 sidx(i + offset) = vi[i]->indx;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2061 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2062 v += ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2063 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2064 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2065 else
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2066 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2067 for (octave_idx_type j = 0; j < iter; j++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2068 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2069 octave_idx_type offset = j;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2070 octave_idx_type offset2 = 0;
8505 124dd27bedae Array.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8410 diff changeset	2071
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2072 while (offset >= stride)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2073 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2074 offset -= stride;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2075 offset2++;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2076 }
8505 124dd27bedae Array.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8410 diff changeset	2077
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2078 offset += offset2 * stride * ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2079
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2080 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2081 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2082 vi[i]->vec = v[i*stride + offset];
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2083 vi[i]->indx = i;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2084 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2085
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2086 indexed_sort.sort (vi, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2087
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2088 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2089 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2090 v[i*stride+offset] = vi[i]->vec;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2091 sidx(i*stride+offset) = vi[i]->indx;
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
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7321 diff changeset	2096 return m;
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
7443 d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2099 #if defined (HAVE_IEEE754_DATA_FORMAT)
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2100
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2101 template <>
7480 93826ba0d078 compilation fixes Jason Riedy parents: 7463 diff changeset	2102 bool ascending_compare (double, double);
7443 d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2103 template <>
7480 93826ba0d078 compilation fixes Jason Riedy parents: 7463 diff changeset	2104 bool ascending_compare (vec_index<double>, vec_index<double>);
7443 d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2105 template <>
7480 93826ba0d078 compilation fixes Jason Riedy parents: 7463 diff changeset	2106 bool descending_compare (double, double);
7443 d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2107 template <>
7480 93826ba0d078 compilation fixes Jason Riedy parents: 7463 diff changeset	2108 bool descending_compare (vec_index<double>, vec_index<double>);
7443 d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2109
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2110 template <>
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2111 Array<double> Array<double>::sort (octave_idx_type dim, sortmode mode) const;
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2112 template <>
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2113 Array<double> Array<double>::sort (Array<octave_idx_type> &sidx,
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2114 octave_idx_type dim, sortmode mode) const;
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2115
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2116 #endif
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe] jwe parents: 7442 diff changeset	2117
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2118 template <class T>
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2119 Array<T>
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2120 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	2121 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2122 dim_vector dv = dims ();
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2123 octave_idx_type nd = dv.length ();
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2124 Array<T> d;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2125
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2126 if (nd > 2)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2127 (*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	2128 else
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2129 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2130 octave_idx_type nnr = dv (0);
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2131 octave_idx_type nnc = dv (1);
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2132
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2133 if (nnr == 0 \|\| nnc == 0)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2134 ; // do nothing
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2135 else if (nnr != 1 && nnc != 1)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2136 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2137 if (k > 0)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2138 nnc -= k;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2139 else if (k < 0)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2140 nnr += k;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2141
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2142 if (nnr > 0 && nnc > 0)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2143 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2144 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	2145
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2146 d.resize (dim_vector (ndiag, 1));
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2147
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2148 if (k > 0)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2149 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2150 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	2151 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	2152 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2153 else if (k < 0)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2154 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2155 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	2156 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	2157 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2158 else
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2159 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2160 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	2161 d.xelem (i) = elem (i, i);
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2162 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2163 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2164 else
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2165 (*current_liboctave_error_handler)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2166 ("diag: requested diagonal out of range");
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2167 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2168 else if (nnr != 0 && nnc != 0)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2169 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2170 octave_idx_type roff = 0;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2171 octave_idx_type coff = 0;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2172 if (k > 0)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2173 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2174 roff = 0;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2175 coff = k;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2176 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2177 else if (k < 0)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2178 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2179 roff = -k;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2180 coff = 0;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2181 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2182
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2183 if (nnr == 1)
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2184 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2185 octave_idx_type n = nnc + std::abs (k);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	2186 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	2187
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2188 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	2189 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	2190 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2191 else
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2192 {
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2193 octave_idx_type n = nnr + std::abs (k);
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8179 diff changeset	2194 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	2195
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2196 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	2197 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	2198 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2199 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2200 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2201
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2202 return d;
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2203 }
36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7605 diff changeset	2204
4517 b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	2205 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe] jwe parents: 4513 diff changeset	2206 void
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3657 diff changeset	2207 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	2208 {
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	2209 os << prefix << "rep address: " << rep << '\n'
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	2210 << prefix << "rep->len: " << rep->len << '\n'
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	2211 << 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	2212 << prefix << "rep->count: " << rep->count << '\n'
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8505 diff changeset	2213 << 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	2214 << prefix << "slice_len: " << slice_len << '\n';
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	2215
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	2216 // 2D info:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	2217 //
4657 a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe] jwe parents: 4656 diff changeset	2218 // << pefix << "rows: " << rows () << "\n"
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4192 diff changeset	2219 // << prefix << "cols: " << cols () << "\n";
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3657 diff changeset	2220 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3657 diff changeset	2221
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	2222 /*
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	2223 ;;; Local Variables: ***
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	2224 ;;; mode: C++ ***
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	2225 ;;; End: ***
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	2226 */

Mercurial > hg > octave-lyh

annotate liboctave/Array.cc @ 8523:ad3afaaa19c1