comparison liboctave/Array.cc @ 5535:6a82af824269

[project @ 2005-11-11 18:20:25 by jwe]
author jwe
date Fri, 11 Nov 2005 18:20:25 +0000
parents 20b20fd070b0
children 4b33d802ef3c
comparison
equal deleted inserted replaced
5534:e107161b8ca3 5535:6a82af824269
2219 2219
2220 retval.resize (result_dims); 2220 retval.resize (result_dims);
2221 2221
2222 octave_idx_type n = result_dims.numel (); 2222 octave_idx_type n = result_dims.numel ();
2223 2223
2224 int r_dims = result_dims.length ();
2225
2226 Array<octave_idx_type> iidx (r_dims, 0);
2227
2228 octave_idx_type k = 0; 2224 octave_idx_type k = 0;
2229 2225
2230 for (octave_idx_type i = 0; i < n; i++) 2226 for (octave_idx_type i = 0; i < n; i++)
2231 { 2227 {
2232 octave_idx_type ii = ra_idx.elem (k++); 2228 octave_idx_type ii = ra_idx.elem (k++);
2233 2229
2234 if (ii >= orig_len) 2230 if (ii >= orig_len)
2235 retval.elem (iidx) = rfv; 2231 retval.elem (i) = rfv;
2236 else 2232 else
2237 { 2233 retval.elem (i) = elem (ii);
2238 Array<int> temp = get_ra_idx (ii, dv);
2239
2240 retval.elem (iidx) = elem (temp);
2241 }
2242 if (i != n - 1)
2243 increment_index (iidx, result_dims);
2244 } 2234 }
2245 } 2235 }
2246 } 2236 }
2247 2237
2248 return retval; 2238 return retval;