Mercurial > hg > octave-nkf

annotate liboctave/Array.cc @ 10509:ddbd812d09aa

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