annotate liboctave/Array.cc @ 7605:48488cca0006

Fix for array indexing if original matrix is empty
author David Bateman <dbateman@free.fr>
date Wed, 19 Mar 2008 14:12:57 -0400
parents 6b2a99e44ff2
children 36594d5bbe13
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
7017
a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe]
jwe
parents: 7016
diff changeset
4 Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2002, 2003, 2004,
a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe]
jwe
parents: 7016
diff changeset
5 2005, 2006, 2007 John W. Eaton
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
6
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
7 This file is part of Octave.
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 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
10 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
11 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
12 option) any later version.
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
13
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
14 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
15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
16 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
17 for more details.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
18
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
19 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
20 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
21 <http://www.gnu.org/licenses/>.
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
22
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
23 */
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
24
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
25 #ifdef HAVE_CONFIG_H
1192
b6360f2d4fa6 [project @ 1995-03-30 21:38:35 by jwe]
jwe
parents: 1011
diff changeset
26 #include <config.h>
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
27 #endif
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
28
1367
9f9131a8d706 [project @ 1995-09-06 00:07:03 by jwe]
jwe
parents: 1360
diff changeset
29 #include <cassert>
4518
382cb0ed8c14 [project @ 2003-09-20 18:08:40 by jwe]
jwe
parents: 4517
diff changeset
30 #include <climits>
449
3cef0ce5dd7d [project @ 1994-06-05 21:58:52 by jwe]
jwe
parents: 386
diff changeset
31
3503
d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe]
jwe
parents: 2847
diff changeset
32 #include <iostream>
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5632
diff changeset
33 #include <sstream>
5607
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
34 #include <vector>
6674
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
35 #include <new>
1560
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe]
jwe
parents: 1550
diff changeset
36
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
37 #include "Array.h"
4588
19bfd295f400 [project @ 2003-11-10 17:18:48 by jwe]
jwe
parents: 4587
diff changeset
38 #include "Array-util.h"
1560
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe]
jwe
parents: 1550
diff changeset
39 #include "idx-vector.h"
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe]
jwe
parents: 1550
diff changeset
40 #include "lo-error.h"
27a03373de41 [project @ 1995-10-12 07:22:26 by jwe]
jwe
parents: 1550
diff changeset
41
1360
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe]
jwe
parents: 1321
diff changeset
42 // One dimensional array class. Handles the reference counting for
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe]
jwe
parents: 1321
diff changeset
43 // all the derived classes.
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
44
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
45 template <class T>
4834
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe]
jwe
parents: 4832
diff changeset
46 Array<T>::Array (const Array<T>& a, const dim_vector& dv)
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe]
jwe
parents: 4832
diff changeset
47 : rep (a.rep), dimensions (dv), idx (0), idx_count (0)
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe]
jwe
parents: 4832
diff changeset
48 {
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe]
jwe
parents: 4832
diff changeset
49 rep->count++;
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe]
jwe
parents: 4832
diff changeset
50
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe]
jwe
parents: 4832
diff changeset
51 if (a.numel () < dv.numel ())
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe]
jwe
parents: 4832
diff changeset
52 (*current_liboctave_error_handler)
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe]
jwe
parents: 4832
diff changeset
53 ("Array::Array (const Array&, const dim_vector&): dimension mismatch");
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe]
jwe
parents: 4832
diff changeset
54 }
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe]
jwe
parents: 4832
diff changeset
55
8f669cc5a901 [project @ 2004-03-11 18:49:17 by jwe]
jwe
parents: 4832
diff changeset
56 template <class T>
1619
1a35c8c91349 [project @ 1995-11-04 11:07:21 by jwe]
jwe
parents: 1574
diff changeset
57 Array<T>::~Array (void)
1a35c8c91349 [project @ 1995-11-04 11:07:21 by jwe]
jwe
parents: 1574
diff changeset
58 {
1a35c8c91349 [project @ 1995-11-04 11:07:21 by jwe]
jwe
parents: 1574
diff changeset
59 if (--rep->count <= 0)
1a35c8c91349 [project @ 1995-11-04 11:07:21 by jwe]
jwe
parents: 1574
diff changeset
60 delete rep;
1a35c8c91349 [project @ 1995-11-04 11:07:21 by jwe]
jwe
parents: 1574
diff changeset
61
1a35c8c91349 [project @ 1995-11-04 11:07:21 by jwe]
jwe
parents: 1574
diff changeset
62 delete [] idx;
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
63 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
64
4532
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
65 template <class T>
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
66 Array<T>
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
67 Array<T>::squeeze (void) const
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
68 {
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
69 Array<T> retval = *this;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
70
4929
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
71 if (ndims () > 2)
4532
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
72 {
4929
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
73 bool dims_changed = false;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
74
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
75 dim_vector new_dimensions = dimensions;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
76
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
77 int k = 0;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
78
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
79 for (int i = 0; i < ndims (); i++)
4759
364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe]
jwe
parents: 4757
diff changeset
80 {
4929
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
81 if (dimensions(i) == 1)
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
82 dims_changed = true;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
83 else
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
84 new_dimensions(k++) = dimensions(i);
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
85 }
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
86
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
87 if (dims_changed)
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
88 {
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
89 switch (k)
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
90 {
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
91 case 0:
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
92 new_dimensions = dim_vector (1, 1);
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
93 break;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
94
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
95 case 1:
4759
364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe]
jwe
parents: 4757
diff changeset
96 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
97 octave_idx_type tmp = new_dimensions(0);
4929
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
98
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
99 new_dimensions.resize (2);
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
100
4759
364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe]
jwe
parents: 4757
diff changeset
101 new_dimensions(0) = tmp;
364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe]
jwe
parents: 4757
diff changeset
102 new_dimensions(1) = 1;
364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe]
jwe
parents: 4757
diff changeset
103 }
4929
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
104 break;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
105
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
106 default:
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
107 new_dimensions.resize (k);
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
108 break;
585e9a8c2ef8 [project @ 2004-08-03 20:45:34 by jwe]
jwe
parents: 4916
diff changeset
109 }
4759
364bbf35dbfa [project @ 2004-02-15 00:08:06 by jwe]
jwe
parents: 4757
diff changeset
110 }
4532
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
111
5775
ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe]
jwe
parents: 5765
diff changeset
112 // FIXME -- it would be better if we did not have to do
5047
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
113 // this, so we could share the data while still having different
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
114 // dimension vectors.
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
115
4532
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
116 retval.make_unique ();
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
117
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
118 retval.dimensions = new_dimensions;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
119 }
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
120
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
121 return retval;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
122 }
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
123
6674
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
124 // KLUGE
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
125
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
126 // The following get_size functions will throw a std::bad_alloc ()
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
127 // exception if the requested size is larger than can be indexed by
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
128 // octave_idx_type. This may be smaller than the actual amount of
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
129 // memory that can be safely allocated on a system. However, if we
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
130 // don't fail here, we can end up with a mysterious crash inside a
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
131 // function that is iterating over an array using octave_idx_type
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
132 // indices.
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
133
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
134 // A guess (should be quite conservative).
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
135 #define MALLOC_OVERHEAD 1024
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
136
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
137 template <class T>
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
138 octave_idx_type
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
139 Array<T>::get_size (octave_idx_type r, octave_idx_type c)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
140 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
141 static int nl;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
142 static double dl
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
143 = frexp (static_cast<double>
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
144 (std::numeric_limits<octave_idx_type>::max() - MALLOC_OVERHEAD) / sizeof (T), &nl);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
145
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
146 int nr, nc;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
147 double dr = frexp (static_cast<double> (r), &nr); // r = dr * 2^nr
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
148 double dc = frexp (static_cast<double> (c), &nc); // c = dc * 2^nc
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
149
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
150 int nt = nr + nc;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
151 double dt = dr * dc;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
152
4532
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
153 if (dt < 0.5)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
154 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
155 nt--;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
156 dt *= 2;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
157 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
158
6674
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
159 if (nt < nl || (nt == nl && dt < dl))
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
160 return r * c;
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
161 else
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
162 {
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
163 throw std::bad_alloc ();
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
164 return 0;
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
165 }
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
166 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
167
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
168 template <class T>
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
169 octave_idx_type
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
170 Array<T>::get_size (octave_idx_type r, octave_idx_type c, octave_idx_type p)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
171 {
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
172 static int nl;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
173 static double dl
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
174 = frexp (static_cast<double>
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
175 (std::numeric_limits<octave_idx_type>::max() - MALLOC_OVERHEAD) / sizeof (T), &nl);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
176
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
177 int nr, nc, np;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
178 double dr = frexp (static_cast<double> (r), &nr);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
179 double dc = frexp (static_cast<double> (c), &nc);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
180 double dp = frexp (static_cast<double> (p), &np);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
181
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
182 int nt = nr + nc + np;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
183 double dt = dr * dc * dp;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
184
4532
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
185 if (dt < 0.5)
659
fe75d98598d6 [project @ 1994-08-29 21:23:06 by jwe]
jwe
parents: 645
diff changeset
186 {
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
187 nt--;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
188 dt *= 2;
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
189
4532
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
190 if (dt < 0.5)
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
191 {
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
192 nt--;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
193 dt *= 2;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
194 }
659
fe75d98598d6 [project @ 1994-08-29 21:23:06 by jwe]
jwe
parents: 645
diff changeset
195 }
1619
1a35c8c91349 [project @ 1995-11-04 11:07:21 by jwe]
jwe
parents: 1574
diff changeset
196
6674
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
197 if (nt < nl || (nt == nl && dt < dl))
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
198 return r * c * p;
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
199 else
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
200 {
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
201 throw std::bad_alloc ();
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
202 return 0;
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
203 }
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
204 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
205
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
206 template <class T>
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
207 octave_idx_type
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
208 Array<T>::get_size (const dim_vector& ra_idx)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
209 {
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
210 static int nl;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
211 static double dl
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
212 = frexp (static_cast<double>
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
213 (std::numeric_limits<octave_idx_type>::max() - MALLOC_OVERHEAD) / sizeof (T), &nl);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
214
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
215 int n = ra_idx.length ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
216
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
217 int nt = 0;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
218 double dt = 1;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
219
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
220 for (int i = 0; i < n; i++)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
221 {
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
222 int nra_idx;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
223 double dra_idx = frexp (static_cast<double> (ra_idx(i)), &nra_idx);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
224
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
225 nt += nra_idx;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
226 dt *= dra_idx;
4532
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
227
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
228 if (dt < 0.5)
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
229 {
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
230 nt--;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
231 dt *= 2;
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4530
diff changeset
232 }
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
233 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
234
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
235 if (nt < nl || (nt == nl && dt < dl))
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
236 {
6674
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
237 octave_idx_type retval = 1;
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
238
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
239 for (int i = 0; i < n; i++)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
240 retval *= ra_idx(i);
6674
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
241
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
242 return retval;
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
243 }
6674
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
244 else
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
245 {
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
246 throw std::bad_alloc ();
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
247 return 0;
e236f1b0a221 [project @ 2007-05-31 18:19:01 by jwe]
jwe
parents: 6553
diff changeset
248 }
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
249 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
250
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
251 #undef MALLOC_OVERHEAD
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
252
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
253 template <class T>
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
254 octave_idx_type
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
255 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
256 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
257 octave_idx_type retval = -1;
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
258
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
259 int n = dimensions.length ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
260
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
261 if (n > 0 && n == ra_idx.length ())
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
262 {
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
263 retval = ra_idx(--n);
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
264
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
265 while (--n >= 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
266 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
267 retval *= dimensions(n);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
268 retval += ra_idx(n);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
269 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
270 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
271 else
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
272 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
273 ("Array<T>::compute_index: invalid ra_idxing operation");
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
274
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
275 return retval;
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
276 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
277
2049
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe]
jwe
parents: 2006
diff changeset
278 template <class T>
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe]
jwe
parents: 2006
diff changeset
279 T
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
280 Array<T>::range_error (const char *fcn, octave_idx_type n) const
2049
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe]
jwe
parents: 2006
diff changeset
281 {
2109
356f70c8fcbd [project @ 1996-04-30 12:31:30 by jwe]
jwe
parents: 2049
diff changeset
282 (*current_liboctave_error_handler) ("%s (%d): range error", fcn, n);
2049
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe]
jwe
parents: 2006
diff changeset
283 return T ();
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe]
jwe
parents: 2006
diff changeset
284 }
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe]
jwe
parents: 2006
diff changeset
285
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe]
jwe
parents: 2006
diff changeset
286 template <class T>
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe]
jwe
parents: 2006
diff changeset
287 T&
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
288 Array<T>::range_error (const char *fcn, octave_idx_type n)
2049
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe]
jwe
parents: 2006
diff changeset
289 {
2109
356f70c8fcbd [project @ 1996-04-30 12:31:30 by jwe]
jwe
parents: 2049
diff changeset
290 (*current_liboctave_error_handler) ("%s (%d): range error", fcn, n);
2049
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe]
jwe
parents: 2006
diff changeset
291 static T foo;
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe]
jwe
parents: 2006
diff changeset
292 return foo;
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe]
jwe
parents: 2006
diff changeset
293 }
468a96dd03fc [project @ 1996-03-29 20:09:05 by jwe]
jwe
parents: 2006
diff changeset
294
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3657
diff changeset
295 template <class T>
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
296 T
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
297 Array<T>::range_error (const char *fcn, octave_idx_type i, octave_idx_type j) const
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
298 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
299 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
300 ("%s (%d, %d): range error", fcn, i, j);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
301 return T ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
302 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
303
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
304 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
305 T&
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
306 Array<T>::range_error (const char *fcn, octave_idx_type i, octave_idx_type j)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
307 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
308 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
309 ("%s (%d, %d): range error", fcn, i, j);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
310 static T foo;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
311 return foo;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
312 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
313
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
314 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
315 T
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
316 Array<T>::range_error (const char *fcn, octave_idx_type i, octave_idx_type j, octave_idx_type k) const
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
317 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
318 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
319 ("%s (%d, %d, %d): range error", fcn, i, j, k);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
320 return T ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
321 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
322
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
323 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
324 T&
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
325 Array<T>::range_error (const char *fcn, octave_idx_type i, octave_idx_type j, octave_idx_type k)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
326 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
327 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
328 ("%s (%d, %d, %d): range error", fcn, i, j, k);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
329 static T foo;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
330 return foo;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
331 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
332
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
333 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
334 T
6867
83619ae96c1d [project @ 2007-09-06 12:08:44 by dbateman]
dbateman
parents: 6674
diff changeset
335 Array<T>::range_error (const char *fcn, const Array<octave_idx_type>& ra_idx) const
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
336 {
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5632
diff changeset
337 std::ostringstream buf;
4661
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
338
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
339 buf << fcn << " (";
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
340
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
341 octave_idx_type n = ra_idx.length ();
4661
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
342
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
343 if (n > 0)
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
344 buf << ra_idx(0);
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
345
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
346 for (octave_idx_type i = 1; i < n; i++)
4661
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
347 buf << ", " << ra_idx(i);
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
348
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
349 buf << "): range error";
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
350
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5632
diff changeset
351 std::string buf_str = buf.str ();
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5632
diff changeset
352
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5632
diff changeset
353 (*current_liboctave_error_handler) (buf_str.c_str ());
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
354
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
355 return T ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
356 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
357
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
358 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
359 T&
6867
83619ae96c1d [project @ 2007-09-06 12:08:44 by dbateman]
dbateman
parents: 6674
diff changeset
360 Array<T>::range_error (const char *fcn, const Array<octave_idx_type>& ra_idx)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
361 {
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5632
diff changeset
362 std::ostringstream buf;
4661
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
363
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
364 buf << fcn << " (";
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
365
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
366 octave_idx_type n = ra_idx.length ();
4661
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
367
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
368 if (n > 0)
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
369 buf << ra_idx(0);
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
370
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
371 for (octave_idx_type i = 1; i < n; i++)
4661
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
372 buf << ", " << ra_idx(i);
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
373
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
374 buf << "): range error";
12b6fbd57436 [project @ 2003-11-25 05:41:35 by jwe]
jwe
parents: 4657
diff changeset
375
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5632
diff changeset
376 std::string buf_str = buf.str ();
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5632
diff changeset
377
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5632
diff changeset
378 (*current_liboctave_error_handler) (buf_str.c_str ());
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
379
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
380 static T foo;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
381 return foo;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
382 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
383
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
384 template <class T>
4567
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
385 Array<T>
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
386 Array<T>::reshape (const dim_vector& new_dims) const
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
387 {
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
388 Array<T> retval;
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
389
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
390 if (dimensions != new_dims)
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
391 {
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
392 if (dimensions.numel () == new_dims.numel ())
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
393 retval = Array<T> (*this, new_dims);
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
394 else
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
395 (*current_liboctave_error_handler) ("reshape: size mismatch");
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
396 }
4916
c45f14873b5e [project @ 2004-07-26 14:35:12 by jwe]
jwe
parents: 4915
diff changeset
397 else
c45f14873b5e [project @ 2004-07-26 14:35:12 by jwe]
jwe
parents: 4915
diff changeset
398 retval = *this;
4567
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
399
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
400 return retval;
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
401 }
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
402
7241
da540e715d05 [project @ 2007-12-03 22:55:20 by jwe]
jwe
parents: 7189
diff changeset
403
5607
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
404
4567
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4553
diff changeset
405 template <class T>
4593
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
406 Array<T>
5607
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
407 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
408 {
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
409 Array<T> retval;
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
410
5607
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
411 Array<octave_idx_type> perm_vec = perm_vec_arg;
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
412
4593
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
413 dim_vector dv = dims ();
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
414 dim_vector dv_new;
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
415
5148
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
416 int perm_vec_len = perm_vec.length ();
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
417
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
418 if (perm_vec_len < dv.length ())
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
419 (*current_liboctave_error_handler)
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
420 ("%s: invalid permutation vector", inv ? "ipermute" : "permute");
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
421
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
422 dv_new.resize (perm_vec_len);
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
423
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
424 // Append singleton dimensions as needed.
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
425 dv.resize (perm_vec_len, 1);
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
426
4593
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
427 // Need this array to check for identical elements in permutation array.
5148
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
428 Array<bool> checked (perm_vec_len, false);
4593
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
429
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
430 // Find dimension vector of permuted array.
5148
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
431 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
432 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
433 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
434
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
435 if (perm_elt >= perm_vec_len || perm_elt < 0)
4593
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
436 {
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
437 (*current_liboctave_error_handler)
5148
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
438 ("%s: permutation vector contains an invalid element",
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
439 inv ? "ipermute" : "permute");
4593
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
440
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
441 return retval;
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
442 }
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
443
5148
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
444 if (checked.elem(perm_elt))
4593
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
445 {
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
446 (*current_liboctave_error_handler)
5148
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
447 ("%s: permutation vector cannot contain identical elements",
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
448 inv ? "ipermute" : "permute");
4593
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
449
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
450 return retval;
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
451 }
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
452 else
5148
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
453 checked.elem(perm_elt) = true;
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
454
9eab94f5fadf [project @ 2005-02-18 19:04:34 by jwe]
jwe
parents: 5120
diff changeset
455 dv_new(i) = dv(perm_elt);
4593
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
456 }
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
457
5607
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
458 int nd = dv.length ();
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
459
5775
ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe]
jwe
parents: 5765
diff changeset
460 // FIXME -- it would be nice to have a sort method in the
5607
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
461 // Array class that also returns the sort indices.
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
462
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
463 if (inv)
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
464 {
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
465 OCTAVE_LOCAL_BUFFER (permute_vector, pvec, nd);
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
466
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
467 for (int i = 0; i < nd; i++)
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
468 {
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
469 pvec[i].pidx = perm_vec(i);
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
470 pvec[i].iidx = i;
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
471 }
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
472
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
473 octave_qsort (pvec, static_cast<size_t> (nd),
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
474 sizeof (permute_vector), permute_vector_compare);
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
475
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
476 for (int i = 0; i < nd; i++)
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
477 {
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
478 perm_vec(i) = pvec[i].iidx;
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
479 dv_new(i) = dv(perm_vec(i));
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
480 }
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
481 }
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
482
4593
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
483 retval.resize (dv_new);
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
484
5940
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
485 if (numel () > 0)
5607
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
486 {
5940
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
487 Array<octave_idx_type> cp (nd+1, 1);
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
488 for (octave_idx_type i = 1; i < nd+1; i++)
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
489 cp(i) = cp(i-1) * dv(i-1);
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
490
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
491 octave_idx_type incr = cp(perm_vec(0));
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
492
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
493 Array<octave_idx_type> base_delta (nd-1, 0);
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
494 Array<octave_idx_type> base_delta_max (nd-1);
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
495 Array<octave_idx_type> base_incr (nd-1);
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
496 for (octave_idx_type i = 0; i < nd-1; i++)
5607
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
497 {
5940
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
498 base_delta_max(i) = dv_new(i+1);
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
499 base_incr(i) = cp(perm_vec(i+1));
5607
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
500 }
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
501
5940
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
502 octave_idx_type nr_new = dv_new(0);
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
503 octave_idx_type nel_new = dv_new.numel ();
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
504 octave_idx_type n = nel_new / nr_new;
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
505
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
506 octave_idx_type k = 0;
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
507
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
508 for (octave_idx_type i = 0; i < n; i++)
5607
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
509 {
5940
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
510 octave_idx_type iidx = 0;
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
511 for (octave_idx_type kk = 0; kk < nd-1; kk++)
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
512 iidx += base_delta(kk) * base_incr(kk);
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
513
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
514 for (octave_idx_type j = 0; j < nr_new; j++)
5607
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
515 {
5940
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
516 OCTAVE_QUIT;
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
517
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
518 retval(k++) = elem(iidx);
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
519 iidx += incr;
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
520 }
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
521
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
522 base_delta(0)++;
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
523
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
524 for (octave_idx_type kk = 0; kk < nd-2; kk++)
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
525 {
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
526 if (base_delta(kk) == base_delta_max(kk))
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
527 {
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
528 base_delta(kk) = 0;
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
529 base_delta(kk+1)++;
0dd8428bb260 [project @ 2006-08-18 17:50:23 by jwe]
jwe
parents: 5837
diff changeset
530 }
5607
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
531 }
4b33d802ef3c [project @ 2006-02-08 18:56:54 by jwe]
jwe
parents: 5535
diff changeset
532 }
4593
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
533 }
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
534
5340
15843d76156d [project @ 2005-05-06 16:26:58 by jwe]
jwe
parents: 5338
diff changeset
535 retval.chop_trailing_singletons ();
5338
c4b55d47122e [project @ 2005-05-05 17:28:51 by jwe]
jwe
parents: 5307
diff changeset
536
4593
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
537 return retval;
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
538 }
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
539
77566be8b9e9 [project @ 2003-11-11 17:25:42 by jwe]
jwe
parents: 4592
diff changeset
540 template <class T>
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
541 void
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
542 Array<T>::resize_no_fill (octave_idx_type n)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
543 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
544 if (n < 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
545 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
546 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
547 ("can't resize to negative dimension");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
548 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
549 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
550
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
551 if (n == length ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
552 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
553
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
554 typename Array<T>::ArrayRep *old_rep = rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
555 const T *old_data = data ();
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
556 octave_idx_type old_len = length ();
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
557
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
558 rep = new typename Array<T>::ArrayRep (n);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
559
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
560 dimensions = dim_vector (n);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
561
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
562 if (n > 0 && old_data && old_len > 0)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
563 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
564 octave_idx_type min_len = old_len < n ? old_len : n;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
565
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
566 for (octave_idx_type i = 0; i < min_len; i++)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
567 xelem (i) = old_data[i];
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
568 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
569
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
570 if (--old_rep->count <= 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
571 delete old_rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
572 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
573
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
574 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
575 void
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4586
diff changeset
576 Array<T>::resize_no_fill (const dim_vector& dv)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
577 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
578 octave_idx_type n = dv.length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
579
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
580 for (octave_idx_type i = 0; i < n; i++)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
581 {
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4586
diff changeset
582 if (dv(i) < 0)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
583 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
584 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
585 ("can't resize to negative dimension");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
586 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
587 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
588 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
589
4548
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
590 bool same_size = true;
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
591
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
592 if (dimensions.length () != n)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
593 {
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
594 same_size = false;
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
595 }
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
596 else
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
597 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
598 for (octave_idx_type i = 0; i < n; i++)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
599 {
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4586
diff changeset
600 if (dv(i) != dimensions(i))
4548
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
601 {
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
602 same_size = false;
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
603 break;
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
604 }
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
605 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
606 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
607
4548
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
608 if (same_size)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
609 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
610
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
611 typename Array<T>::ArrayRep *old_rep = rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
612 const T *old_data = data ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
613
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
614 octave_idx_type ts = get_size (dv);
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
615
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
616 rep = new typename Array<T>::ArrayRep (ts);
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4586
diff changeset
617
4870
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
618 dim_vector dv_old = dimensions;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
619 octave_idx_type dv_old_orig_len = dv_old.length ();
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4586
diff changeset
620 dimensions = dv;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
621 octave_idx_type ts_old = get_size (dv_old);
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
622
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
623 if (ts > 0 && ts_old > 0 && dv_old_orig_len > 0)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
624 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
625 Array<octave_idx_type> ra_idx (dimensions.length (), 0);
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
626
4870
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
627 if (n > dv_old_orig_len)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
628 {
4870
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
629 dv_old.resize (n);
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
630
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
631 for (octave_idx_type i = dv_old_orig_len; i < n; i++)
4870
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
632 dv_old.elem (i) = 1;
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
633 }
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
634
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
635 for (octave_idx_type i = 0; i < ts; i++)
4870
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
636 {
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
637 if (index_in_bounds (ra_idx, dv_old))
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
638 rep->elem (i) = old_data[get_scalar_idx (ra_idx, dv_old)];
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
639
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
640 increment_index (ra_idx, dimensions);
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
641 }
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
642 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
643
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
644 if (--old_rep->count <= 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
645 delete old_rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
646 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
647
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
648 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
649 void
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
650 Array<T>::resize_no_fill (octave_idx_type r, octave_idx_type c)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
651 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
652 if (r < 0 || c < 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
653 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
654 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
655 ("can't resize to negative dimension");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
656 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
657 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
658
4548
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
659 int n = ndims ();
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
660
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
661 if (n == 0)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
662 dimensions = dim_vector (0, 0);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
663
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
664 assert (ndims () == 2);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
665
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
666 if (r == dim1 () && c == dim2 ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
667 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
668
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
669 typename Array<T>::ArrayRep *old_rep = Array<T>::rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
670 const T *old_data = data ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
671
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
672 octave_idx_type old_d1 = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
673 octave_idx_type old_d2 = dim2 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
674 octave_idx_type old_len = length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
675
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
676 octave_idx_type ts = get_size (r, c);
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
677
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
678 rep = new typename Array<T>::ArrayRep (ts);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
679
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
680 dimensions = dim_vector (r, c);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
681
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
682 if (ts > 0 && old_data && old_len > 0)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
683 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
684 octave_idx_type min_r = old_d1 < r ? old_d1 : r;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
685 octave_idx_type min_c = old_d2 < c ? old_d2 : c;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
686
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
687 for (octave_idx_type j = 0; j < min_c; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
688 for (octave_idx_type i = 0; i < min_r; i++)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
689 xelem (i, j) = old_data[old_d1*j+i];
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
690 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
691
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
692 if (--old_rep->count <= 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
693 delete old_rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
694 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
695
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
696 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
697 void
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
698 Array<T>::resize_no_fill (octave_idx_type r, octave_idx_type c, octave_idx_type p)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
699 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
700 if (r < 0 || c < 0 || p < 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
701 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
702 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
703 ("can't resize to negative dimension");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
704 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
705 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
706
4548
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
707 int n = ndims ();
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
708
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
709 if (n == 0)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
710 dimensions = dim_vector (0, 0, 0);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
711
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
712 assert (ndims () == 3);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
713
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
714 if (r == dim1 () && c == dim2 () && p == dim3 ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
715 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
716
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
717 typename Array<T>::ArrayRep *old_rep = rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
718 const T *old_data = data ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
719
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
720 octave_idx_type old_d1 = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
721 octave_idx_type old_d2 = dim2 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
722 octave_idx_type old_d3 = dim3 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
723 octave_idx_type old_len = length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
724
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
725 octave_idx_type ts = get_size (get_size (r, c), p);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
726
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
727 rep = new typename Array<T>::ArrayRep (ts);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
728
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
729 dimensions = dim_vector (r, c, p);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
730
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
731 if (ts > 0 && old_data && old_len > 0)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
732 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
733 octave_idx_type min_r = old_d1 < r ? old_d1 : r;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
734 octave_idx_type min_c = old_d2 < c ? old_d2 : c;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
735 octave_idx_type min_p = old_d3 < p ? old_d3 : p;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
736
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
737 for (octave_idx_type k = 0; k < min_p; k++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
738 for (octave_idx_type j = 0; j < min_c; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
739 for (octave_idx_type i = 0; i < min_r; i++)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
740 xelem (i, j, k) = old_data[old_d1*(old_d2*k+j)+i];
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
741 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
742
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
743 if (--old_rep->count <= 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
744 delete old_rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
745 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
746
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
747 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
748 void
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
749 Array<T>::resize_and_fill (octave_idx_type n, const T& val)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
750 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
751 if (n < 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
752 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
753 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
754 ("can't resize to negative dimension");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
755 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
756 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
757
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
758 if (n == length ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
759 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
760
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
761 typename Array<T>::ArrayRep *old_rep = rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
762 const T *old_data = data ();
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
763 octave_idx_type old_len = length ();
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
764
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
765 rep = new typename Array<T>::ArrayRep (n);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
766
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
767 dimensions = dim_vector (n);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
768
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
769 if (n > 0)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
770 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
771 octave_idx_type min_len = old_len < n ? old_len : n;
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
772
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
773 if (old_data && old_len > 0)
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
774 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
775 for (octave_idx_type i = 0; i < min_len; i++)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
776 xelem (i) = old_data[i];
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
777 }
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
778
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
779 for (octave_idx_type i = old_len; i < n; i++)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
780 xelem (i) = val;
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
781 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
782
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
783 if (--old_rep->count <= 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
784 delete old_rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
785 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
786
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
787 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
788 void
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
789 Array<T>::resize_and_fill (octave_idx_type r, octave_idx_type c, const T& val)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
790 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
791 if (r < 0 || c < 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
792 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
793 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
794 ("can't resize to negative dimension");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
795 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
796 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
797
4548
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
798 if (ndims () == 0)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
799 dimensions = dim_vector (0, 0);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
800
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
801 assert (ndims () == 2);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
802
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
803 if (r == dim1 () && c == dim2 ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
804 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
805
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
806 typename Array<T>::ArrayRep *old_rep = Array<T>::rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
807 const T *old_data = data ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
808
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
809 octave_idx_type old_d1 = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
810 octave_idx_type old_d2 = dim2 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
811 octave_idx_type old_len = length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
812
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
813 octave_idx_type ts = get_size (r, c);
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
814
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
815 rep = new typename Array<T>::ArrayRep (ts);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
816
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
817 dimensions = dim_vector (r, c);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
818
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
819 if (ts > 0)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
820 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
821 octave_idx_type min_r = old_d1 < r ? old_d1 : r;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
822 octave_idx_type min_c = old_d2 < c ? old_d2 : c;
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
823
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
824 if (old_data && old_len > 0)
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
825 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
826 for (octave_idx_type j = 0; j < min_c; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
827 for (octave_idx_type i = 0; i < min_r; i++)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
828 xelem (i, j) = old_data[old_d1*j+i];
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
829 }
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
830
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
831 for (octave_idx_type j = 0; j < min_c; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
832 for (octave_idx_type i = min_r; i < r; i++)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
833 xelem (i, j) = val;
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
834
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
835 for (octave_idx_type j = min_c; j < c; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
836 for (octave_idx_type i = 0; i < r; i++)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
837 xelem (i, j) = val;
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
838 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
839
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
840 if (--old_rep->count <= 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
841 delete old_rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
842 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
843
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
844 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
845 void
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
846 Array<T>::resize_and_fill (octave_idx_type r, octave_idx_type c, octave_idx_type p, const T& val)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
847 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
848 if (r < 0 || c < 0 || p < 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
849 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
850 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
851 ("can't resize to negative dimension");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
852 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
853 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
854
4548
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
855 if (ndims () == 0)
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
856 dimensions = dim_vector (0, 0, 0);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
857
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
858 assert (ndims () == 3);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
859
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
860 if (r == dim1 () && c == dim2 () && p == dim3 ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
861 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
862
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
863 typename Array<T>::ArrayRep *old_rep = rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
864 const T *old_data = data ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
865
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
866 octave_idx_type old_d1 = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
867 octave_idx_type old_d2 = dim2 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
868 octave_idx_type old_d3 = dim3 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
869
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
870 octave_idx_type old_len = length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
871
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
872 octave_idx_type ts = get_size (get_size (r, c), p);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
873
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
874 rep = new typename Array<T>::ArrayRep (ts);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
875
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
876 dimensions = dim_vector (r, c, p);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
877
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
878 if (ts > 0)
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
879 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
880 octave_idx_type min_r = old_d1 < r ? old_d1 : r;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
881 octave_idx_type min_c = old_d2 < c ? old_d2 : c;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
882 octave_idx_type min_p = old_d3 < p ? old_d3 : p;
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
883
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
884 if (old_data && old_len > 0)
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
885 for (octave_idx_type k = 0; k < min_p; k++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
886 for (octave_idx_type j = 0; j < min_c; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
887 for (octave_idx_type i = 0; i < min_r; i++)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
888 xelem (i, j, k) = old_data[old_d1*(old_d2*k+j)+i];
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
889
5775
ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe]
jwe
parents: 5765
diff changeset
890 // FIXME -- if the copy constructor is expensive, this
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
891 // may win. Otherwise, it may make more sense to just copy the
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
892 // value everywhere when making the new ArrayRep.
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
893
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
894 for (octave_idx_type k = 0; k < min_p; k++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
895 for (octave_idx_type j = min_c; j < c; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
896 for (octave_idx_type i = 0; i < min_r; i++)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
897 xelem (i, j, k) = val;
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
898
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
899 for (octave_idx_type k = 0; k < min_p; k++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
900 for (octave_idx_type j = 0; j < c; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
901 for (octave_idx_type i = min_r; i < r; i++)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
902 xelem (i, j, k) = val;
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
903
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
904 for (octave_idx_type k = min_p; k < p; k++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
905 for (octave_idx_type j = 0; j < c; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
906 for (octave_idx_type i = 0; i < r; i++)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
907 xelem (i, j, k) = val;
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
908 }
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
909
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
910 if (--old_rep->count <= 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
911 delete old_rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
912 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
913
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
914 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
915 void
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4586
diff changeset
916 Array<T>::resize_and_fill (const dim_vector& dv, const T& val)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
917 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
918 octave_idx_type n = dv.length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
919
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
920 for (octave_idx_type i = 0; i < n; i++)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
921 {
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4586
diff changeset
922 if (dv(i) < 0)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
923 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
924 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
925 ("can't resize to negative dimension");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
926 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
927 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
928 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
929
4553
c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe]
jwe
parents: 4548
diff changeset
930 bool same_size = true;
c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe]
jwe
parents: 4548
diff changeset
931
c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe]
jwe
parents: 4548
diff changeset
932 if (dimensions.length () != n)
c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe]
jwe
parents: 4548
diff changeset
933 {
c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe]
jwe
parents: 4548
diff changeset
934 same_size = false;
c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe]
jwe
parents: 4548
diff changeset
935 }
c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe]
jwe
parents: 4548
diff changeset
936 else
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
937 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
938 for (octave_idx_type i = 0; i < n; i++)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
939 {
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4586
diff changeset
940 if (dv(i) != dimensions(i))
4553
c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe]
jwe
parents: 4548
diff changeset
941 {
c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe]
jwe
parents: 4548
diff changeset
942 same_size = false;
c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe]
jwe
parents: 4548
diff changeset
943 break;
c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe]
jwe
parents: 4548
diff changeset
944 }
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
945 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
946 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
947
4553
c7eb767505e9 [project @ 2003-10-27 21:39:55 by jwe]
jwe
parents: 4548
diff changeset
948 if (same_size)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
949 return;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
950
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
951 typename Array<T>::ArrayRep *old_rep = rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
952 const T *old_data = data ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
953
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
954 octave_idx_type len = get_size (dv);
4709
cf141edca935 [project @ 2004-01-22 18:10:53 by jwe]
jwe
parents: 4708
diff changeset
955
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
956 rep = new typename Array<T>::ArrayRep (len);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
957
4707
8d4bb887f381 [project @ 2004-01-22 16:01:51 by jwe]
jwe
parents: 4703
diff changeset
958 dim_vector dv_old = dimensions;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
959 octave_idx_type dv_old_orig_len = dv_old.length ();
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4586
diff changeset
960 dimensions = dv;
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
961
4870
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
962 if (len > 0 && dv_old_orig_len > 0)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
963 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
964 Array<octave_idx_type> ra_idx (dimensions.length (), 0);
4870
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
965
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
966 if (n > dv_old_orig_len)
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
967 {
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
968 dv_old.resize (n);
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
969
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
970 for (octave_idx_type i = dv_old_orig_len; i < n; i++)
4870
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
971 dv_old.elem (i) = 1;
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
972 }
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
973
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
974 for (octave_idx_type i = 0; i < len; i++)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
975 {
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
976 if (index_in_bounds (ra_idx, dv_old))
4870
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
977 rep->elem (i) = old_data[get_scalar_idx (ra_idx, dv_old)];
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
978 else
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
979 rep->elem (i) = val;
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
980
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
981 increment_index (ra_idx, dimensions);
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
982 }
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
983 }
4870
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
984 else
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
985 for (octave_idx_type i = 0; i < len; i++)
4870
2cbc6f37b0c2 [project @ 2004-04-21 17:30:51 by jwe]
jwe
parents: 4834
diff changeset
986 rep->elem (i) = val;
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
987
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
988 if (--old_rep->count <= 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
989 delete old_rep;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
990 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
991
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
992 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
993 Array<T>&
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
994 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
995 {
4786
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
996 if (ndims () == 2 && a.ndims () == 2)
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
997 insert2 (a, r, c);
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
998 else
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
999 insertN (a, r, c);
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1000
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1001 return *this;
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1002 }
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1003
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1004
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1005 template <class T>
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1006 Array<T>&
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1007 Array<T>::insert2 (const Array<T>& a, octave_idx_type r, octave_idx_type c)
4786
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1008 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1009 octave_idx_type a_rows = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1010 octave_idx_type a_cols = a.cols ();
4786
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1011
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1012 if (r < 0 || r + a_rows > rows () || c < 0 || c + a_cols > cols ())
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1013 {
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1014 (*current_liboctave_error_handler) ("range error for insert");
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1015 return *this;
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1016 }
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1017
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1018 for (octave_idx_type j = 0; j < a_cols; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1019 for (octave_idx_type i = 0; i < a_rows; i++)
4786
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1020 elem (r+i, c+j) = a.elem (i, j);
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1021
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1022 return *this;
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1023 }
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1024
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1025 template <class T>
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1026 Array<T>&
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1027 Array<T>::insertN (const Array<T>& a, octave_idx_type r, octave_idx_type c)
4786
fc316bde0053 [project @ 2004-02-18 12:52:20 by jwe]
jwe
parents: 4765
diff changeset
1028 {
4806
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1029 dim_vector dv = dims ();
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1030
4765
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1031 dim_vector a_dv = a.dims ();
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1032
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1033 int n = a_dv.length ();
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1034
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1035 if (n == dimensions.length ())
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1036 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1037 Array<octave_idx_type> a_ra_idx (a_dv.length (), 0);
4765
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1038
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1039 a_ra_idx.elem (0) = r;
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1040 a_ra_idx.elem (1) = c;
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1041
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1042 for (int i = 0; i < n; i++)
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1043 {
4806
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1044 if (a_ra_idx(i) < 0 || (a_ra_idx(i) + a_dv(i)) > dv(i))
4765
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1045 {
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1046 (*current_liboctave_error_handler)
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1047 ("Array<T>::insert: range error for insert");
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1048 return *this;
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1049 }
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1050 }
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1051
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1052 octave_idx_type n_elt = a.numel ();
4806
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1053
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1054 const T *a_data = a.data ();
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1055
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1056 octave_idx_type iidx = 0;
4806
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1057
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1058 octave_idx_type a_rows = a_dv(0);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1059
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1060 octave_idx_type this_rows = dv(0);
4806
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1061
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1062 octave_idx_type numel_page = a_dv(0) * a_dv(1);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1063
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1064 octave_idx_type count_pages = 0;
4806
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1065
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1066 for (octave_idx_type i = 0; i < n_elt; i++)
4765
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1067 {
4806
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1068 if (i != 0 && i % a_rows == 0)
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1069 iidx += (this_rows - a_rows);
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1070
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1071 if (i % numel_page == 0)
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1072 iidx = c * dv(0) + r + dv(0) * dv(1) * count_pages++;
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1073
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4796
diff changeset
1074 elem (iidx++) = a_data[i];
4765
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1075 }
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1076 }
4765
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1077 else
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1078 (*current_liboctave_error_handler)
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe]
jwe
parents: 4762
diff changeset
1079 ("Array<T>::insert: invalid indexing operation");
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1080
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1081 return *this;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1082 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1083
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1084 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1085 Array<T>&
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1086 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
1087 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1088 octave_idx_type n = ra_idx.length ();
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1089
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1090 if (n == dimensions.length ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1091 {
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
1092 dim_vector dva = a.dims ();
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
1093 dim_vector dv = dims ();
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
1094 int len_a = dva.length ();
5120
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1095 int non_full_dim = 0;
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1096
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1097 for (octave_idx_type i = 0; i < n; i++)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1098 {
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
1099 if (ra_idx(i) < 0 || (ra_idx(i) +
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
1100 (i < len_a ? dva(i) : 1)) > dimensions(i))
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1101 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1102 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1103 ("Array<T>::insert: range error for insert");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1104 return *this;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1105 }
5120
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1106
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1107 if (dv(i) != (i < len_a ? dva(i) : 1))
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1108 non_full_dim++;
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1109 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1110
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
1111 if (dva.numel ())
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
1112 {
5120
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1113 if (non_full_dim < 2)
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
1114 {
5120
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1115 // Special case for fast concatenation
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1116 const T *a_data = a.data ();
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1117 octave_idx_type numel_to_move = 1;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1118 octave_idx_type skip = 0;
5120
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1119 for (int i = 0; i < len_a; i++)
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1120 if (ra_idx(i) == 0 && dva(i) == dv(i))
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1121 numel_to_move *= dva(i);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1122 else
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1123 {
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1124 skip = numel_to_move * (dv(i) - dva(i));
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1125 numel_to_move *= dva(i);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1126 break;
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1127 }
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1128
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1129 octave_idx_type jidx = ra_idx(n-1);
5120
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1130 for (int i = n-2; i >= 0; i--)
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1131 {
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1132 jidx *= dv(i);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1133 jidx += ra_idx(i);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1134 }
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1135
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1136 octave_idx_type iidx = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1137 octave_idx_type moves = dva.numel () / numel_to_move;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1138 for (octave_idx_type i = 0; i < moves; i++)
5120
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1139 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1140 for (octave_idx_type j = 0; j < numel_to_move; j++)
5120
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1141 elem (jidx++) = a_data[iidx++];
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1142 jidx += skip;
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1143 }
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
1144 }
5120
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1145 else
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
1146 {
5120
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1147 // Generic code
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1148 const T *a_data = a.data ();
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1149 int nel = a.numel ();
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1150 Array<octave_idx_type> a_idx (n, 0);
5120
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1151
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1152 for (int i = 0; i < nel; i++)
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1153 {
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1154 int iidx = a_idx(n-1) + ra_idx(n-1);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1155 for (int j = n-2; j >= 0; j--)
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1156 {
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1157 iidx *= dv(j);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1158 iidx += a_idx(j) + ra_idx(j);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1159 }
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1160
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1161 elem (iidx) = a_data[i];
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1162
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1163 increment_index (a_idx, dva);
eb900c53cdb7 [project @ 2005-01-26 22:08:37 by jwe]
jwe
parents: 5108
diff changeset
1164 }
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
1165 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4898
diff changeset
1166 }
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1167 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1168 else
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1169 (*current_liboctave_error_handler)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1170 ("Array<T>::insert: invalid indexing operation");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1171
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1172 return *this;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1173 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1174
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1175 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1176 Array<T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1177 Array<T>::transpose (void) const
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1178 {
4548
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
1179 assert (ndims () == 2);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
1180
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1181 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1182 octave_idx_type nc = dim2 ();
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1183
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1184 if (nr > 1 && nc > 1)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1185 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1186 Array<T> result (dim_vector (nc, nr));
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1187
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1188 for (octave_idx_type j = 0; j < nc; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1189 for (octave_idx_type i = 0; i < nr; i++)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1190 result.xelem (j, i) = xelem (i, j);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1191
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1192 return result;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1193 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1194 else
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1195 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1196 // Fast transpose for vectors and empty matrices
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1197 return Array<T> (*this, dim_vector (nc, nr));
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1198 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1199 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1200
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1201 template <class T>
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1202 T *
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1203 Array<T>::fortran_vec (void)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1204 {
6881
cd2c6a69a70d [project @ 2007-09-07 21:48:09 by jwe]
jwe
parents: 6867
diff changeset
1205 make_unique ();
cd2c6a69a70d [project @ 2007-09-07 21:48:09 by jwe]
jwe
parents: 6867
diff changeset
1206
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1207 return rep->data;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1208 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1209
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
1210 template <class T>
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3657
diff changeset
1211 void
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1212 Array<T>::maybe_delete_dims (void)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1213 {
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4586
diff changeset
1214 int nd = dimensions.length ();
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1215
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1216 dim_vector new_dims (1, 1);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1217
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1218 bool delete_dims = true;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1219
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4586
diff changeset
1220 for (int i = nd - 1; i >= 0; i--)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1221 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1222 if (delete_dims)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1223 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1224 if (dimensions(i) != 1)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1225 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1226 delete_dims = false;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1227
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1228 new_dims = dim_vector (i + 1, dimensions(i));
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1229 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1230 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1231 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1232 new_dims(i) = dimensions(i);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1233 }
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
1234
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4586
diff changeset
1235 if (nd != new_dims.length ())
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1236 dimensions = new_dims;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1237 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1238
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1239 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1240 void
6881
cd2c6a69a70d [project @ 2007-09-07 21:48:09 by jwe]
jwe
parents: 6867
diff changeset
1241 Array<T>::clear_index (void) const
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1242 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1243 delete [] idx;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1244 idx = 0;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1245 idx_count = 0;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1246 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1247
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1248 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1249 void
6881
cd2c6a69a70d [project @ 2007-09-07 21:48:09 by jwe]
jwe
parents: 6867
diff changeset
1250 Array<T>::set_index (const idx_vector& idx_arg) const
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1251 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1252 int nd = ndims ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1253
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1254 if (! idx && nd > 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1255 idx = new idx_vector [nd];
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1256
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1257 if (idx_count < nd)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1258 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1259 idx[idx_count++] = idx_arg;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1260 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1261 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1262 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1263 idx_vector *new_idx = new idx_vector [idx_count+1];
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1264
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1265 for (int i = 0; i < idx_count; i++)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1266 new_idx[i] = idx[i];
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1267
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1268 new_idx[idx_count++] = idx_arg;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1269
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1270 delete [] idx;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1271
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1272 idx = new_idx;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1273 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1274 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1275
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1276 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1277 void
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1278 Array<T>::maybe_delete_elements (idx_vector& idx_arg)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1279 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1280 switch (ndims ())
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1281 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1282 case 1:
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1283 maybe_delete_elements_1 (idx_arg);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1284 break;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1285
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1286 case 2:
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1287 maybe_delete_elements_2 (idx_arg);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1288 break;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1289
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1290 default:
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1291 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1292 ("Array<T>::maybe_delete_elements: invalid operation");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1293 break;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1294 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1295 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1296
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1297 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1298 void
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1299 Array<T>::maybe_delete_elements_1 (idx_vector& idx_arg)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1300 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1301 octave_idx_type len = length ();
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1302
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1303 if (len == 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1304 return;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1305
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1306 if (idx_arg.is_colon_equiv (len, 1))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1307 resize_no_fill (0);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1308 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1309 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1310 int num_to_delete = idx_arg.length (len);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1311
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1312 if (num_to_delete != 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1313 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1314 octave_idx_type new_len = len;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1315
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1316 octave_idx_type iidx = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1317
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1318 for (octave_idx_type i = 0; i < len; i++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1319 if (i == idx_arg.elem (iidx))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1320 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1321 iidx++;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1322 new_len--;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1323
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1324 if (iidx == num_to_delete)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1325 break;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1326 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1327
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1328 if (new_len > 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1329 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1330 T *new_data = new T [new_len];
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1331
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1332 octave_idx_type ii = 0;
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1333 iidx = 0;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1334 for (octave_idx_type i = 0; i < len; i++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1335 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1336 if (iidx < num_to_delete && i == idx_arg.elem (iidx))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1337 iidx++;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1338 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1339 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
1340 new_data[ii] = xelem (i);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1341 ii++;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1342 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1343 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1344
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1345 if (--rep->count <= 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1346 delete rep;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1347
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1348 rep = new typename Array<T>::ArrayRep (new_data, new_len);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1349
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1350 dimensions.resize (1);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1351 dimensions(0) = new_len;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1352 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1353 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1354 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1355 ("A(idx) = []: index out of range");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1356 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1357 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1358 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1359
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1360 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1361 void
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1362 Array<T>::maybe_delete_elements_2 (idx_vector& idx_arg)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1363 {
4548
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
1364 assert (ndims () == 2);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
1365
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1366 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1367 octave_idx_type nc = dim2 ();
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1368
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1369 octave_idx_type n;
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1370 if (nr == 1)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1371 n = nc;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1372 else if (nc == 1)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1373 n = nr;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1374 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1375 {
4756
60c78bde10e5 [project @ 2004-02-13 21:58:01 by jwe]
jwe
parents: 4755
diff changeset
1376 // Reshape to row vector for Matlab compatibility.
60c78bde10e5 [project @ 2004-02-13 21:58:01 by jwe]
jwe
parents: 4755
diff changeset
1377
60c78bde10e5 [project @ 2004-02-13 21:58:01 by jwe]
jwe
parents: 4755
diff changeset
1378 n = nr * nc;
60c78bde10e5 [project @ 2004-02-13 21:58:01 by jwe]
jwe
parents: 4755
diff changeset
1379 nr = 1;
60c78bde10e5 [project @ 2004-02-13 21:58:01 by jwe]
jwe
parents: 4755
diff changeset
1380 nc = n;
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1381 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1382
6525
25f3fb4a6f1b [project @ 2007-04-13 16:18:29 by jwe]
jwe
parents: 6481
diff changeset
1383 if (nr > 0 && nc > 0 && idx_arg.is_colon_equiv (n, 1))
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1384 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1385 // Either A(:) = [] or A(idx) = [] with idx enumerating all
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1386 // elements, so we delete all elements and return [](0x0). To
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1387 // preserve the orientation of the vector, you have to use
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1388 // A(idx,:) = [] (delete rows) or A(:,idx) (delete columns).
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1389
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1390 resize_no_fill (0, 0);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1391 return;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1392 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1393
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1394 idx_arg.sort (true);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1395
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1396 octave_idx_type num_to_delete = idx_arg.length (n);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1397
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1398 if (num_to_delete != 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1399 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1400 octave_idx_type new_n = n;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1401
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1402 octave_idx_type iidx = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1403
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1404 for (octave_idx_type i = 0; i < n; i++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1405 if (i == idx_arg.elem (iidx))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1406 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1407 iidx++;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1408 new_n--;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1409
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1410 if (iidx == num_to_delete)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1411 break;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1412 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1413
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1414 if (new_n > 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1415 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1416 T *new_data = new T [new_n];
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1417
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1418 octave_idx_type ii = 0;
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1419 iidx = 0;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1420 for (octave_idx_type i = 0; i < n; i++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1421 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1422 if (iidx < num_to_delete && i == idx_arg.elem (iidx))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1423 iidx++;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1424 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1425 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
1426 new_data[ii] = xelem (i);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1427
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1428 ii++;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1429 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1430 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1431
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1432 if (--(Array<T>::rep)->count <= 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1433 delete Array<T>::rep;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1434
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1435 Array<T>::rep = new typename Array<T>::ArrayRep (new_data, new_n);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1436
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1437 dimensions.resize (2);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1438
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1439 if (nr == 1)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1440 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1441 dimensions(0) = 1;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1442 dimensions(1) = new_n;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1443 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1444 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1445 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1446 dimensions(0) = new_n;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1447 dimensions(1) = 1;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1448 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1449 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1450 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1451 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1452 ("A(idx) = []: index out of range");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1453 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1454 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1455
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1456 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1457 void
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1458 Array<T>::maybe_delete_elements (idx_vector& idx_i, idx_vector& idx_j)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1459 {
4548
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
1460 assert (ndims () == 2);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
1461
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1462 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1463 octave_idx_type nc = dim2 ();
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1464
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1465 if (nr == 0 && nc == 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1466 return;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1467
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1468 if (idx_i.is_colon ())
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1469 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1470 if (idx_j.is_colon ())
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1471 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1472 // A(:,:) -- We are deleting columns and rows, so the result
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1473 // is [](0x0).
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1474
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1475 resize_no_fill (0, 0);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1476 return;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1477 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1478
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1479 if (idx_j.is_colon_equiv (nc, 1))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1480 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1481 // A(:,j) -- We are deleting columns by enumerating them,
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1482 // If we enumerate all of them, we should have zero columns
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1483 // with the same number of rows that we started with.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1484
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1485 resize_no_fill (nr, 0);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1486 return;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1487 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1488 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1489
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1490 if (idx_j.is_colon () && idx_i.is_colon_equiv (nr, 1))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1491 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1492 // A(i,:) -- We are deleting rows by enumerating them. If we
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1493 // enumerate all of them, we should have zero rows with the
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1494 // same number of columns that we started with.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1495
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1496 resize_no_fill (0, nc);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1497 return;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1498 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1499
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1500 if (idx_i.is_colon_equiv (nr, 1))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1501 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1502 if (idx_j.is_colon_equiv (nc, 1))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1503 resize_no_fill (0, 0);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1504 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1505 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1506 idx_j.sort (true);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1507
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1508 octave_idx_type num_to_delete = idx_j.length (nc);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1509
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1510 if (num_to_delete != 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1511 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1512 if (nr == 1 && num_to_delete == nc)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1513 resize_no_fill (0, 0);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1514 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1515 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1516 octave_idx_type new_nc = nc;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1517
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1518 octave_idx_type iidx = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1519
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1520 for (octave_idx_type j = 0; j < nc; j++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1521 if (j == idx_j.elem (iidx))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1522 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1523 iidx++;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1524 new_nc--;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1525
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1526 if (iidx == num_to_delete)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1527 break;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1528 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1529
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1530 if (new_nc > 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1531 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1532 T *new_data = new T [nr * new_nc];
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1533
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1534 octave_idx_type jj = 0;
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1535 iidx = 0;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1536 for (octave_idx_type j = 0; j < nc; j++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1537 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1538 if (iidx < num_to_delete && j == idx_j.elem (iidx))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1539 iidx++;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1540 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1541 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1542 for (octave_idx_type i = 0; i < nr; i++)
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
1543 new_data[nr*jj+i] = xelem (i, j);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1544 jj++;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1545 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1546 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1547
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1548 if (--(Array<T>::rep)->count <= 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1549 delete Array<T>::rep;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1550
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1551 Array<T>::rep = new typename Array<T>::ArrayRep (new_data, nr * new_nc);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1552
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1553 dimensions.resize (2);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1554 dimensions(1) = new_nc;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1555 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1556 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1557 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1558 ("A(idx) = []: index out of range");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1559 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1560 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1561 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1562 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1563 else if (idx_j.is_colon_equiv (nc, 1))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1564 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1565 if (idx_i.is_colon_equiv (nr, 1))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1566 resize_no_fill (0, 0);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1567 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1568 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1569 idx_i.sort (true);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1570
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1571 octave_idx_type num_to_delete = idx_i.length (nr);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1572
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1573 if (num_to_delete != 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1574 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1575 if (nc == 1 && num_to_delete == nr)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1576 resize_no_fill (0, 0);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1577 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1578 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1579 octave_idx_type new_nr = nr;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1580
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1581 octave_idx_type iidx = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1582
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1583 for (octave_idx_type i = 0; i < nr; i++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1584 if (i == idx_i.elem (iidx))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1585 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1586 iidx++;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1587 new_nr--;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1588
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1589 if (iidx == num_to_delete)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1590 break;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1591 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1592
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1593 if (new_nr > 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1594 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1595 T *new_data = new T [new_nr * nc];
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1596
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1597 octave_idx_type ii = 0;
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1598 iidx = 0;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1599 for (octave_idx_type i = 0; i < nr; i++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1600 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1601 if (iidx < num_to_delete && i == idx_i.elem (iidx))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1602 iidx++;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1603 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1604 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1605 for (octave_idx_type j = 0; j < nc; j++)
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
1606 new_data[new_nr*j+ii] = xelem (i, j);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1607 ii++;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1608 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1609 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1610
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1611 if (--(Array<T>::rep)->count <= 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1612 delete Array<T>::rep;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1613
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1614 Array<T>::rep = new typename Array<T>::ArrayRep (new_data, new_nr * nc);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1615
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1616 dimensions.resize (2);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1617 dimensions(0) = new_nr;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1618 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1619 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1620 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1621 ("A(idx) = []: index out of range");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1622 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1623 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1624 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1625 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1626 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1627
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1628 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1629 void
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1630 Array<T>::maybe_delete_elements (idx_vector&, idx_vector&, idx_vector&)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1631 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1632 assert (0);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1633 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1634
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1635 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1636 void
4585
a1ac9ab474a1 [project @ 2003-11-08 06:07:33 by jwe]
jwe
parents: 4573
diff changeset
1637 Array<T>::maybe_delete_elements (Array<idx_vector>& ra_idx, const T& rfv)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1638 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1639 octave_idx_type n_idx = ra_idx.length ();
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1640
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1641 dim_vector lhs_dims = dims ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1642
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1643 int n_lhs_dims = lhs_dims.length ();
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1644
4821
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1645 if (lhs_dims.all_zero ())
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1646 return;
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1647
6384
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
1648 if (n_idx == 1 && ra_idx(0).is_colon ())
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
1649 {
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
1650 resize (dim_vector (0, 0), rfv);
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
1651 return;
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
1652 }
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
1653
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1654 if (n_idx > n_lhs_dims)
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1655 {
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1656 for (int i = n_idx; i < n_lhs_dims; i++)
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1657 {
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1658 // Ensure that extra indices are either colon or 1.
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1659
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1660 if (! ra_idx(i).is_colon_equiv (1, 1))
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1661 {
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1662 (*current_liboctave_error_handler)
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1663 ("index exceeds array dimensions");
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1664 return;
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1665 }
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1666 }
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1667
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1668 ra_idx.resize (n_lhs_dims);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1669
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1670 n_idx = n_lhs_dims;
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
1671 }
4757
c48180a45d34 [project @ 2004-02-13 22:13:52 by jwe]
jwe
parents: 4756
diff changeset
1672
4740
65f30438c2a3 [project @ 2004-02-05 19:58:57 by jwe]
jwe
parents: 4738
diff changeset
1673 Array<int> idx_is_colon (n_idx, 0);
65f30438c2a3 [project @ 2004-02-05 19:58:57 by jwe]
jwe
parents: 4738
diff changeset
1674
65f30438c2a3 [project @ 2004-02-05 19:58:57 by jwe]
jwe
parents: 4738
diff changeset
1675 Array<int> idx_is_colon_equiv (n_idx, 0);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1676
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1677 // Initialization of colon arrays.
4757
c48180a45d34 [project @ 2004-02-13 22:13:52 by jwe]
jwe
parents: 4756
diff changeset
1678
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1679 for (octave_idx_type i = 0; i < n_idx; i++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1680 {
4585
a1ac9ab474a1 [project @ 2003-11-08 06:07:33 by jwe]
jwe
parents: 4573
diff changeset
1681 idx_is_colon_equiv(i) = ra_idx(i).is_colon_equiv (lhs_dims(i), 1);
a1ac9ab474a1 [project @ 2003-11-08 06:07:33 by jwe]
jwe
parents: 4573
diff changeset
1682
a1ac9ab474a1 [project @ 2003-11-08 06:07:33 by jwe]
jwe
parents: 4573
diff changeset
1683 idx_is_colon(i) = ra_idx(i).is_colon ();
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1684 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1685
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1686 bool idx_ok = true;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1687
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1688 // Check for index out of bounds.
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1689
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1690 for (octave_idx_type i = 0 ; i < n_idx - 1; i++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1691 {
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1692 if (! (idx_is_colon(i) || idx_is_colon_equiv(i)))
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1693 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1694 ra_idx(i).sort (true);
4757
c48180a45d34 [project @ 2004-02-13 22:13:52 by jwe]
jwe
parents: 4756
diff changeset
1695
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1696 if (ra_idx(i).max () > lhs_dims(i))
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1697 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1698 (*current_liboctave_error_handler)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1699 ("index exceeds array dimensions");
4757
c48180a45d34 [project @ 2004-02-13 22:13:52 by jwe]
jwe
parents: 4756
diff changeset
1700
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1701 idx_ok = false;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1702 break;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1703 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1704 else if (ra_idx(i).min () < 0) // I believe this is checked elsewhere
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1705 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1706 (*current_liboctave_error_handler)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1707 ("index must be one or larger");
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1708
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1709 idx_ok = false;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1710 break;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1711 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1712 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1713 }
4757
c48180a45d34 [project @ 2004-02-13 22:13:52 by jwe]
jwe
parents: 4756
diff changeset
1714
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1715 if (n_idx <= n_lhs_dims)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1716 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1717 octave_idx_type last_idx = ra_idx(n_idx-1).max ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1718
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1719 octave_idx_type sum_el = lhs_dims(n_idx-1);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1720
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1721 for (octave_idx_type i = n_idx; i < n_lhs_dims; i++)
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1722 sum_el *= lhs_dims(i);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1723
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1724 if (last_idx > sum_el - 1)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1725 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1726 (*current_liboctave_error_handler)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1727 ("index exceeds array dimensions");
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1728
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1729 idx_ok = false;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1730 }
4757
c48180a45d34 [project @ 2004-02-13 22:13:52 by jwe]
jwe
parents: 4756
diff changeset
1731 }
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1732
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1733 if (idx_ok)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1734 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1735 if (n_idx > 1
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1736 && (all_ones (idx_is_colon) || all_ones (idx_is_colon_equiv)))
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1737 {
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1738 // A(:,:,:) -- we are deleting elements in all dimensions, so
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1739 // the result is [](0x0x0).
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1740
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1741 dim_vector zeros;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1742 zeros.resize (n_idx);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1743
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1744 for (int i = 0; i < n_idx; i++)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1745 zeros(i) = 0;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1746
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1747 resize (zeros, rfv);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1748 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1749
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1750 else if (n_idx > 1
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1751 && num_ones (idx_is_colon) == n_idx - 1
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1752 && num_ones (idx_is_colon_equiv) == n_idx)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1753 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1754 // A(:,:,j) -- we are deleting elements in one dimension by
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1755 // enumerating them.
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1756 //
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1757 // If we enumerate all of the elements, we should have zero
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1758 // elements in that dimension with the same number of elements
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1759 // in the other dimensions that we started with.
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1760
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1761 dim_vector temp_dims;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1762 temp_dims.resize (n_idx);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1763
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1764 for (octave_idx_type i = 0; i < n_idx; i++)
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1765 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1766 if (idx_is_colon (i))
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1767 temp_dims(i) = lhs_dims(i);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1768 else
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1769 temp_dims(i) = 0;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1770 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1771
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1772 resize (temp_dims);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1773 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1774 else if (n_idx > 1 && num_ones (idx_is_colon) == n_idx - 1)
4741
e44d0ac643a5 [project @ 2004-02-05 21:57:50 by jwe]
jwe
parents: 4740
diff changeset
1775 {
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1776 // We have colons in all indices except for one.
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1777 // This index tells us which slice to delete
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1778
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1779 if (n_idx < n_lhs_dims)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1780 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1781 // Collapse dimensions beyond last index.
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1782
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
1783 if (! (ra_idx(n_idx-1).is_colon ()))
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
1784 (*current_liboctave_warning_with_id_handler)
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
1785 ("Octave:fortran-indexing",
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
1786 "fewer indices than dimensions for N-d array");
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1787
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1788 for (octave_idx_type i = n_idx; i < n_lhs_dims; i++)
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1789 lhs_dims(n_idx-1) *= lhs_dims(i);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1790
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1791 lhs_dims.resize (n_idx);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1792
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1793 // Reshape *this.
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1794 dimensions = lhs_dims;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1795 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1796
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1797 int non_col = 0;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1798
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1799 // Find the non-colon column.
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1800
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1801 for (octave_idx_type i = 0; i < n_idx; i++)
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1802 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1803 if (! idx_is_colon(i))
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1804 non_col = i;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1805 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1806
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1807 // The length of the non-colon dimension.
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1808
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1809 octave_idx_type non_col_dim = lhs_dims (non_col);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1810
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1811 octave_idx_type num_to_delete = ra_idx(non_col).length (lhs_dims (non_col));
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1812
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1813 if (num_to_delete > 0)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1814 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1815 int temp = lhs_dims.num_ones ();
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1816
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1817 if (non_col_dim == 1)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1818 temp--;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1819
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1820 if (temp == n_idx - 1 && num_to_delete == non_col_dim)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1821 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1822 // We have A with (1x1x4), where A(1,:,1:4)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1823 // Delete all (0x0x0)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1824
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1825 dim_vector zero_dims (n_idx, 0);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1826
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1827 resize (zero_dims, rfv);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1828 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1829 else
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1830 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1831 // New length of non-colon dimension
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1832 // (calculated in the next for loop)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1833
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1834 octave_idx_type new_dim = non_col_dim;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1835
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1836 octave_idx_type iidx = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1837
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1838 for (octave_idx_type j = 0; j < non_col_dim; j++)
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1839 if (j == ra_idx(non_col).elem (iidx))
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1840 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1841 iidx++;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1842
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1843 new_dim--;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1844
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1845 if (iidx == num_to_delete)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1846 break;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1847 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1848
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1849 // Creating the new nd array after deletions.
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1850
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1851 if (new_dim > 0)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1852 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1853 // Calculate number of elements in new array.
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1854
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1855 octave_idx_type num_new_elem=1;
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1856
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1857 for (int i = 0; i < n_idx; i++)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1858 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1859 if (i == non_col)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1860 num_new_elem *= new_dim;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1861
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1862 else
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1863 num_new_elem *= lhs_dims(i);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1864 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1865
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1866 T *new_data = new T [num_new_elem];
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1867
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1868 Array<octave_idx_type> result_idx (n_lhs_dims, 0);
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1869
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1870 dim_vector new_lhs_dim = lhs_dims;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1871
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1872 new_lhs_dim(non_col) = new_dim;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1873
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1874 octave_idx_type num_elem = 1;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1875
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1876 octave_idx_type numidx = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1877
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1878 octave_idx_type n = length ();
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1879
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1880 for (int i = 0; i < n_lhs_dims; i++)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1881 if (i != non_col)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1882 num_elem *= lhs_dims(i);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1883
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1884 num_elem *= ra_idx(non_col).capacity ();
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1885
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1886 for (octave_idx_type i = 0; i < n; i++)
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1887 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1888 if (numidx < num_elem
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1889 && is_in (result_idx(non_col), ra_idx(non_col)))
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1890 numidx++;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1891
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1892 else
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1893 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1894 Array<octave_idx_type> temp_result_idx = result_idx;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1895
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1896 octave_idx_type num_lgt = how_many_lgt (result_idx(non_col),
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1897 ra_idx(non_col));
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1898
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1899 temp_result_idx(non_col) -= num_lgt;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1900
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1901 octave_idx_type kidx
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1902 = ::compute_index (temp_result_idx, new_lhs_dim);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1903
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
1904 new_data[kidx] = xelem (result_idx);
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1905 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1906
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1907 increment_index (result_idx, lhs_dims);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1908 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1909
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1910 if (--rep->count <= 0)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1911 delete rep;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1912
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1913 rep = new typename Array<T>::ArrayRep (new_data,
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1914 num_new_elem);
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1915
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1916 dimensions = new_lhs_dim;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1917 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1918 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1919 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1920 }
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1921 else if (n_idx == 1)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1922 {
4821
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1923 // This handle cases where we only have one index (not
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1924 // colon). The index denotes which elements we should
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1925 // delete in the array which can be of any dimension. We
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1926 // return a column vector, except for the case where we are
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1927 // operating on a row vector. The elements are numerated
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1928 // column by column.
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1929 //
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1930 // A(3,3,3)=2;
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1931 // A(3:5) = []; A(6)=[]
4757
c48180a45d34 [project @ 2004-02-13 22:13:52 by jwe]
jwe
parents: 4756
diff changeset
1932
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1933 octave_idx_type lhs_numel = numel ();
4757
c48180a45d34 [project @ 2004-02-13 22:13:52 by jwe]
jwe
parents: 4756
diff changeset
1934
4821
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1935 idx_vector idx_vec = ra_idx(0);
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1936
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
1937 idx_vec.freeze (lhs_numel, 0, true);
4821
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1938
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1939 idx_vec.sort (true);
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1940
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1941 octave_idx_type num_to_delete = idx_vec.length (lhs_numel);
4821
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1942
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1943 if (num_to_delete > 0)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1944 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1945 octave_idx_type new_numel = lhs_numel - num_to_delete;
4821
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1946
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1947 T *new_data = new T[new_numel];
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1948
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1949 Array<octave_idx_type> lhs_ra_idx (ndims (), 0);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1950
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1951 octave_idx_type ii = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1952 octave_idx_type iidx = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1953
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
1954 for (octave_idx_type i = 0; i < lhs_numel; i++)
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1955 {
4821
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1956 if (iidx < num_to_delete && i == idx_vec.elem (iidx))
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1957 {
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1958 iidx++;
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1959 }
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1960 else
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1961 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
1962 new_data[ii++] = xelem (lhs_ra_idx);
4821
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1963 }
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1964
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1965 increment_index (lhs_ra_idx, lhs_dims);
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1966 }
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1967
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1968 if (--(Array<T>::rep)->count <= 0)
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1969 delete Array<T>::rep;
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1970
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1971 Array<T>::rep = new typename Array<T>::ArrayRep (new_data, new_numel);
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1972
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1973 dimensions.resize (2);
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1974
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1975 if (lhs_dims.length () == 2 && lhs_dims(1) == 1)
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1976 {
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1977 dimensions(0) = new_numel;
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1978 dimensions(1) = 1;
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1979 }
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1980 else
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1981 {
4821
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1982 dimensions(0) = 1;
22f024a25c4a [project @ 2004-03-05 16:19:11 by jwe]
jwe
parents: 4806
diff changeset
1983 dimensions(1) = new_numel;
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1984 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1985 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1986 }
4755
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1987 else if (num_ones (idx_is_colon) < n_idx)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1988 {
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1989 (*current_liboctave_error_handler)
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1990 ("a null assignment can have only one non-colon index");
9a6bfff40c8d [project @ 2004-02-13 21:27:55 by jwe]
jwe
parents: 4749
diff changeset
1991 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1992 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1993 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1994
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1995 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1996 Array<T>
6881
cd2c6a69a70d [project @ 2007-09-07 21:48:09 by jwe]
jwe
parents: 6867
diff changeset
1997 Array<T>::value (void) const
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1998 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
1999 Array<T> retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2000
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2001 int n_idx = index_count ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2002
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2003 if (n_idx == 2)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2004 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2005 idx_vector *tmp = get_idx ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2006
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2007 idx_vector idx_i = tmp[0];
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2008 idx_vector idx_j = tmp[1];
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2009
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2010 retval = index (idx_i, idx_j);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2011 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2012 else if (n_idx == 1)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2013 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2014 retval = index (idx[0]);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2015 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2016 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2017 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2018 ("Array<T>::value: invalid number of indices specified");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2019
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2020 clear_index ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2021
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2022 return retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2023 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2024
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2025 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2026 Array<T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2027 Array<T>::index (idx_vector& idx_arg, int resize_ok, const T& rfv) const
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2028 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2029 Array<T> retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2030
5081
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2031 dim_vector dv = idx_arg.orig_dimensions ();
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2032
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2033 if (dv.length () > 2 || ndims () > 2)
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2034 retval = indexN (idx_arg, resize_ok, rfv);
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2035 else
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2036 {
5081
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2037 switch (ndims ())
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2038 {
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2039 case 1:
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2040 retval = index1 (idx_arg, resize_ok, rfv);
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2041 break;
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2042
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2043 case 2:
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2044 retval = index2 (idx_arg, resize_ok, rfv);
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2045 break;
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2046
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2047 default:
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2048 (*current_liboctave_error_handler)
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2049 ("invalid array (internal error)");
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2050 break;
273205761b4d [project @ 2004-11-17 15:15:00 by jwe]
jwe
parents: 5052
diff changeset
2051 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2052 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2053
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2054 return retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2055 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2056
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2057 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2058 Array<T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2059 Array<T>::index1 (idx_vector& idx_arg, int resize_ok, const T& rfv) const
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2060 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2061 Array<T> retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2062
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2063 octave_idx_type len = length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2064
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2065 octave_idx_type n = idx_arg.freeze (len, "vector", resize_ok);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2066
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2067 if (idx_arg)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2068 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2069 if (idx_arg.is_colon_equiv (len))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2070 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2071 retval = *this;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2072 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2073 else if (n == 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2074 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2075 retval.resize_no_fill (0);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2076 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2077 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2078 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2079 retval.resize_no_fill (n);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2080
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2081 for (octave_idx_type i = 0; i < n; i++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2082 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2083 octave_idx_type ii = idx_arg.elem (i);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2084 if (ii >= len)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2085 retval.elem (i) = rfv;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2086 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2087 retval.elem (i) = elem (ii);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2088 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2089 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2090 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2091
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2092 // idx_vector::freeze() printed an error message for us.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2093
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2094 return retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2095 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2096
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2097 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2098 Array<T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2099 Array<T>::index2 (idx_vector& idx_arg, int resize_ok, const T& rfv) const
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2100 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2101 Array<T> retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2102
4548
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
2103 assert (ndims () == 2);
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
2104
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2105 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2106 octave_idx_type nc = dim2 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2107
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2108 octave_idx_type orig_len = nr * nc;
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2109
4832
f9262b65c7d9 [project @ 2004-03-10 06:57:03 by jwe]
jwe
parents: 4828
diff changeset
2110 dim_vector idx_orig_dims = idx_arg.orig_dimensions ();
f9262b65c7d9 [project @ 2004-03-10 06:57:03 by jwe]
jwe
parents: 4828
diff changeset
2111
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2112 octave_idx_type idx_orig_rows = idx_arg.orig_rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2113 octave_idx_type idx_orig_columns = idx_arg.orig_columns ();
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2114
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2115 if (idx_arg.is_colon ())
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2116 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2117 // Fast magic colon processing.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2118
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2119 octave_idx_type result_nr = nr * nc;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2120 octave_idx_type result_nc = 1;
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2121
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2122 retval = Array<T> (*this, dim_vector (result_nr, result_nc));
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2123 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2124 else if (nr == 1 && nc == 1)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2125 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2126 Array<T> tmp = Array<T>::index1 (idx_arg, resize_ok);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2127
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2128 octave_idx_type len = tmp.length ();
4828
e78bc84ac0d3 [project @ 2004-03-09 22:36:55 by jwe]
jwe
parents: 4827
diff changeset
2129
7573
755bf7ecc29b eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents: 7480
diff changeset
2130 if (len >= idx_orig_dims.numel ())
4832
f9262b65c7d9 [project @ 2004-03-10 06:57:03 by jwe]
jwe
parents: 4828
diff changeset
2131 retval = Array<T> (tmp, idx_orig_dims);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2132 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2133 else if (nr == 1 || nc == 1)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2134 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2135 // If indexing a vector with a matrix, return value has same
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2136 // shape as the index. Otherwise, it has same orientation as
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2137 // indexed object.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2138
4828
e78bc84ac0d3 [project @ 2004-03-09 22:36:55 by jwe]
jwe
parents: 4827
diff changeset
2139 Array<T> tmp = Array<T>::index1 (idx_arg, resize_ok);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2140
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2141 octave_idx_type len = tmp.length ();
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2142
7573
755bf7ecc29b eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents: 7480
diff changeset
2143 if (idx_orig_rows == 1 || idx_orig_columns == 1)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2144 {
4827
bb82599f039f [project @ 2004-03-09 20:50:18 by jwe]
jwe
parents: 4822
diff changeset
2145 if (nr == 1)
bb82599f039f [project @ 2004-03-09 20:50:18 by jwe]
jwe
parents: 4822
diff changeset
2146 retval = Array<T> (tmp, dim_vector (1, len));
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2147 else
4827
bb82599f039f [project @ 2004-03-09 20:50:18 by jwe]
jwe
parents: 4822
diff changeset
2148 retval = Array<T> (tmp, dim_vector (len, 1));
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2149 }
4876
05d464a13f43 [project @ 2004-04-22 19:38:14 by jwe]
jwe
parents: 4870
diff changeset
2150 else if (len >= idx_orig_dims.numel ())
4832
f9262b65c7d9 [project @ 2004-03-10 06:57:03 by jwe]
jwe
parents: 4828
diff changeset
2151 retval = Array<T> (tmp, idx_orig_dims);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2152 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2153 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2154 {
7573
755bf7ecc29b eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents: 7480
diff changeset
2155 (*current_liboctave_warning_with_id_handler)
755bf7ecc29b eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents: 7480
diff changeset
2156 ("Octave:fortran-indexing", "single index used for matrix");
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2157
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2158 // This code is only for indexing matrices. The vector
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2159 // cases are handled above.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2160
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2161 idx_arg.freeze (nr * nc, "matrix", resize_ok);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2162
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2163 if (idx_arg)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2164 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2165 octave_idx_type result_nr = idx_orig_rows;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2166 octave_idx_type result_nc = idx_orig_columns;
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2167
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2168 retval.resize_no_fill (result_nr, result_nc);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2169
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2170 octave_idx_type k = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2171 for (octave_idx_type j = 0; j < result_nc; j++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2172 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2173 for (octave_idx_type i = 0; i < result_nr; i++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2174 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2175 octave_idx_type ii = idx_arg.elem (k++);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2176 if (ii >= orig_len)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2177 retval.elem (i, j) = rfv;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2178 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2179 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2180 octave_idx_type fr = ii % nr;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2181 octave_idx_type fc = (ii - fr) / nr;
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2182 retval.elem (i, j) = elem (fr, fc);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2183 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2184 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2185 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2186 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2187 // idx_vector::freeze() printed an error message for us.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2188 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2189
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2190 return retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2191 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2192
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2193 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2194 Array<T>
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2195 Array<T>::indexN (idx_vector& ra_idx, int resize_ok, const T& rfv) const
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2196 {
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2197 Array<T> retval;
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2198
5519
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2199 dim_vector dv = dims ();
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2200
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2201 int n_dims = dv.length ();
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2202
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2203 octave_idx_type orig_len = dv.numel ();
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2204
4757
c48180a45d34 [project @ 2004-02-13 22:13:52 by jwe]
jwe
parents: 4756
diff changeset
2205 dim_vector idx_orig_dims = ra_idx.orig_dimensions ();
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2206
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2207 if (ra_idx.is_colon ())
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2208 {
4651
b868b39534b0 [project @ 2003-11-24 01:24:16 by jwe]
jwe
parents: 4635
diff changeset
2209 // Fast magic colon processing.
b868b39534b0 [project @ 2003-11-24 01:24:16 by jwe]
jwe
parents: 4635
diff changeset
2210
b868b39534b0 [project @ 2003-11-24 01:24:16 by jwe]
jwe
parents: 4635
diff changeset
2211 retval = Array<T> (*this, dim_vector (orig_len, 1));
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2212 }
4651
b868b39534b0 [project @ 2003-11-24 01:24:16 by jwe]
jwe
parents: 4635
diff changeset
2213 else
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2214 {
5519
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2215 bool vec_equiv = vector_equivalent (dv);
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2216
7573
755bf7ecc29b eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents: 7480
diff changeset
2217 if (! (vec_equiv || ra_idx.is_colon ()))
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2218 (*current_liboctave_warning_with_id_handler)
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2219 ("Octave:fortran-indexing", "single index used for N-d array");
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2220
5519
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2221 octave_idx_type frozen_len
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2222 = ra_idx.freeze (orig_len, "nd-array", resize_ok);
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2223
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2224 if (ra_idx)
4757
c48180a45d34 [project @ 2004-02-13 22:13:52 by jwe]
jwe
parents: 4756
diff changeset
2225 {
5519
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2226 dim_vector result_dims;
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2227
7321
359f464342b3 [project @ 2007-12-18 03:48:03 by jwe]
jwe
parents: 7241
diff changeset
2228 if (vec_equiv && ! orig_len == 1)
5519
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2229 {
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2230 result_dims = dv;
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2231
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2232 for (int i = 0; i < n_dims; i++)
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2233 {
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2234 if (result_dims(i) != 1)
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2235 {
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2236 // All but this dim should be one.
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2237 result_dims(i) = frozen_len;
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2238 break;
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2239 }
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2240 }
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2241 }
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2242 else
20b20fd070b0 [project @ 2005-10-29 04:31:25 by jwe]
jwe
parents: 5516
diff changeset
2243 result_dims = idx_orig_dims;
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2244
4673
6639c2574023 [project @ 2003-12-10 16:11:54 by jwe]
jwe
parents: 4661
diff changeset
2245 result_dims.chop_trailing_singletons ();
6639c2574023 [project @ 2003-12-10 16:11:54 by jwe]
jwe
parents: 4661
diff changeset
2246
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2247 retval.resize (result_dims);
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2248
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2249 octave_idx_type n = result_dims.numel ();
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2250
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2251 octave_idx_type k = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2252
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2253 for (octave_idx_type i = 0; i < n; i++)
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2254 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2255 octave_idx_type ii = ra_idx.elem (k++);
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2256
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2257 if (ii >= orig_len)
5535
6a82af824269 [project @ 2005-11-11 18:20:25 by jwe]
jwe
parents: 5519
diff changeset
2258 retval.elem (i) = rfv;
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2259 else
5535
6a82af824269 [project @ 2005-11-11 18:20:25 by jwe]
jwe
parents: 5519
diff changeset
2260 retval.elem (i) = elem (ii);
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2261 }
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2262 }
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2263 }
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2264
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2265 return retval;
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2266 }
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2267
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2268 template <class T>
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2269 Array<T>
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2270 Array<T>::index (idx_vector& idx_i, idx_vector& idx_j, int resize_ok,
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2271 const T& rfv) const
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2272 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2273 Array<T> retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2274
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents: 7017
diff changeset
2275 if (ndims () != 2)
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents: 7017
diff changeset
2276 {
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents: 7017
diff changeset
2277 Array<idx_vector> ra_idx (2);
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents: 7017
diff changeset
2278 ra_idx(0) = idx_i;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents: 7017
diff changeset
2279 ra_idx(1) = idx_j;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents: 7017
diff changeset
2280 return index (ra_idx, resize_ok, rfv);
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents: 7017
diff changeset
2281 }
4548
820323598f4f [project @ 2003-10-26 03:16:42 by jwe]
jwe
parents: 4545
diff changeset
2282
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2283 octave_idx_type nr = dim1 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2284 octave_idx_type nc = dim2 ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2285
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2286 octave_idx_type n = idx_i.freeze (nr, "row", resize_ok);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2287 octave_idx_type m = idx_j.freeze (nc, "column", resize_ok);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2288
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2289 if (idx_i && idx_j)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2290 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2291 if (idx_i.orig_empty () || idx_j.orig_empty () || n == 0 || m == 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2292 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2293 retval.resize_no_fill (n, m);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2294 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2295 else if (idx_i.is_colon_equiv (nr) && idx_j.is_colon_equiv (nc))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2296 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2297 retval = *this;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2298 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2299 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2300 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2301 retval.resize_no_fill (n, m);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2302
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2303 for (octave_idx_type j = 0; j < m; j++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2304 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2305 octave_idx_type jj = idx_j.elem (j);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2306 for (octave_idx_type i = 0; i < n; i++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2307 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2308 octave_idx_type ii = idx_i.elem (i);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2309 if (ii >= nr || jj >= nc)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2310 retval.elem (i, j) = rfv;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2311 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2312 retval.elem (i, j) = elem (ii, jj);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2313 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2314 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2315 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2316 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2317
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2318 // idx_vector::freeze() printed an error message for us.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2319
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2320 return retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2321 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2322
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2323 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2324 Array<T>
5992
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2325 Array<T>::index (Array<idx_vector>& ra_idx, int resize_ok, const T& rfv) const
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2326 {
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2327 // This function handles all calls with more than one idx.
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2328 // For (3x3x3), the call can be A(2,5), A(2,:,:), A(3,2,3) etc.
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2329
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2330 Array<T> retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2331
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2332 int n_dims = dimensions.length ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2333
4737
108c9a93196d [project @ 2004-02-05 18:25:00 by jwe]
jwe
parents: 4736
diff changeset
2334 // Remove trailing singletons in ra_idx, but leave at least ndims
108c9a93196d [project @ 2004-02-05 18:25:00 by jwe]
jwe
parents: 4736
diff changeset
2335 // elements.
108c9a93196d [project @ 2004-02-05 18:25:00 by jwe]
jwe
parents: 4736
diff changeset
2336
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2337 octave_idx_type ra_idx_len = ra_idx.length ();
4737
108c9a93196d [project @ 2004-02-05 18:25:00 by jwe]
jwe
parents: 4736
diff changeset
2338
4887
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2339 bool trim_trailing_singletons = true;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2340 for (octave_idx_type j = ra_idx_len; j > n_dims; j--)
4737
108c9a93196d [project @ 2004-02-05 18:25:00 by jwe]
jwe
parents: 4736
diff changeset
2341 {
4887
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2342 idx_vector iidx = ra_idx (ra_idx_len-1);
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2343 if (iidx.capacity () == 1 && trim_trailing_singletons)
4737
108c9a93196d [project @ 2004-02-05 18:25:00 by jwe]
jwe
parents: 4736
diff changeset
2344 ra_idx_len--;
108c9a93196d [project @ 2004-02-05 18:25:00 by jwe]
jwe
parents: 4736
diff changeset
2345 else
4887
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2346 trim_trailing_singletons = false;
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2347
5992
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2348 if (! resize_ok)
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2349 {
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2350 for (octave_idx_type i = 0; i < iidx.capacity (); i++)
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2351 if (iidx (i) != 0)
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2352 {
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2353 (*current_liboctave_error_handler)
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2354 ("index exceeds N-d array dimensions");
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2355
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2356 return retval;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2357 }
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2358 }
4737
108c9a93196d [project @ 2004-02-05 18:25:00 by jwe]
jwe
parents: 4736
diff changeset
2359 }
108c9a93196d [project @ 2004-02-05 18:25:00 by jwe]
jwe
parents: 4736
diff changeset
2360
108c9a93196d [project @ 2004-02-05 18:25:00 by jwe]
jwe
parents: 4736
diff changeset
2361 ra_idx.resize (ra_idx_len);
108c9a93196d [project @ 2004-02-05 18:25:00 by jwe]
jwe
parents: 4736
diff changeset
2362
4887
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2363 dim_vector new_dims = dims ();
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2364 dim_vector frozen_lengths;
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2365
7597
6b2a99e44ff2 shortened empty indexing fix
David Bateman <dbateman@free.fr>
parents: 7573
diff changeset
2366 if (!ra_idx (ra_idx_len - 1).orig_empty () && ra_idx_len < n_dims)
4887
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2367 frozen_lengths = short_freeze (ra_idx, dimensions, resize_ok);
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2368 else
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2369 {
4887
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2370 new_dims.resize (ra_idx_len, 1);
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2371 frozen_lengths = freeze (ra_idx, new_dims, resize_ok);
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2372 }
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2373
4887
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2374 if (all_ok (ra_idx))
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2375 {
4887
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2376 if (any_orig_empty (ra_idx) || frozen_lengths.any_zero ())
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2377 {
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2378 frozen_lengths.chop_trailing_singletons ();
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2379
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2380 retval.resize (frozen_lengths);
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2381 }
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2382 else if (frozen_lengths.length () == n_dims
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2383 && all_colon_equiv (ra_idx, dimensions))
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2384 {
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2385 retval = *this;
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2386 }
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2387 else
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2388 {
4887
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2389 dim_vector frozen_lengths_for_resize = frozen_lengths;
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2390
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2391 frozen_lengths_for_resize.chop_trailing_singletons ();
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2392
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2393 retval.resize (frozen_lengths_for_resize);
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2394
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2395 octave_idx_type n = retval.length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2396
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2397 Array<octave_idx_type> result_idx (ra_idx.length (), 0);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2398
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2399 Array<octave_idx_type> elt_idx;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2400
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2401 for (octave_idx_type i = 0; i < n; i++)
4530
e8d87fefd144 [project @ 2003-10-07 04:02:04 by jwe]
jwe
parents: 4518
diff changeset
2402 {
4887
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2403 elt_idx = get_elt_idx (ra_idx, result_idx);
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2404
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2405 octave_idx_type numelem_elt = get_scalar_idx (elt_idx, new_dims);
4887
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2406
5992
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2407 if (numelem_elt >= length () || numelem_elt < 0)
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe]
jwe
parents: 5940
diff changeset
2408 retval.elem (i) = rfv;
4887
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2409 else
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2410 retval.elem (i) = elem (numelem_elt);
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2411
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2412 increment_index (result_idx, frozen_lengths);
bbddd4339cf2 [project @ 2004-04-30 17:08:55 by jwe]
jwe
parents: 4876
diff changeset
2413
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2414 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2415 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2416 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2417
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2418 return retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2419 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2420
7433
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2421 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2422 bool
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2423 ascending_compare (T a, T b)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2424 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2425 return (a < b);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2426 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2427
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2428 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2429 bool
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2430 descending_compare (T a, T b)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2431 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2432 return (a > b);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2433 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2434
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2435 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2436 bool
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2437 ascending_compare (vec_index<T> *a, vec_index<T> *b)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2438 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2439 return (a->vec < b->vec);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2440 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2441
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2442 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2443 bool
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2444 descending_compare (vec_index<T> *a, vec_index<T> *b)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2445 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2446 return (a->vec > b->vec);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2447 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2448
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2449 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2450 Array<T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2451 Array<T>::sort (octave_idx_type dim, sortmode mode) const
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2452 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2453 Array<T> m = *this;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2454
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2455 dim_vector dv = m.dims ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2456
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2457 if (m.length () < 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2458 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2459
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2460 octave_idx_type ns = dv(dim);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2461 octave_idx_type iter = dv.numel () / ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2462 octave_idx_type stride = 1;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2463 for (int i = 0; i < dim; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2464 stride *= dv(i);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2465
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2466 T *v = m.fortran_vec ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2467 octave_sort<T> lsort;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2468
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2469 if (mode == ASCENDING)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2470 lsort.set_compare (ascending_compare);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2471 else if (mode == DESCENDING)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2472 lsort.set_compare (descending_compare);
7463
2467639bd8c0 eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents: 7443
diff changeset
2473 else
2467639bd8c0 eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents: 7443
diff changeset
2474 abort ();
7433
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2475
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2476 if (stride == 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2477 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2478 for (octave_idx_type j = 0; j < iter; j++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2479 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2480 lsort.sort (v, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2481 v += ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2482 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2483 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2484 else
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2485 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2486 // Don't use OCTAVE_LOCAL_BUFFER here as it doesn't work with bool
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2487 // on some compilers.
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2488 Array<T> vi (ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2489 T *pvi = vi.fortran_vec ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2490
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2491 for (octave_idx_type j = 0; j < iter; j++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2492 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2493 octave_idx_type offset = j;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2494 octave_idx_type offset2 = 0;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2495 while (offset >= stride)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2496 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2497 offset -= stride;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2498 offset2++;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2499 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2500 offset += offset2 * stride * ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2501
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2502 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2503 pvi[i] = v[i*stride + offset];
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2504
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2505 lsort.sort (pvi, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2506
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2507 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2508 v[i*stride + offset] = pvi[i];
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2509 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2510 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2511
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2512 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2513 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2514
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2515 template <class T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2516 Array<T>
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2517 Array<T>::sort (Array<octave_idx_type> &sidx, octave_idx_type dim,
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2518 sortmode mode) const
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2519 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2520 Array<T> m = *this;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2521
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2522 dim_vector dv = m.dims ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2523
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2524 if (m.length () < 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2525 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2526 sidx = Array<octave_idx_type> (dv);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2527 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2528 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2529
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2530 octave_idx_type ns = dv(dim);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2531 octave_idx_type iter = dv.numel () / ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2532 octave_idx_type stride = 1;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2533 for (int i = 0; i < dim; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2534 stride *= dv(i);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2535
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2536 T *v = m.fortran_vec ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2537 octave_sort<vec_index<T> *> indexed_sort;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2538
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2539 if (mode == ASCENDING)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2540 indexed_sort.set_compare (ascending_compare);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2541 else if (mode == DESCENDING)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2542 indexed_sort.set_compare (descending_compare);
7463
2467639bd8c0 eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents: 7443
diff changeset
2543 else
2467639bd8c0 eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents: 7443
diff changeset
2544 abort ();
7433
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2545
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2546 OCTAVE_LOCAL_BUFFER (vec_index<T> *, vi, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2547 OCTAVE_LOCAL_BUFFER (vec_index<T>, vix, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2548
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2549 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2550 vi[i] = &vix[i];
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2551
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2552 sidx = Array<octave_idx_type> (dv);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2553
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2554 if (stride == 1)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2555 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2556 for (octave_idx_type j = 0; j < iter; j++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2557 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2558 octave_idx_type offset = j * ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2559
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2560 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2561 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2562 vi[i]->vec = v[i];
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2563 vi[i]->indx = i;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2564 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2565
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2566 indexed_sort.sort (vi, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2567
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2568 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2569 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2570 v[i] = vi[i]->vec;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2571 sidx(i + offset) = vi[i]->indx;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2572 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2573 v += ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2574 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2575 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2576 else
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2577 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2578 for (octave_idx_type j = 0; j < iter; j++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2579 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2580 octave_idx_type offset = j;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2581 octave_idx_type offset2 = 0;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2582 while (offset >= stride)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2583 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2584 offset -= stride;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2585 offset2++;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2586 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2587 offset += offset2 * stride * ns;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2588
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2589 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2590 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2591 vi[i]->vec = v[i*stride + offset];
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2592 vi[i]->indx = i;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2593 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2594
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2595 indexed_sort.sort (vi, ns);
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2596
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2597 for (octave_idx_type i = 0; i < ns; i++)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2598 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2599 v[i*stride+offset] = vi[i]->vec;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2600 sidx(i*stride+offset) = vi[i]->indx;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2601 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2602 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2603 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2604
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2605 return m;
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2606 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman]
dbateman
parents: 7321
diff changeset
2607
7443
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2608 #if defined (HAVE_IEEE754_DATA_FORMAT)
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2609
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2610 template <>
7480
93826ba0d078 compilation fixes
Jason Riedy
parents: 7463
diff changeset
2611 bool ascending_compare (double, double);
7443
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2612 template <>
7480
93826ba0d078 compilation fixes
Jason Riedy
parents: 7463
diff changeset
2613 bool ascending_compare (vec_index<double>*, vec_index<double>*);
7443
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2614 template <>
7480
93826ba0d078 compilation fixes
Jason Riedy
parents: 7463
diff changeset
2615 bool descending_compare (double, double);
7443
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2616 template <>
7480
93826ba0d078 compilation fixes
Jason Riedy
parents: 7463
diff changeset
2617 bool descending_compare (vec_index<double>*, vec_index<double>*);
7443
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2618
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2619 template <>
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2620 Array<double> Array<double>::sort (octave_idx_type dim, sortmode mode) const;
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2621 template <>
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2622 Array<double> Array<double>::sort (Array<octave_idx_type> &sidx,
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2623 octave_idx_type dim, sortmode mode) const;
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2624
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2625 #endif
d98dea7d16b0 [project @ 2008-02-03 20:58:12 by jwe]
jwe
parents: 7442
diff changeset
2626
5775
ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe]
jwe
parents: 5765
diff changeset
2627 // FIXME -- this is a mess.
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2628
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2629 template <class LT, class RT>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2630 int
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2631 assign (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2632 {
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
2633 int n_idx = lhs.index_count ();
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
2634
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
2635 // kluge...
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
2636 if (lhs.ndims () == 0)
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
2637 lhs.resize_no_fill (0, 0);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
2638
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
2639 return (lhs.ndims () == 2
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
2640 && (n_idx == 1
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
2641 || (n_idx < 3
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
2642 && rhs.ndims () == 2
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
2643 && rhs.rows () == 0 && rhs.columns () == 0)))
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
2644 ? assign2 (lhs, rhs, rfv) : assignN (lhs, rhs, rfv);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2645 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2646
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2647 template <class LT, class RT>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2648 int
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2649 assign1 (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2650 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2651 int retval = 1;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2652
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2653 idx_vector *tmp = lhs.get_idx ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2654
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2655 idx_vector lhs_idx = tmp[0];
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2656
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2657 octave_idx_type lhs_len = lhs.length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2658 octave_idx_type rhs_len = rhs.length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2659
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2660 octave_idx_type n = lhs_idx.freeze (lhs_len, "vector", true);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2661
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2662 if (n != 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2663 {
6389
f427b33aeb4c [project @ 2007-03-07 09:13:50 by jwe]
jwe
parents: 6388
diff changeset
2664 dim_vector lhs_dims = lhs.dims ();
f427b33aeb4c [project @ 2007-03-07 09:13:50 by jwe]
jwe
parents: 6388
diff changeset
2665
6922
f806e2740216 [project @ 2007-09-21 18:18:27 by jwe]
jwe
parents: 6884
diff changeset
2666 if (lhs_len != 0
f806e2740216 [project @ 2007-09-21 18:18:27 by jwe]
jwe
parents: 6884
diff changeset
2667 || lhs_dims.all_zero ()
f806e2740216 [project @ 2007-09-21 18:18:27 by jwe]
jwe
parents: 6884
diff changeset
2668 || (lhs_dims.length () == 2 && lhs_dims(0) < 2))
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2669 {
6392
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2670 if (rhs_len == n || rhs_len == 1)
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2671 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2672 lhs.make_unique ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2673
6392
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2674 octave_idx_type max_idx = lhs_idx.max () + 1;
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2675 if (max_idx > lhs_len)
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2676 lhs.resize_and_fill (max_idx, rfv);
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2677 }
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2678
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2679 if (rhs_len == n)
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2680 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2681 lhs.make_unique ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2682
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2683 if (lhs_idx.is_colon ())
6392
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2684 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2685 for (octave_idx_type i = 0; i < n; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2686 lhs.xelem (i) = rhs.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2687 }
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2688 else
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2689 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2690 for (octave_idx_type i = 0; i < n; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2691 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2692 octave_idx_type ii = lhs_idx.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2693 lhs.xelem (ii) = rhs.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2694 }
6392
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2695 }
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2696 }
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2697 else if (rhs_len == 1)
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2698 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2699 lhs.make_unique ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2700
6392
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2701 RT scalar = rhs.elem (0);
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2702
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2703 if (lhs_idx.is_colon ())
6392
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2704 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2705 for (octave_idx_type i = 0; i < n; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2706 lhs.xelem (i) = scalar;
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2707 }
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2708 else
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2709 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2710 for (octave_idx_type i = 0; i < n; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2711 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2712 octave_idx_type ii = lhs_idx.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2713 lhs.xelem (ii) = scalar;
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2714 }
6392
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2715 }
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2716 }
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2717 else
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2718 {
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2719 (*current_liboctave_error_handler)
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2720 ("A(I) = X: X must be a scalar or a vector with same length as I");
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2721
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2722 retval = 0;
e8c42df3d234 [project @ 2007-03-07 18:20:46 by jwe]
jwe
parents: 6389
diff changeset
2723 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2724 }
6922
f806e2740216 [project @ 2007-09-21 18:18:27 by jwe]
jwe
parents: 6884
diff changeset
2725 else
f806e2740216 [project @ 2007-09-21 18:18:27 by jwe]
jwe
parents: 6884
diff changeset
2726 {
f806e2740216 [project @ 2007-09-21 18:18:27 by jwe]
jwe
parents: 6884
diff changeset
2727 (*current_liboctave_error_handler)
f806e2740216 [project @ 2007-09-21 18:18:27 by jwe]
jwe
parents: 6884
diff changeset
2728 ("A(I) = X: unable to resize A");
f806e2740216 [project @ 2007-09-21 18:18:27 by jwe]
jwe
parents: 6884
diff changeset
2729
f806e2740216 [project @ 2007-09-21 18:18:27 by jwe]
jwe
parents: 6884
diff changeset
2730 retval = 0;
f806e2740216 [project @ 2007-09-21 18:18:27 by jwe]
jwe
parents: 6884
diff changeset
2731 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2732 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2733 else if (lhs_idx.is_colon ())
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2734 {
6384
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2735 dim_vector lhs_dims = lhs.dims ();
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2736
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2737 if (lhs_dims.all_zero ())
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2738 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2739 lhs.make_unique ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2740
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2741 lhs.resize_no_fill (rhs_len);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2742
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2743 for (octave_idx_type i = 0; i < rhs_len; i++)
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2744 lhs.xelem (i) = rhs.elem (i);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2745 }
6553
af5025cb0f2b [project @ 2007-04-20 15:37:19 by jwe]
jwe
parents: 6525
diff changeset
2746 else if (rhs_len != lhs_len)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2747 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2748 ("A(:) = X: A must be the same size as X");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2749 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2750 else if (! (rhs_len == 1 || rhs_len == 0))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2751 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2752 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2753 ("A([]) = X: X must also be an empty matrix or a scalar");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2754
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2755 retval = 0;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2756 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2757
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2758 lhs.clear_index ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2759
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2760 return retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2761 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2762
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2763 #define MAYBE_RESIZE_LHS \
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2764 do \
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2765 { \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2766 octave_idx_type max_row_idx = idx_i_is_colon ? rhs_nr : idx_i.max () + 1; \
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2767 octave_idx_type max_col_idx = idx_j_is_colon ? rhs_nc : idx_j.max () + 1; \
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2768 \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2769 octave_idx_type new_nr = max_row_idx > lhs_nr ? max_row_idx : lhs_nr; \
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2770 octave_idx_type new_nc = max_col_idx > lhs_nc ? max_col_idx : lhs_nc; \
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2771 \
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2772 lhs.resize_and_fill (new_nr, new_nc, rfv); \
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2773 } \
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2774 while (0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2775
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2776 template <class LT, class RT>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2777 int
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2778 assign2 (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2779 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2780 int retval = 1;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2781
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2782 int n_idx = lhs.index_count ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2783
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2784 octave_idx_type lhs_nr = lhs.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2785 octave_idx_type lhs_nc = lhs.cols ();
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2786
5047
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
2787 Array<RT> xrhs = rhs;
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
2788
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2789 octave_idx_type rhs_nr = xrhs.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2790 octave_idx_type rhs_nc = xrhs.cols ();
5047
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
2791
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
2792 if (xrhs.ndims () > 2)
4707
8d4bb887f381 [project @ 2004-01-22 16:01:51 by jwe]
jwe
parents: 4703
diff changeset
2793 {
5047
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
2794 xrhs = xrhs.squeeze ();
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
2795
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
2796 dim_vector dv_tmp = xrhs.dims ();
4709
cf141edca935 [project @ 2004-01-22 18:10:53 by jwe]
jwe
parents: 4708
diff changeset
2797
4708
e5639a6586c4 [project @ 2004-01-22 17:59:28 by jwe]
jwe
parents: 4707
diff changeset
2798 switch (dv_tmp.length ())
4707
8d4bb887f381 [project @ 2004-01-22 16:01:51 by jwe]
jwe
parents: 4703
diff changeset
2799 {
4708
e5639a6586c4 [project @ 2004-01-22 17:59:28 by jwe]
jwe
parents: 4707
diff changeset
2800 case 1:
5775
ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe]
jwe
parents: 5765
diff changeset
2801 // FIXME -- this case should be unnecessary, because
5047
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
2802 // squeeze should always return an object with 2 dimensions.
4708
e5639a6586c4 [project @ 2004-01-22 17:59:28 by jwe]
jwe
parents: 4707
diff changeset
2803 if (rhs_nr == 1)
e5639a6586c4 [project @ 2004-01-22 17:59:28 by jwe]
jwe
parents: 4707
diff changeset
2804 rhs_nc = dv_tmp.elem (0);
e5639a6586c4 [project @ 2004-01-22 17:59:28 by jwe]
jwe
parents: 4707
diff changeset
2805 break;
4709
cf141edca935 [project @ 2004-01-22 18:10:53 by jwe]
jwe
parents: 4708
diff changeset
2806
4708
e5639a6586c4 [project @ 2004-01-22 17:59:28 by jwe]
jwe
parents: 4707
diff changeset
2807 case 2:
4707
8d4bb887f381 [project @ 2004-01-22 16:01:51 by jwe]
jwe
parents: 4703
diff changeset
2808 rhs_nr = dv_tmp.elem (0);
8d4bb887f381 [project @ 2004-01-22 16:01:51 by jwe]
jwe
parents: 4703
diff changeset
2809 rhs_nc = dv_tmp.elem (1);
4708
e5639a6586c4 [project @ 2004-01-22 17:59:28 by jwe]
jwe
parents: 4707
diff changeset
2810 break;
e5639a6586c4 [project @ 2004-01-22 17:59:28 by jwe]
jwe
parents: 4707
diff changeset
2811
e5639a6586c4 [project @ 2004-01-22 17:59:28 by jwe]
jwe
parents: 4707
diff changeset
2812 default:
e5639a6586c4 [project @ 2004-01-22 17:59:28 by jwe]
jwe
parents: 4707
diff changeset
2813 (*current_liboctave_error_handler)
e5639a6586c4 [project @ 2004-01-22 17:59:28 by jwe]
jwe
parents: 4707
diff changeset
2814 ("Array<T>::assign2: Dimension mismatch");
4709
cf141edca935 [project @ 2004-01-22 18:10:53 by jwe]
jwe
parents: 4708
diff changeset
2815 return 0;
4707
8d4bb887f381 [project @ 2004-01-22 16:01:51 by jwe]
jwe
parents: 4703
diff changeset
2816 }
8d4bb887f381 [project @ 2004-01-22 16:01:51 by jwe]
jwe
parents: 4703
diff changeset
2817 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2818
6384
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2819 bool rhs_is_scalar = rhs_nr == 1 && rhs_nc == 1;
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2820
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2821 idx_vector *tmp = lhs.get_idx ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2822
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2823 idx_vector idx_i;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2824 idx_vector idx_j;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2825
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2826 if (n_idx > 1)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2827 idx_j = tmp[1];
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2828
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2829 if (n_idx > 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2830 idx_i = tmp[0];
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2831
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2832 if (n_idx == 2)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2833 {
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2834 octave_idx_type n = idx_i.freeze (lhs_nr, "row", true);
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2835 octave_idx_type m = idx_j.freeze (lhs_nc, "column", true);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2836
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2837 int idx_i_is_colon = idx_i.is_colon ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2838 int idx_j_is_colon = idx_j.is_colon ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2839
6384
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2840 if (lhs_nr == 0 && lhs_nc == 0)
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2841 {
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2842 if (idx_i_is_colon)
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2843 n = rhs_nr;
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2844
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2845 if (idx_j_is_colon)
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2846 m = rhs_nc;
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2847 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2848
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2849 if (idx_i && idx_j)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2850 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2851 if (rhs_nr == 0 && rhs_nc == 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2852 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2853 lhs.maybe_delete_elements (idx_i, idx_j);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2854 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2855 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2856 {
6384
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2857 if (rhs_is_scalar && n >= 0 && m >= 0)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2858 {
4534
e8355721a809 [project @ 2003-10-16 02:31:56 by jwe]
jwe
parents: 4533
diff changeset
2859 // No need to do anything if either of the indices
e8355721a809 [project @ 2003-10-16 02:31:56 by jwe]
jwe
parents: 4533
diff changeset
2860 // are empty.
e8355721a809 [project @ 2003-10-16 02:31:56 by jwe]
jwe
parents: 4533
diff changeset
2861
e8355721a809 [project @ 2003-10-16 02:31:56 by jwe]
jwe
parents: 4533
diff changeset
2862 if (n > 0 && m > 0)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2863 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2864 lhs.make_unique ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2865
4534
e8355721a809 [project @ 2003-10-16 02:31:56 by jwe]
jwe
parents: 4533
diff changeset
2866 MAYBE_RESIZE_LHS;
e8355721a809 [project @ 2003-10-16 02:31:56 by jwe]
jwe
parents: 4533
diff changeset
2867
5047
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
2868 RT scalar = xrhs.elem (0, 0);
4534
e8355721a809 [project @ 2003-10-16 02:31:56 by jwe]
jwe
parents: 4533
diff changeset
2869
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2870 for (octave_idx_type j = 0; j < m; j++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2871 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2872 octave_idx_type jj = idx_j.elem (j);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2873 for (octave_idx_type i = 0; i < n; i++)
4534
e8355721a809 [project @ 2003-10-16 02:31:56 by jwe]
jwe
parents: 4533
diff changeset
2874 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2875 octave_idx_type ii = idx_i.elem (i);
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2876 lhs.xelem (ii, jj) = scalar;
4534
e8355721a809 [project @ 2003-10-16 02:31:56 by jwe]
jwe
parents: 4533
diff changeset
2877 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2878 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2879 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2880 }
6072
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2881 else if ((n == 1 || m == 1)
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2882 && (rhs_nr == 1 || rhs_nc == 1)
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2883 && n * m == rhs_nr * rhs_nc)
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2884 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2885 lhs.make_unique ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2886
6384
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2887 MAYBE_RESIZE_LHS;
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2888
6072
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2889 if (n > 0 && m > 0)
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2890 {
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2891 octave_idx_type k = 0;
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2892
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2893 for (octave_idx_type j = 0; j < m; j++)
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2894 {
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2895 octave_idx_type jj = idx_j.elem (j);
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2896 for (octave_idx_type i = 0; i < n; i++)
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2897 {
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2898 octave_idx_type ii = idx_i.elem (i);
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2899 lhs.xelem (ii, jj) = xrhs.elem (k++);
6072
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2900 }
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2901 }
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2902 }
4036e6fca790 [project @ 2006-10-24 01:00:12 by jwe]
jwe
parents: 5992
diff changeset
2903 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2904 else if (n == rhs_nr && m == rhs_nc)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2905 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2906 lhs.make_unique ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2907
6384
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2908 MAYBE_RESIZE_LHS;
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2909
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2910 if (n > 0 && m > 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2911 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2912 for (octave_idx_type j = 0; j < m; j++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2913 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2914 octave_idx_type jj = idx_j.elem (j);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2915 for (octave_idx_type i = 0; i < n; i++)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2916 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2917 octave_idx_type ii = idx_i.elem (i);
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
2918 lhs.xelem (ii, jj) = xrhs.elem (i, j);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2919 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2920 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2921 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2922 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2923 else if (n == 0 && m == 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2924 {
6384
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2925 if (! (rhs_is_scalar || (rhs_nr == 0 || rhs_nc == 0)))
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2926 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2927 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2928 ("A([], []) = X: X must be an empty matrix or a scalar");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2929
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2930 retval = 0;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2931 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2932 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2933 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2934 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2935 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2936 ("A(I, J) = X: X must be a scalar or the number of elements in I must");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2937 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2938 ("match the number of rows in X and the number of elements in J must");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2939 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2940 ("match the number of columns in X");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2941
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2942 retval = 0;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2943 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2944 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2945 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2946 // idx_vector::freeze() printed an error message for us.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2947 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2948 else if (n_idx == 1)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2949 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2950 int lhs_is_empty = lhs_nr == 0 || lhs_nc == 0;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2951
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2952 if (lhs_is_empty || (lhs_nr == 1 && lhs_nc == 1))
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2953 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2954 octave_idx_type lhs_len = lhs.length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2955
6384
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2956 idx_i.freeze (lhs_len, 0, true);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2957
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2958 if (idx_i)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2959 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2960 if (rhs_nr == 0 && rhs_nc == 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2961 {
6384
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
2962 lhs.maybe_delete_elements (idx_i);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2963 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2964 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2965 {
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2966 if (lhs_is_empty
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2967 && idx_i.is_colon ()
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2968 && ! (rhs_nr == 1 || rhs_nc == 1))
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2969 {
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2970 (*current_liboctave_warning_with_id_handler)
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2971 ("Octave:fortran-indexing",
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2972 "A(:) = X: X is not a vector or scalar");
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2973 }
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2974 else
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2975 {
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2976 octave_idx_type idx_nr = idx_i.orig_rows ();
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2977 octave_idx_type idx_nc = idx_i.orig_columns ();
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2978
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2979 if (! (rhs_nr == idx_nr && rhs_nc == idx_nc))
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2980 (*current_liboctave_warning_with_id_handler)
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2981 ("Octave:fortran-indexing",
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
2982 "A(I) = X: X does not have same shape as I");
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2983 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2984
5047
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
2985 if (assign1 (lhs, xrhs, rfv))
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2986 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
2987 octave_idx_type len = lhs.length ();
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2988
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2989 if (len > 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2990 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2991 // The following behavior is much simplified
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2992 // over previous versions of Octave. It
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2993 // seems to be compatible with Matlab.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2994
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2995 lhs.dimensions = dim_vector (1, lhs.length ());
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2996 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2997 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2998 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
2999 retval = 0;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3000 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3001 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3002 // idx_vector::freeze() printed an error message for us.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3003 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3004 else if (lhs_nr == 1)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3005 {
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
3006 idx_i.freeze (lhs_nc, "vector", true);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3007
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3008 if (idx_i)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3009 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3010 if (rhs_nr == 0 && rhs_nc == 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3011 lhs.maybe_delete_elements (idx_i);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3012 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3013 {
5047
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
3014 if (assign1 (lhs, xrhs, rfv))
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3015 lhs.dimensions = dim_vector (1, lhs.length ());
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3016 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3017 retval = 0;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3018 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3019 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3020 // idx_vector::freeze() printed an error message for us.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3021 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3022 else if (lhs_nc == 1)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3023 {
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
3024 idx_i.freeze (lhs_nr, "vector", true);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3025
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3026 if (idx_i)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3027 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3028 if (rhs_nr == 0 && rhs_nc == 0)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3029 lhs.maybe_delete_elements (idx_i);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3030 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3031 {
5047
36f954d8d53a [project @ 2004-10-18 17:34:51 by jwe]
jwe
parents: 5039
diff changeset
3032 if (assign1 (lhs, xrhs, rfv))
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3033 lhs.dimensions = dim_vector (lhs.length (), 1);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3034 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3035 retval = 0;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3036 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3037 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3038 // idx_vector::freeze() printed an error message for us.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3039 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3040 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3041 {
7573
755bf7ecc29b eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents: 7480
diff changeset
3042 if (! idx_i.is_colon ())
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
3043 (*current_liboctave_warning_with_id_handler)
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
3044 ("Octave:fortran-indexing", "single index used for matrix");
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3045
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
3046 octave_idx_type len = idx_i.freeze (lhs_nr * lhs_nc, "matrix");
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3047
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3048 if (idx_i)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3049 {
4756
60c78bde10e5 [project @ 2004-02-13 21:58:01 by jwe]
jwe
parents: 4755
diff changeset
3050 if (rhs_nr == 0 && rhs_nc == 0)
60c78bde10e5 [project @ 2004-02-13 21:58:01 by jwe]
jwe
parents: 4755
diff changeset
3051 lhs.maybe_delete_elements (idx_i);
60c78bde10e5 [project @ 2004-02-13 21:58:01 by jwe]
jwe
parents: 4755
diff changeset
3052 else if (len == 0)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3053 {
6384
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
3054 if (! (rhs_is_scalar || (rhs_nr == 0 || rhs_nc == 0)))
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3055 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3056 ("A([]) = X: X must be an empty matrix or scalar");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3057 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3058 else if (len == rhs_nr * rhs_nc)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3059 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3060 lhs.make_unique ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3061
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3062 if (idx_i.is_colon ())
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3063 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3064 for (octave_idx_type i = 0; i < len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3065 lhs.xelem (i) = xrhs.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3066 }
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3067 else
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3068 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3069 for (octave_idx_type i = 0; i < len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3070 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3071 octave_idx_type ii = idx_i.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3072 lhs.xelem (ii) = xrhs.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3073 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3074 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3075 }
6384
c2eb95ca0e2b [project @ 2007-03-06 06:03:01 by jwe]
jwe
parents: 6141
diff changeset
3076 else if (rhs_is_scalar)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3077 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3078 lhs.make_unique ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3079
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3080 RT scalar = rhs.elem (0, 0);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3081
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3082 if (idx_i.is_colon ())
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3083 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3084 for (octave_idx_type i = 0; i < len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3085 lhs.xelem (i) = scalar;
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3086 }
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3087 else
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3088 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3089 for (octave_idx_type i = 0; i < len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3090 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3091 octave_idx_type ii = idx_i.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3092 lhs.xelem (ii) = scalar;
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3093 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3094 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3095 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3096 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3097 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3098 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3099 ("A(I) = X: X must be a scalar or a matrix with the same size as I");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3100
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3101 retval = 0;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3102 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3103 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3104 // idx_vector::freeze() printed an error message for us.
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3105 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3106 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3107 else
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3108 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3109 (*current_liboctave_error_handler)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3110 ("invalid number of indices for matrix expression");
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3111
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3112 retval = 0;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3113 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3114
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3115 lhs.clear_index ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3116
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3117 return retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3118 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3119
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3120 template <class LT, class RT>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3121 int
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3122 assignN (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv)
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3123 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3124 int retval = 1;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3125
4746
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3126 dim_vector rhs_dims = rhs.dims ();
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3127
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
3128 octave_idx_type rhs_dims_len = rhs_dims.length ();
4746
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3129
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3130 bool rhs_is_scalar = is_scalar (rhs_dims);
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3131
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3132 int n_idx = lhs.index_count ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3133
4745
537509a45ba7 [project @ 2004-02-06 17:27:21 by jwe]
jwe
parents: 4743
diff changeset
3134 idx_vector *idx_vex = lhs.get_idx ();
537509a45ba7 [project @ 2004-02-06 17:27:21 by jwe]
jwe
parents: 4743
diff changeset
3135
537509a45ba7 [project @ 2004-02-06 17:27:21 by jwe]
jwe
parents: 4743
diff changeset
3136 Array<idx_vector> idx = conv_to_array (idx_vex, n_idx);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3137
4743
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3138 if (rhs_dims_len == 2 && rhs_dims(0) == 0 && rhs_dims(1) == 0)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3139 {
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3140 lhs.maybe_delete_elements (idx, rfv);
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3141 }
5285
fe5ee25a5e6c [project @ 2005-04-19 15:02:49 by jwe]
jwe
parents: 5275
diff changeset
3142 else if (n_idx == 0)
fe5ee25a5e6c [project @ 2005-04-19 15:02:49 by jwe]
jwe
parents: 5275
diff changeset
3143 {
fe5ee25a5e6c [project @ 2005-04-19 15:02:49 by jwe]
jwe
parents: 5275
diff changeset
3144 (*current_liboctave_error_handler)
fe5ee25a5e6c [project @ 2005-04-19 15:02:49 by jwe]
jwe
parents: 5275
diff changeset
3145 ("invalid number of indices for matrix expression");
fe5ee25a5e6c [project @ 2005-04-19 15:02:49 by jwe]
jwe
parents: 5275
diff changeset
3146
fe5ee25a5e6c [project @ 2005-04-19 15:02:49 by jwe]
jwe
parents: 5275
diff changeset
3147 retval = 0;
fe5ee25a5e6c [project @ 2005-04-19 15:02:49 by jwe]
jwe
parents: 5275
diff changeset
3148 }
4657
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3149 else if (n_idx == 1)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3150 {
4657
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3151 idx_vector iidx = idx(0);
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3152 int iidx_is_colon = iidx.is_colon ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3153
7573
755bf7ecc29b eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents: 7480
diff changeset
3154 if (! iidx_is_colon)
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
3155 (*current_liboctave_warning_with_id_handler)
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
3156 ("Octave:fortran-indexing", "single index used for N-d array");
4657
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3157
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
3158 octave_idx_type lhs_len = lhs.length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
3159
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
3160 octave_idx_type len = iidx.freeze (lhs_len, "N-d arrray");
4657
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3161
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3162 if (iidx)
4533
ed2990fab58f [project @ 2003-10-10 02:13:33 by jwe]
jwe
parents: 4532
diff changeset
3163 {
4657
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3164 if (len == 0)
4656
e3da702f7502 [project @ 2003-11-24 23:59:12 by jwe]
jwe
parents: 4653
diff changeset
3165 {
5039
8fa98abef34a [project @ 2004-09-24 23:43:18 by jwe]
jwe
parents: 4929
diff changeset
3166 if (! (rhs_dims.all_ones () || rhs_dims.any_zero ()))
4743
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3167 {
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3168 (*current_liboctave_error_handler)
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3169 ("A([]) = X: X must be an empty matrix or scalar");
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3170
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3171 retval = 0;
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3172 }
4657
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3173 }
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3174 else if (len == rhs.length ())
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3175 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3176 lhs.make_unique ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3177
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3178 if (iidx_is_colon)
4656
e3da702f7502 [project @ 2003-11-24 23:59:12 by jwe]
jwe
parents: 4653
diff changeset
3179 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3180 for (octave_idx_type i = 0; i < len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3181 lhs.xelem (i) = rhs.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3182 }
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3183 else
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3184 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3185 for (octave_idx_type i = 0; i < len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3186 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3187 octave_idx_type ii = iidx.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3188
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3189 lhs.xelem (ii) = rhs.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3190 }
4656
e3da702f7502 [project @ 2003-11-24 23:59:12 by jwe]
jwe
parents: 4653
diff changeset
3191 }
e3da702f7502 [project @ 2003-11-24 23:59:12 by jwe]
jwe
parents: 4653
diff changeset
3192 }
4716
fe25e290fafb [project @ 2004-01-23 03:09:59 by jwe]
jwe
parents: 4711
diff changeset
3193 else if (rhs_is_scalar)
4657
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3194 {
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3195 RT scalar = rhs.elem (0);
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3196
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3197 lhs.make_unique ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3198
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3199 if (iidx_is_colon)
4657
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3200 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3201 for (octave_idx_type i = 0; i < len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3202 lhs.xelem (i) = scalar;
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3203 }
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3204 else
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3205 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3206 for (octave_idx_type i = 0; i < len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3207 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3208 octave_idx_type ii = iidx.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3209
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3210 lhs.xelem (ii) = scalar;
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3211 }
4657
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3212 }
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3213 }
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3214 else
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3215 {
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3216 (*current_liboctave_error_handler)
4702
4d2e1623c9a9 [project @ 2004-01-21 20:10:25 by jwe]
jwe
parents: 4673
diff changeset
3217 ("A(I) = X: X must be a scalar or a matrix with the same size as I");
4d2e1623c9a9 [project @ 2004-01-21 20:10:25 by jwe]
jwe
parents: 4673
diff changeset
3218
4657
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3219 retval = 0;
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3220 }
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3221
4656
e3da702f7502 [project @ 2003-11-24 23:59:12 by jwe]
jwe
parents: 4653
diff changeset
3222 // idx_vector::freeze() printed an error message for us.
4533
ed2990fab58f [project @ 2003-10-10 02:13:33 by jwe]
jwe
parents: 4532
diff changeset
3223 }
4702
4d2e1623c9a9 [project @ 2004-01-21 20:10:25 by jwe]
jwe
parents: 4673
diff changeset
3224 }
4743
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3225 else
4702
4d2e1623c9a9 [project @ 2004-01-21 20:10:25 by jwe]
jwe
parents: 4673
diff changeset
3226 {
4746
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3227 // Maybe expand to more dimensions.
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3228
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3229 dim_vector lhs_dims = lhs.dims ();
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3230
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
3231 octave_idx_type lhs_dims_len = lhs_dims.length ();
4746
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3232
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3233 dim_vector final_lhs_dims = lhs_dims;
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3234
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3235 dim_vector frozen_len;
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3236
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
3237 octave_idx_type orig_lhs_dims_len = lhs_dims_len;
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3238
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3239 bool orig_empty = lhs_dims.all_zero ();
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3240
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3241 if (n_idx < lhs_dims_len)
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3242 {
5052
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3243 // Collapse dimensions beyond last index. Note that we
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3244 // delay resizing LHS until we know that the assignment will
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3245 // succeed.
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3246
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
3247 if (! (idx(n_idx-1).is_colon ()))
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
3248 (*current_liboctave_warning_with_id_handler)
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
3249 ("Octave:fortran-indexing",
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
3250 "fewer indices than dimensions for N-d array");
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3251
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3252 for (int i = n_idx; i < lhs_dims_len; i++)
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3253 lhs_dims(n_idx-1) *= lhs_dims(i);
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3254
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3255 lhs_dims.resize (n_idx);
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3256
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3257 lhs_dims_len = lhs_dims.length ();
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3258 }
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3259
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3260 // Resize.
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3261
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3262 dim_vector new_dims;
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3263 new_dims.resize (n_idx);
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3264
5264
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3265 if (orig_empty)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3266 {
5264
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3267 int k = 0;
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3268 for (int i = 0; i < n_idx; i++)
4746
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3269 {
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3270 // If index is a colon, resizing to RHS dimensions is
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3271 // allowed because we started out empty.
4746
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3272
5264
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3273 if (idx(i).is_colon ())
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3274 {
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3275 if (k < rhs_dims.length ())
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3276 new_dims(i) = rhs_dims(k++);
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3277 else
5379
27986bd3e238 [project @ 2005-06-02 18:21:20 by jwe]
jwe
parents: 5340
diff changeset
3278 new_dims(i) = 1;
27986bd3e238 [project @ 2005-06-02 18:21:20 by jwe]
jwe
parents: 5340
diff changeset
3279 }
27986bd3e238 [project @ 2005-06-02 18:21:20 by jwe]
jwe
parents: 5340
diff changeset
3280 else
27986bd3e238 [project @ 2005-06-02 18:21:20 by jwe]
jwe
parents: 5340
diff changeset
3281 {
27986bd3e238 [project @ 2005-06-02 18:21:20 by jwe]
jwe
parents: 5340
diff changeset
3282 octave_idx_type nelem = idx(i).capacity ();
27986bd3e238 [project @ 2005-06-02 18:21:20 by jwe]
jwe
parents: 5340
diff changeset
3283
27986bd3e238 [project @ 2005-06-02 18:21:20 by jwe]
jwe
parents: 5340
diff changeset
3284 if (nelem >= 1
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3285 && ((k < rhs_dims.length () && nelem == rhs_dims(k))
7605
48488cca0006 Fix for array indexing if original matrix is empty
David Bateman <dbateman@free.fr>
parents: 7597
diff changeset
3286 || rhs_is_scalar) || ! idx(i).is_colon())
5379
27986bd3e238 [project @ 2005-06-02 18:21:20 by jwe]
jwe
parents: 5340
diff changeset
3287 k++;
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3288 else if (! (nelem == 1 || rhs_is_scalar))
5264
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3289 {
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3290 (*current_liboctave_error_handler)
5379
27986bd3e238 [project @ 2005-06-02 18:21:20 by jwe]
jwe
parents: 5340
diff changeset
3291 ("A(IDX-LIST) = RHS: mismatched index and RHS dimension");
5264
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3292 return retval;
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3293 }
5379
27986bd3e238 [project @ 2005-06-02 18:21:20 by jwe]
jwe
parents: 5340
diff changeset
3294
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3295 new_dims(i) = idx(i).orig_empty () ? 0 : idx(i).max () + 1;
5264
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3296 }
4746
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3297 }
5264
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3298 }
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3299 else
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3300 {
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3301 for (int i = 0; i < n_idx; i++)
4746
c43a0c0b6d44 [project @ 2004-02-06 20:46:31 by jwe]
jwe
parents: 4745
diff changeset
3302 {
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3303 // We didn't start out with all zero dimensions, so if
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3304 // index is a colon, it refers to the current LHS
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3305 // dimension. Otherwise, it is OK to enlarge to a
5264
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3306 // dimension given by the largest index, but if that
4898
8fd9495f5054 [project @ 2004-06-04 13:29:33 by jwe]
jwe
parents: 4887
diff changeset
3307 // index is a colon the new dimension is singleton.
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3308
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3309 if (i < lhs_dims_len
6481
89ed13fec6fe [project @ 2007-04-03 19:39:11 by jwe]
jwe
parents: 6392
diff changeset
3310 && (idx(i).is_colon ()
89ed13fec6fe [project @ 2007-04-03 19:39:11 by jwe]
jwe
parents: 6392
diff changeset
3311 || idx(i).orig_empty ()
89ed13fec6fe [project @ 2007-04-03 19:39:11 by jwe]
jwe
parents: 6392
diff changeset
3312 || idx(i).max () < lhs_dims(i)))
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3313 new_dims(i) = lhs_dims(i);
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3314 else if (! idx(i).is_colon ())
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3315 new_dims(i) = idx(i).max () + 1;
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3316 else
4898
8fd9495f5054 [project @ 2004-06-04 13:29:33 by jwe]
jwe
parents: 4887
diff changeset
3317 new_dims(i) = 1;
4745
537509a45ba7 [project @ 2004-02-06 17:27:21 by jwe]
jwe
parents: 4743
diff changeset
3318 }
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3319 }
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3320
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3321 if (retval != 0)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3322 {
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3323 if (! orig_empty
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3324 && n_idx < orig_lhs_dims_len
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3325 && new_dims(n_idx-1) != lhs_dims(n_idx-1))
4702
4d2e1623c9a9 [project @ 2004-01-21 20:10:25 by jwe]
jwe
parents: 4673
diff changeset
3326 {
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3327 // We reshaped and the last dimension changed. This has to
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3328 // be an error, because we don't know how to undo that
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3329 // later...
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3330
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3331 (*current_liboctave_error_handler)
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3332 ("array index %d (= %d) for assignment requires invalid resizing operation",
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3333 n_idx, new_dims(n_idx-1));
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3334
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3335 retval = 0;
4743
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3336 }
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3337 else
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3338 {
5052
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3339 // Determine final dimensions for LHS and reset the
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3340 // current size of the LHS. Note that we delay actually
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3341 // resizing LHS until we know that the assignment will
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3342 // succeed.
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3343
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3344 if (n_idx < orig_lhs_dims_len)
4743
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3345 {
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3346 for (int i = 0; i < n_idx-1; i++)
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3347 final_lhs_dims(i) = new_dims(i);
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3348 }
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3349 else
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3350 final_lhs_dims = new_dims;
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3351
5837
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe]
jwe
parents: 5781
diff changeset
3352 lhs_dims_len = new_dims.length ();
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe]
jwe
parents: 5781
diff changeset
3353
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe]
jwe
parents: 5781
diff changeset
3354 frozen_len = freeze (idx, new_dims, true);
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3355
6141
f6c2d9276572 [project @ 2006-11-06 17:52:51 by jwe]
jwe
parents: 6072
diff changeset
3356 for (int i = 0; i < idx.length (); i++)
f6c2d9276572 [project @ 2006-11-06 17:52:51 by jwe]
jwe
parents: 6072
diff changeset
3357 {
f6c2d9276572 [project @ 2006-11-06 17:52:51 by jwe]
jwe
parents: 6072
diff changeset
3358 if (! idx(i))
f6c2d9276572 [project @ 2006-11-06 17:52:51 by jwe]
jwe
parents: 6072
diff changeset
3359 {
f6c2d9276572 [project @ 2006-11-06 17:52:51 by jwe]
jwe
parents: 6072
diff changeset
3360 retval = 0;
f6c2d9276572 [project @ 2006-11-06 17:52:51 by jwe]
jwe
parents: 6072
diff changeset
3361 lhs.clear_index ();
f6c2d9276572 [project @ 2006-11-06 17:52:51 by jwe]
jwe
parents: 6072
diff changeset
3362 return retval;
f6c2d9276572 [project @ 2006-11-06 17:52:51 by jwe]
jwe
parents: 6072
diff changeset
3363 }
f6c2d9276572 [project @ 2006-11-06 17:52:51 by jwe]
jwe
parents: 6072
diff changeset
3364 }
f6c2d9276572 [project @ 2006-11-06 17:52:51 by jwe]
jwe
parents: 6072
diff changeset
3365
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3366 if (rhs_is_scalar)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3367 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3368 lhs.make_unique ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3369
5837
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe]
jwe
parents: 5781
diff changeset
3370 if (n_idx < orig_lhs_dims_len)
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe]
jwe
parents: 5781
diff changeset
3371 lhs = lhs.reshape (lhs_dims);
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe]
jwe
parents: 5781
diff changeset
3372
5052
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3373 lhs.resize_and_fill (new_dims, rfv);
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3374
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3375 if (! final_lhs_dims.any_zero ())
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3376 {
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3377 RT scalar = rhs.elem (0);
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3378
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3379 if (n_idx == 1)
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3380 {
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3381 idx_vector iidx = idx(0);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3382
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3383 octave_idx_type len = frozen_len(0);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3384
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3385 if (iidx.is_colon ())
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3386 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3387 for (octave_idx_type i = 0; i < len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3388 lhs.xelem (i) = scalar;
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3389 }
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3390 else
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3391 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3392 for (octave_idx_type i = 0; i < len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3393 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3394 octave_idx_type ii = iidx.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3395
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3396 lhs.xelem (ii) = scalar;
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3397 }
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3398 }
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3399 }
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3400 else if (lhs_dims_len == 2 && n_idx == 2)
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3401 {
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3402 idx_vector idx_i = idx(0);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3403 idx_vector idx_j = idx(1);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3404
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3405 octave_idx_type i_len = frozen_len(0);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3406 octave_idx_type j_len = frozen_len(1);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3407
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3408 if (idx_i.is_colon())
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3409 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3410 for (octave_idx_type j = 0; j < j_len; j++)
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3411 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3412 octave_idx_type off = new_dims (0) *
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3413 idx_j.elem (j);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3414 for (octave_idx_type i = 0; i < i_len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3415 lhs.xelem (i + off) = scalar;
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3416 }
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3417 }
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3418 else
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3419 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3420 for (octave_idx_type j = 0; j < j_len; j++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3421 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3422 octave_idx_type off = new_dims (0) *
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3423 idx_j.elem (j);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3424 for (octave_idx_type i = 0; i < i_len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3425 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3426 octave_idx_type ii = idx_i.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3427 lhs.xelem (ii + off) = scalar;
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3428 }
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3429 }
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3430 }
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3431 }
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3432 else
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3433 {
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3434 octave_idx_type n = Array<LT>::get_size (frozen_len);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3435
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3436 Array<octave_idx_type> result_idx (lhs_dims_len, 0);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3437
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3438 for (octave_idx_type i = 0; i < n; i++)
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3439 {
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3440 Array<octave_idx_type> elt_idx = get_elt_idx (idx, result_idx);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3441
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3442 lhs.xelem (elt_idx) = scalar;
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3443
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3444 increment_index (result_idx, frozen_len);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3445 }
4747
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3446 }
3f28979bbe2c [project @ 2004-02-06 23:56:46 by jwe]
jwe
parents: 4746
diff changeset
3447 }
4743
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3448 }
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3449 else
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3450 {
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3451 // RHS is matrix or higher dimension.
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3452
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5265
diff changeset
3453 octave_idx_type n = Array<LT>::get_size (frozen_len);
5264
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3454
95e054384359 [project @ 2005-04-01 18:22:37 by jwe]
jwe
parents: 5148
diff changeset
3455 if (n != rhs.numel ())
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3456 {
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3457 (*current_liboctave_error_handler)
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3458 ("A(IDX-LIST) = X: X must be a scalar or size of X must equal number of elements indexed by IDX-LIST");
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3459
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3460 retval = 0;
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3461 }
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3462 else
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3463 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3464 lhs.make_unique ();
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3465
5837
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe]
jwe
parents: 5781
diff changeset
3466 if (n_idx < orig_lhs_dims_len)
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe]
jwe
parents: 5781
diff changeset
3467 lhs = lhs.reshape (lhs_dims);
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe]
jwe
parents: 5781
diff changeset
3468
5052
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3469 lhs.resize_and_fill (new_dims, rfv);
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3470
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3471 if (! final_lhs_dims.any_zero ())
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3472 {
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3473 if (n_idx == 1)
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3474 {
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3475 idx_vector iidx = idx(0);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3476
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3477 octave_idx_type len = frozen_len(0);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3478
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3479 if (iidx.is_colon ())
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3480 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3481 for (octave_idx_type i = 0; i < len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3482 lhs.xelem (i) = rhs.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3483 }
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3484 else
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3485 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3486 for (octave_idx_type i = 0; i < len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3487 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3488 octave_idx_type ii = iidx.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3489
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3490 lhs.xelem (ii) = rhs.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3491 }
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3492 }
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3493 }
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3494 else if (lhs_dims_len == 2 && n_idx == 2)
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3495 {
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3496 idx_vector idx_i = idx(0);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3497 idx_vector idx_j = idx(1);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3498
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3499 octave_idx_type i_len = frozen_len(0);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3500 octave_idx_type j_len = frozen_len(1);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3501 octave_idx_type k = 0;
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3502
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3503 if (idx_i.is_colon())
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3504 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3505 for (octave_idx_type j = 0; j < j_len; j++)
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3506 {
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3507 octave_idx_type off = new_dims (0) *
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3508 idx_j.elem (j);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3509 for (octave_idx_type i = 0;
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3510 i < i_len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3511 lhs.xelem (i + off) = rhs.elem (k++);
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3512 }
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3513 }
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3514 else
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3515 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3516 for (octave_idx_type j = 0; j < j_len; j++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3517 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3518 octave_idx_type off = new_dims (0) *
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3519 idx_j.elem (j);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3520 for (octave_idx_type i = 0; i < i_len; i++)
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3521 {
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3522 octave_idx_type ii = idx_i.elem (i);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3523 lhs.xelem (ii + off) = rhs.elem (k++);
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3524 }
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3525 }
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3526 }
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3527
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3528 }
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3529 else
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3530 {
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3531 n = Array<LT>::get_size (frozen_len);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3532
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3533 Array<octave_idx_type> result_idx (lhs_dims_len, 0);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3534
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3535 for (octave_idx_type i = 0; i < n; i++)
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3536 {
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3537 Array<octave_idx_type> elt_idx = get_elt_idx (idx, result_idx);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3538
6884
1cbb8b606d63 [project @ 2007-09-10 20:43:26 by jwe]
jwe
parents: 6881
diff changeset
3539 lhs.xelem (elt_idx) = rhs.elem (i);
6388
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3540
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3541 increment_index (result_idx, frozen_len);
4109a2386346 [project @ 2007-03-07 08:47:36 by jwe]
jwe
parents: 6384
diff changeset
3542 }
4749
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3543 }
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3544 }
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3545 }
a4bc7156bd60 [project @ 2004-02-07 16:59:28 by jwe]
jwe
parents: 4747
diff changeset
3546 }
4743
754e2855a32d [project @ 2004-02-06 04:07:22 by jwe]
jwe
parents: 4741
diff changeset
3547 }
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3548 }
4745
537509a45ba7 [project @ 2004-02-06 17:27:21 by jwe]
jwe
parents: 4743
diff changeset
3549
5632
6e9a14b3c299 [project @ 2006-02-24 18:38:28 by jwe]
jwe
parents: 5608
diff changeset
3550 lhs.clear_index ();
6e9a14b3c299 [project @ 2006-02-24 18:38:28 by jwe]
jwe
parents: 5608
diff changeset
3551
5052
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3552 if (retval != 0)
5516
b957f4222249 [project @ 2005-10-27 18:02:24 by jwe]
jwe
parents: 5379
diff changeset
3553 lhs = lhs.reshape (final_lhs_dims);
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3554 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3555
5052
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3556 if (retval != 0)
c6ef19da4b24 [project @ 2004-10-19 18:40:48 by jwe]
jwe
parents: 5047
diff changeset
3557 lhs.chop_trailing_singletons ();
4757
c48180a45d34 [project @ 2004-02-13 22:13:52 by jwe]
jwe
parents: 4756
diff changeset
3558
4517
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3559 lhs.clear_index ();
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3560
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3561 return retval;
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3562 }
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3563
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3564 template <class T>
b4449b1193ac [project @ 2003-09-20 02:06:06 by jwe]
jwe
parents: 4513
diff changeset
3565 void
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3657
diff changeset
3566 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
3567 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3657
diff changeset
3568 os << prefix << "rep address: " << rep << "\n"
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3657
diff changeset
3569 << prefix << "rep->len: " << rep->len << "\n"
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3657
diff changeset
3570 << prefix << "rep->data: " << static_cast<void *> (rep->data) << "\n"
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3657
diff changeset
3571 << prefix << "rep->count: " << rep->count << "\n";
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
3572
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
3573 // 2D info:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
3574 //
4657
a585a2dfca6c [project @ 2003-11-25 01:30:09 by jwe]
jwe
parents: 4656
diff changeset
3575 // << pefix << "rows: " << rows () << "\n"
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4192
diff changeset
3576 // << prefix << "cols: " << cols () << "\n";
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3657
diff changeset
3577 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3657
diff changeset
3578
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
3579 /*
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
3580 ;;; Local Variables: ***
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
3581 ;;; mode: C++ ***
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
3582 ;;; End: ***
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
3583 */