Mercurial > hg > octave-lyh
changeset 5366:4229d6801f23
[project @ 2005-05-23 20:08:39 by jwe]
| author | jwe |
|---|---|
| date | Mon, 23 May 2005 20:08:39 +0000 |
| parents | c9c773d8333f |
| children | 7e1347e6712e |
| files | scripts/ChangeLog src/ChangeLog src/DLD-FUNCTIONS/sort.cc |
| diffstat | 3 files changed, 32 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,17 @@ +2005-05-23 John W. Eaton <jwe@octave.org> + + * plot/orient.m: New file. Adapt to Octave coding style. + Texinfoize doc string. + + * plot/print.m: New file. Adapt to Octave coding style. Include + PKG_ADD command. Use set terminal consistently throughout. Use + set terminal push/pop and unconditionally set output to screen + when done to avoid requiring gget. Use a cell array for dev_list + and cellidx to search for items in the list. Delete local + variable endl. Don't set and restore automatic_replot. Use {} + instead of nth to index varargin. Delete local variable + va_arg_cnt. + 2005-05-18 John W. Eaton <jwe@octave.org> * general/num2str.m: Return early if X is a character string.
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,11 @@ 2005-05-23 John W. Eaton <jwe@octave.org> + * DLD-FUNCTIONS/sort.cc (mx_sort, mx_sort_indexed): Return + appropriately sized empty values for empty args. + * debug.cc (Fdbwhere, get_user_function): Look at curr_caller_function, not curr_function, since function is now set - inside mapper, built-in (and thereford dld) functions too. + inside mapper, built-in (and therefore dld) functions too. 2005-05-21 John W. Eaton <jwe@octave.org>
--- a/src/DLD-FUNCTIONS/sort.cc +++ b/src/DLD-FUNCTIONS/sort.cc @@ -86,10 +86,11 @@ { octave_value retval; + dim_vector dv = m.dims (); + if (m.length () < 1) - return ArrayN<T> (); + return ArrayN<T> (dv); - dim_vector dv = m.dims (); octave_idx_type ns = dv(dim); octave_idx_type iter = dv.numel () / ns; octave_idx_type stride = 1; @@ -147,14 +148,15 @@ { octave_value_list retval; + dim_vector dv = m.dims (); + if (m.length () < 1) { - retval(1) = NDArray (); - retval(0) = ArrayN<T> (); + retval(1) = NDArray (dv); + retval(0) = ArrayN<T> (dv); return retval; } - dim_vector dv = m.dims (); octave_idx_type ns = dv(dim); octave_idx_type iter = dv.numel () / ns; octave_idx_type stride = 1; @@ -299,10 +301,11 @@ { octave_value retval; + dim_vector dv = m.dims (); + if (m.length () < 1) - return ArrayN<double> (); + return ArrayN<double> (dv); - dim_vector dv = m.dims (); octave_idx_type ns = dv(dim); octave_idx_type iter = dv.numel () / ns; octave_idx_type stride = 1; @@ -436,14 +439,15 @@ { octave_value_list retval; + dim_vector dv = m.dims (); + if (m.length () < 1) { - retval(1) = ArrayN<double> (); - retval(0) = NDArray (); + retval(1) = ArrayN<double> (dv); + retval(0) = NDArray (dv); return retval; } - dim_vector dv = m.dims (); octave_idx_type ns = dv(dim); octave_idx_type iter = dv.numel () / ns; octave_idx_type stride = 1;