Mercurial > hg > octave-lyh
diff liboctave/Array-d.cc @ 7463:2467639bd8c0
eliminate UNDEFINED sort mode
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 08 Feb 2008 16:00:16 -0500 |
| parents | d98dea7d16b0 |
| children | 4976f66d469b |
line wrap: on
line diff
--- a/liboctave/Array-d.cc +++ b/liboctave/Array-d.cc @@ -107,6 +107,8 @@ lsort.set_compare (ascending_compare); else if (mode == DESCENDING) lsort.set_compare (descending_compare); + else + abort (); if (stride == 1) { @@ -133,7 +135,7 @@ if (lo_ieee_signbit (octave_NaN)) { - if (mode == UNDEFINED || mode == ASCENDING) + if (mode == ASCENDING) { octave_idx_type i = 0; double *vtmp = reinterpret_cast<double *> (p); @@ -194,7 +196,7 @@ if (lo_ieee_signbit (octave_NaN)) { - if (mode == UNDEFINED || mode == ASCENDING) + if (mode == ASCENDING) { octave_idx_type i = 0; while (xisnan (v[i++*stride + offset]) && i < ns); @@ -250,6 +252,8 @@ indexed_sort.set_compare (ascending_compare); else if (mode == DESCENDING) indexed_sort.set_compare (descending_compare); + else + abort (); OCTAVE_LOCAL_BUFFER (vec_index<uint64_t> *, vi, ns); OCTAVE_LOCAL_BUFFER (vec_index<uint64_t>, vix, ns); @@ -296,7 +300,7 @@ if (lo_ieee_signbit (octave_NaN)) { - if (mode == UNDEFINED || mode == ASCENDING) + if (mode == ASCENDING) { octave_idx_type i = 0; while (xisnan (v[i++*stride+offset]) && i < ns);