Mercurial > octave-nkf
changeset 6240:3e5a3b5fd40e
[project @ 2007-01-11 07:32:12 by jwe]
| author | jwe |
|---|---|
| date | Thu, 11 Jan 2007 07:32:13 +0000 |
| parents | 82185e38eea8 |
| children | b84b59b614c5 |
| files | scripts/ChangeLog scripts/set/ismember.m src/ChangeLog src/ls-oct-binary.cc |
| diffstat | 4 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Wed Jan 10 22:53:59 2007 +0000 +++ b/scripts/ChangeLog Thu Jan 11 07:32:13 2007 +0000 @@ -1,3 +1,7 @@ +2007-01-10 Baylis Shanks <bshanks3@hotmail.com> + + * set/ismember.m: Handle N-d arrays. + 2007-01-10 David Bateman <dbateman@free.fr> * elfun/acosd.m, elfun/acotd.m, elfun/acscd.m, elfun/asecd.m,
--- a/scripts/set/ismember.m Wed Jan 10 22:53:59 2007 +0000 +++ b/scripts/set/ismember.m Thu Jan 11 07:32:13 2007 +0000 @@ -33,9 +33,8 @@ print_usage (); endif - [ra, ca] = size (a); if (isempty (a) || isempty (S)) - c = zeros (ra, ca); + c = zeros (size (a)); else if (iscell (a) && ! iscell (S)) tmp{1} = S; @@ -96,7 +95,7 @@ ## preserves the relative order of identical elements. [v, p] = sort ([S(2:lt); a(:)]); idx(p) = cumsum (p <= lt-1) + 1; - idx = idx(lt:lt+ra*ca-1); + idx = idx(lt:end); if (iscell (a) || iscell (S)) c = (cellfun ("length", a) == reshape (cellfun ("length", S(idx)), size (a)));
--- a/src/ChangeLog Wed Jan 10 22:53:59 2007 +0000 +++ b/src/ChangeLog Thu Jan 11 07:32:13 2007 +0000 @@ -1,3 +1,8 @@ +2007-01-11 Michael Goffioul <michael.goffioul@swing.be> + + * ls-oct-binary.cc (read_binary_data): Use unsigned char, not + char, for reading flags and data types. + 2007-01-10 Luis F. Ortiz <lortiz@interactivesupercomputing.com> * parse.y (load_fcn_from_file): Delete unused variable NAMES.