Mercurial > hg > octave-lyh

comparison liboctave/Array-util.cc @ 11570:57632dea2446

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
attempt better backward compatibility for Array constructors
author John W. Eaton <jwe@octave.org>
date Wed, 19 Jan 2011 17:55:56 -0500
parents fd0a3ac60b0e
children a83bad07f7e3
comparison
equal deleted inserted replaced
11569:7e9a111cae20 11570:57632dea2446
242 } 242 }
243 243
244 Array<idx_vector> 244 Array<idx_vector>
245 conv_to_array (const idx_vector *tmp, const octave_idx_type len) 245 conv_to_array (const idx_vector *tmp, const octave_idx_type len)
246 { 246 {
247 Array<idx_vector> retval (len, 1); 247 Array<idx_vector> retval (dim_vector (len, 1));
248 248
249 for (octave_idx_type i = 0; i < len; i++) 249 for (octave_idx_type i = 0; i < len; i++)
250 retval (i) = tmp[i]; 250 retval (i) = tmp[i];
251 251
252 return retval; 252 return retval;
376 get_elt_idx (const Array<idx_vector>& ra_idx, 376 get_elt_idx (const Array<idx_vector>& ra_idx,
377 const Array<octave_idx_type>& result_idx) 377 const Array<octave_idx_type>& result_idx)
378 { 378 {
379 octave_idx_type n = ra_idx.length (); 379 octave_idx_type n = ra_idx.length ();
380 380
381 Array<octave_idx_type> retval (n, 1); 381 Array<octave_idx_type> retval (dim_vector (n, 1));
382 382
383 for (octave_idx_type i = 0; i < n; i++) 383 for (octave_idx_type i = 0; i < n; i++)
384 retval(i) = ra_idx(i).elem (result_idx(i)); 384 retval(i) = ra_idx(i).elem (result_idx(i));
385 385
386 return retval; 386 return retval;
597 597
598 Array<idx_vector> 598 Array<idx_vector>
599 ind2sub (const dim_vector& dv, const idx_vector& idx) 599 ind2sub (const dim_vector& dv, const idx_vector& idx)
600 { 600 {
601 octave_idx_type len = idx.length (0), n = dv.length (); 601 octave_idx_type len = idx.length (0), n = dv.length ();
602 Array<idx_vector> retval(n, 1); 602 Array<idx_vector> retval (dim_vector (n, 1));
603 octave_idx_type numel = dv.numel (); 603 octave_idx_type numel = dv.numel ();
604 604
605 if (idx.extent (numel) > numel) 605 if (idx.extent (numel) > numel)
606 current_liboctave_error_handler ("ind2sub: index out of range"); 606 current_liboctave_error_handler ("ind2sub: index out of range");
607 else 607 else