Mercurial > hg > octave-lyh

comparison src/data.cc @ 10703:5eb420d92307

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix sort and nth_element when trailing singleton dim is specified
author Jaroslav Hajek <highegg@gmail.com>
date Mon, 14 Jun 2010 14:53:11 +0200
parents 701b969db6a3
children 69c5f5ec55d7
comparison
equal deleted inserted replaced
10702:c49911ab7ac7 10703:5eb420d92307
5326 // Find first non singleton dimension 5326 // Find first non singleton dimension
5327 dim = dv.first_non_singleton (); 5327 dim = dv.first_non_singleton ();
5328 } 5328 }
5329 else 5329 else
5330 { 5330 {
5331 if (dim < 0 || dim > dv.length () - 1) 5331 if (dim < 0)
5332 { 5332 {
5333 error ("sort: dim must be a valid dimension"); 5333 error ("sort: dim must be a valid dimension");
5334 return retval; 5334 return retval;
5335 } 5335 }
5336 } 5336 }
5738 5738
5739 int dim = -1; 5739 int dim = -1;
5740 if (nargin == 3) 5740 if (nargin == 3)
5741 { 5741 {
5742 dim = args(2).int_value (true) - 1; 5742 dim = args(2).int_value (true) - 1;
5743 if (dim < 0 || dim >= argx.ndims ()) 5743 if (dim < 0)
5744 error ("nth_element: dim must be a valid dimension"); 5744 error ("nth_element: dim must be a valid dimension");
5745 } 5745 }
5746 if (dim < 0) 5746 if (dim < 0)
5747 dim = argx.dims ().first_non_singleton (); 5747 dim = argx.dims ().first_non_singleton ();
5748 5748