octave-nkf: scripts/set/intersect.m annotate

annotate scripts/set/intersect.m @ 14148:402acc45350e stable

intersect.m: Properly handle the "rows" case with more than 1 output arg (bug #35247)

author	Jordi Gutiérrez Hermoso <jordigh@octave.org>
date	Thu, 05 Jan 2012 10:27:34 -0500
parents	72c96de7a403
children	f3d52523cde1

rev	line source
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1 ## Copyright (C) 2000-2012 Paul Kienzle
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	2 ## Copyright (C) 2008-2009 Jaroslav Hajek
5820 27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	3 ##
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	4 ## This file is part of Octave.
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	5 ##
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	6 ## Octave is free software; you can redistribute it and/or modify it
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	7 ## under the terms of the GNU General Public License as published by
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6825 diff changeset	8 ## the Free Software Foundation; either version 3 of the License, or (at
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6825 diff changeset	9 ## your option) any later version.
5820 27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	10 ##
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	11 ## Octave is distributed in the hope that it will be useful, but
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	12 ## WITHOUT ANY WARRANTY; without even the implied warranty of
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	13 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	14 ## General Public License for more details.
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	15 ##
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	16 ## You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6825 diff changeset	17 ## along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6825 diff changeset	18 ## <http://www.gnu.org/licenses/>.
5820 27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	19
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	20 ## -- texinfo --
10793 be55736a0783 Grammarcheck the documentation from m-files. Rik <octave@nomad.inbox5.com> parents: 10549 diff changeset	21 ## @deftypefn {Function File} {} intersect (@var{a}, @var{b})
6248 7fad1fad19e1 [project @ 2007-01-22 17:28:17 by jwe] jwe parents: 6046 diff changeset	22 ## @deftypefnx {Function File} {[@var{c}, @var{ia}, @var{ib}] =} intersect (@var{a}, @var{b})
5820 27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	23 ##
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	24 ## Return the elements in both @var{a} and @var{b}, sorted in ascending
9051 1bf0ce0930be Grammar check TexInfo in all .m files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	25 ## order. If @var{a} and @var{b} are both column vectors return a column
5820 27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	26 ## vector, otherwise return a row vector.
10088 5edee330d4cb better argument checking and handling in set functions Jaroslav Hajek <highegg@gmail.com> parents: 9115 diff changeset	27 ## @var{a}, @var{b} may be cell arrays of string(s).
5820 27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	28 ##
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	29 ## Return index vectors @var{ia} and @var{ib} such that @code{a(ia)==c} and
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	30 ## @code{b(ib)==c}.
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	31 ##
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	32 ## @end deftypefn
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	33 ## @seealso{unique, union, setxor, setdiff, ismember}
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	34
7920 e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	35 function [c, ia, ib] = intersect (a, b, varargin)
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	36
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	37 if (nargin < 2 \|\| nargin > 3)
6046 34f96dd5441b [project @ 2006-10-10 16:10:25 by jwe] jwe parents: 5821 diff changeset	38 print_usage ();
5820 27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	39 endif
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	40
10088 5edee330d4cb better argument checking and handling in set functions Jaroslav Hajek <highegg@gmail.com> parents: 9115 diff changeset	41 [a, b] = validargs ("intersect", a, b, varargin{:});
7920 e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	42
5820 27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	43 if (isempty (a) \|\| isempty (b))
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	44 c = ia = ib = [];
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	45 else
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	46 ## form a and b into sets
7920 e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	47 if (nargout > 1)
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	48 [a, ja] = unique (a, varargin{:});
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	49 [b, jb] = unique (b, varargin{:});
9108 b2459d21a207 fix intersect bug Jaroslav Hajek <highegg@gmail.com> parents: 9051 diff changeset	50 else
b2459d21a207 fix intersect bug Jaroslav Hajek <highegg@gmail.com> parents: 9051 diff changeset	51 a = unique (a, varargin{:});
b2459d21a207 fix intersect bug Jaroslav Hajek <highegg@gmail.com> parents: 9051 diff changeset	52 b = unique (b, varargin{:});
6825 59e22e30aff8 [project @ 2007-08-24 15:36:49 by jwe] jwe parents: 6248 diff changeset	53 endif
5820 27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	54
7920 e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	55 if (nargin > 2)
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	56 c = [a; b];
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	57 [c, ic] = sortrows (c);
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	58 ii = find (all (c(1:end-1,:) == c(2:end,:), 2));
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	59 c = c(ii,:);
14148 402acc45350e intersect.m: Properly handle the "rows" case with more than 1 output arg (bug #35247) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	60 len_a = rows (a);
7920 e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	61 else
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	62 c = [a(:); b(:)];
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	63 [c, ic] = sort (c); ## [a(:);b(:)](ic) == c
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	64 if (iscellstr (c))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10088 diff changeset	65 ii = find (strcmp (c(1:end-1), c(2:end)));
7920 e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	66 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10088 diff changeset	67 ii = find (c(1:end-1) == c(2:end));
7920 e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	68 endif
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	69 c = c(ii);
14148 402acc45350e intersect.m: Properly handle the "rows" case with more than 1 output arg (bug #35247) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	70 len_a = length (a);
7920 e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	71 endif
5820 27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	72
7920 e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	73 if (nargout > 1)
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	74 ia = ja(ic(ii)); ## a(ia) == c
14148 402acc45350e intersect.m: Properly handle the "rows" case with more than 1 output arg (bug #35247) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	75 ib = jb(ic(ii+1) - len_a); ## b(ib) == c
7920 e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	76 endif
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	77
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	78 if (nargin == 2 && (size (b, 1) == 1 \|\| size (a, 1) == 1))
5820 27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	79 c = c.';
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	80 endif
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	81 endif
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	82
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	83 endfunction
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	84
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	85
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	86 %!# Test the routine for index vectors ia and ib
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	87 %!test
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	88 %! a = [3 2 4 5 7 6 5 1 0 13 13];
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	89 %! b = [3 5 12 1 1 7];
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	90 %! [c,ia,ib] = intersect(a,b);
8507 cadc73247d65 style fixes John W. Eaton <jwe@octave.org> parents: 7920 diff changeset	91 %! assert(c,[1 3 5 7]);
5820 27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	92 %! assert(ia,[8 1 7 5]);
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	93 %! assert(ib,[5 1 2 6]);
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	94 %! assert(a(ia),c);
27c966e4b2dc [project @ 2006-05-17 21:00:54 by jwe] jwe parents: diff changeset	95 %! assert(b(ib),c);
7920 e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	96 %!test
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	97 %! a = [1,1,2;1,4,5;2,1,7];
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	98 %! b = [1,4,5;2,3,4;1,1,2;9,8,7];
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	99 %! [c,ia,ib] = intersect(a,b,'rows');
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	100 %! assert(c,[1,1,2;1,4,5]);
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	101 %! assert(ia,[1;2]);
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	102 %! assert(ib,[3;1]);
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	103 %! assert(a(ia,:),c);
e56bb65186f6 improve set functions for Matlab compatibility Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	104 %! assert(b(ib,:),c);
9115 ef95b930f1cf Add test for bugfix b2459d21a207 Thomas Weber <thomas.weber.mail@gmail.com> parents: 9108 diff changeset	105 %!test
ef95b930f1cf Add test for bugfix b2459d21a207 Thomas Weber <thomas.weber.mail@gmail.com> parents: 9108 diff changeset	106 %! a = [1 1 1 2 2 2];
ef95b930f1cf Add test for bugfix b2459d21a207 Thomas Weber <thomas.weber.mail@gmail.com> parents: 9108 diff changeset	107 %! b = [1 2 3 4 5 6];
ef95b930f1cf Add test for bugfix b2459d21a207 Thomas Weber <thomas.weber.mail@gmail.com> parents: 9108 diff changeset	108 %! c = intersect(a,b);
ef95b930f1cf Add test for bugfix b2459d21a207 Thomas Weber <thomas.weber.mail@gmail.com> parents: 9108 diff changeset	109 %! assert(c, [1,2]);
14148 402acc45350e intersect.m: Properly handle the "rows" case with more than 1 output arg (bug #35247) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	110 %!test
402acc45350e intersect.m: Properly handle the "rows" case with more than 1 output arg (bug #35247) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	111 %! a = [1 2 3 4; 5 6 7 8; 9 10 11 12];
402acc45350e intersect.m: Properly handle the "rows" case with more than 1 output arg (bug #35247) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	112 %! [b, ia, ib] = intersect(a, a, "rows");
402acc45350e intersect.m: Properly handle the "rows" case with more than 1 output arg (bug #35247) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	113 %! assert(b, a);
402acc45350e intersect.m: Properly handle the "rows" case with more than 1 output arg (bug #35247) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	114 %! assert(ia, [1:3]');
402acc45350e intersect.m: Properly handle the "rows" case with more than 1 output arg (bug #35247) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	115 %! assert(ib, [1:3]');

Mercurial > octave-nkf

annotate scripts/set/intersect.m @ 14148:402acc45350e stable