Mercurial > octave

comparison liboctave/Array-util.cc @ 11586:12df7854fa7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip trailing whitespace from source files
author John W. Eaton <jwe@octave.org>
date Thu, 20 Jan 2011 17:24:59 -0500
parents a83bad07f7e3
children 72c96de7a403
comparison
equal deleted inserted replaced
11585:1473d0cf86d2 11586:12df7854fa7c
86 if (n > 0) 86 if (n > 0)
87 { 87 {
88 retval = idx(--n); 88 retval = idx(--n);
89 89
90 while (--n >= 0) 90 while (--n >= 0)
91 { 91 {
92 retval *= dims (n); 92 retval *= dims (n);
93 93
94 retval += idx(n); 94 retval += idx(n);
95 } 95 }
96 } 96 }
97 return retval; 97 return retval;
98 } 98 }
127 for (int i = 0; i < n; i ++) 127 for (int i = 0; i < n; i ++)
128 { 128 {
129 if (dim (i) != 1) 129 if (dim (i) != 1)
130 { 130 {
131 retval = false; 131 retval = false;
132 132
133 break; 133 break;
134 } 134 }
135 } 135 }
136 } 136 }
137 return retval; 137 return retval;
165 for (octave_idx_type i = 0; i < arr.length (); i++) 165 for (octave_idx_type i = 0; i < arr.length (); i++)
166 { 166 {
167 if (arr (i) == 1) 167 if (arr (i) == 1)
168 { 168 {
169 retval = true; 169 retval = true;
170 170
171 break; 171 break;
172 } 172 }
173 } 173 }
174 return retval; 174 return retval;
175 } 175 }
176 176
177 octave_idx_type 177 octave_idx_type
178 compute_index (octave_idx_type n, const dim_vector& dims) 178 compute_index (octave_idx_type n, const dim_vector& dims)
179 { 179 {
180 if (n < 0) 180 if (n < 0)
181 gripe_invalid_index (); 181 gripe_invalid_index ();
182 if (n >= dims.numel ()) 182 if (n >= dims.numel ())
183 gripe_index_out_of_range (1, 1, n+1, dims.numel ()); 183 gripe_index_out_of_range (1, 1, n+1, dims.numel ());
184 184
185 return n; 185 return n;
186 } 186 }
187 187
188 octave_idx_type 188 octave_idx_type
189 compute_index (octave_idx_type i, octave_idx_type j, const dim_vector& dims) 189 compute_index (octave_idx_type i, octave_idx_type j, const dim_vector& dims)
190 { 190 {
191 if (i < 0 || j < 0) 191 if (i < 0 || j < 0)
192 gripe_invalid_index (); 192 gripe_invalid_index ();
193 if (i >= dims(0)) 193 if (i >= dims(0))
196 gripe_index_out_of_range (2, 2, j+1, dims.numel (1)); 196 gripe_index_out_of_range (2, 2, j+1, dims.numel (1));
197 197
198 return j*dims(0) + i; 198 return j*dims(0) + i;
199 } 199 }
200 200
201 octave_idx_type 201 octave_idx_type
202 compute_index (octave_idx_type i, octave_idx_type j, octave_idx_type k, 202 compute_index (octave_idx_type i, octave_idx_type j, octave_idx_type k,
203 const dim_vector& dims) 203 const dim_vector& dims)
204 { 204 {
205 if (i < 0 || j < 0 || k < 0) 205 if (i < 0 || j < 0 || k < 0)
206 gripe_invalid_index (); 206 gripe_invalid_index ();
212 gripe_index_out_of_range (3, 3, k+1, dims.numel (2)); 212 gripe_index_out_of_range (3, 3, k+1, dims.numel (2));
213 213
214 return (k*dims(1) + j)*dims(0) + i; 214 return (k*dims(1) + j)*dims(0) + i;
215 } 215 }
216 216
217 octave_idx_type 217 octave_idx_type
218 compute_index (const Array<octave_idx_type>& ra_idx, const dim_vector& dims) 218 compute_index (const Array<octave_idx_type>& ra_idx, const dim_vector& dims)
219 { 219 {
220 int nd = ra_idx.length (); 220 int nd = ra_idx.length ();
221 const dim_vector dv = dims.redim (nd); 221 const dim_vector dv = dims.redim (nd);
222 for (int d = 0; d < nd; d++) 222 for (int d = 0; d < nd; d++)
426 { 426 {
427 int ial = ia.length (), rhdvl = rhdv.length (); 427 int ial = ia.length (), rhdvl = rhdv.length ();
428 dim_vector rdv = dim_vector::alloc (ial); 428 dim_vector rdv = dim_vector::alloc (ial);
429 bool *scalar = new bool[ial], *colon = new bool[ial]; 429 bool *scalar = new bool[ial], *colon = new bool[ial];
430 // Mark scalars and colons, count non-scalar indices. 430 // Mark scalars and colons, count non-scalar indices.
431 int nonsc = 0; 431 int nonsc = 0;
432 bool all_colons = true; 432 bool all_colons = true;
433 for (int i = 0; i < ial; i++) 433 for (int i = 0; i < ial; i++)
434 { 434 {
435 // FIXME -- should we check for length() instead? 435 // FIXME -- should we check for length() instead?
436 scalar[i] = ia(i).is_scalar (); 436 scalar[i] = ia(i).is_scalar ();