Mercurial > octave
diff scripts/set/ismember.m @ 7652:b5731e43283a
ismember: correctly size idx output for empty args
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 26 Mar 2008 23:01:16 -0400 |
parents | 363ffc8a5c80 |
children | 3092dd54ad95 72830070a17b |
line wrap: on
line diff
--- a/scripts/set/ismember.m Wed Mar 26 22:09:42 2008 -0400 +++ b/scripts/set/ismember.m Wed Mar 26 23:01:16 2008 -0400 @@ -119,7 +119,7 @@ ## Do the actual work. if (isempty (a) || isempty (s)) tf = zeros (size (a), "logical"); - a_idx = []; + a_idx = zeros (size (a)); elseif (numel (s) == 1) tf = (a == s); a_idx = double (tf); @@ -165,12 +165,12 @@ [v, p] = sort ([s(2:lt)(:); a(:)]); idx(p) = cumsum (p <= lt-1) + 1; idx = idx(lt:end); - tf = (a == reshape (s (idx), size (a))); - a_idx = zeros (size(tf)); + tf = (a == reshape (s(idx), size (a))); + a_idx = zeros (size (tf)); a_idx(tf) = sidx(idx(tf)); endif ## Resize result to the original size of 'a' - size_a = size(a); + size_a = size (a); tf = reshape (tf, size_a); a_idx = reshape (a_idx, size_a); endif @@ -200,7 +200,7 @@ ## Do the actual work if (isempty (a) || isempty (s)) tf = zeros (size (a), "logical"); - a_idx = []; + a_idx = zeros (size (a)); elseif (numel (s) == 1) tf = strcmp (a, s); a_idx = double (tf); @@ -257,6 +257,36 @@ %!assert (ismember ("1", "0123456789."), true); %!test +%! [result, a_idx] = ismember ([1, 2], []); +%! assert (result, logical ([0, 0])) +%! assert (a_idx, [0, 0]); + +%!test +%! [result, a_idx] = ismember ([], [1, 2]); +%! assert (result, logical ([])) +%! assert (a_idx, []); + +%!test +%! [result, a_idx] = ismember ({'a', 'b'}, ''); +%! assert (result, logical ([0, 0])) +%! assert (a_idx, [0, 0]); + +%!test +%! [result, a_idx] = ismember ({'a', 'b'}, {}); +%! assert (result, logical ([0, 0])) +%! assert (a_idx, [0, 0]); + +%!test +%! [result, a_idx] = ismember ('', {'a', 'b'}); +%! assert (result, false) +%! assert (a_idx, 0); + +%!test +%! [result, a_idx] = ismember ({}, {'a', 'b'}); +%! assert (result, logical ([])) +%! assert (a_idx, []); + +%!test %! [result, a_idx] = ismember([1 2 3 4 5], [3]); %! assert (all (result == logical ([0 0 1 0 0])) && all (a_idx == [0 0 1 0 0]));