# HG changeset patch # User Jaroslav Hajek # Date 1265705059 -3600 # Node ID c9780d8e228cecdfc0f1b67ed7ca485b300f2f56 # Parent 30078b201a2c9e5e630baeeb7b6a962598533c98 fix invalid checks in amd functions diff -r 30078b201a2c -r c9780d8e228c src/ChangeLog --- a/src/ChangeLog Tue Feb 09 07:41:22 2010 +0100 +++ b/src/ChangeLog Tue Feb 09 09:44:19 2010 +0100 @@ -1,3 +1,9 @@ +2010-02-09 Jaroslav Hajek + + * DLD-FUNCTIONS/colamd.cc (Fcolamd, Fsymamd, Fetree): Fix improper arg + checks. + * DLD-FUNCTIONS/ccolamd.cc (Fccolamd, Fcsymamd): Likewise. + 2010-02-08 Jaroslav Hajek * ov-re-mat.cc (octave_matrix::sort): Special-case sorting a known diff -r 30078b201a2c -r c9780d8e228c src/DLD-FUNCTIONS/ccolamd.cc --- a/src/DLD-FUNCTIONS/ccolamd.cc Tue Feb 09 07:41:22 2010 +0100 +++ b/src/DLD-FUNCTIONS/ccolamd.cc Tue Feb 09 09:44:19 2010 +0100 @@ -145,7 +145,7 @@ int nargin = args.length (); int spumoni = 0; - if (nargout < 0 || nargout > 2 || nargin < 0 || nargin > 3) + if (nargout > 2 || nargin < 1 || nargin > 3) usage ("ccolamd: incorrect number of input and/or output arguments"); else { @@ -400,7 +400,7 @@ int nargin = args.length (); int spumoni = 0; - if (nargout < 0 || nargout > 2 || nargin < 0 || nargin > 3) + if (nargout > 2 || nargin < 1 || nargin > 3) usage ("ccolamd: incorrect number of input and/or output arguments"); else { diff -r 30078b201a2c -r c9780d8e228c src/DLD-FUNCTIONS/colamd.cc --- a/src/DLD-FUNCTIONS/colamd.cc Tue Feb 09 07:41:22 2010 +0100 +++ b/src/DLD-FUNCTIONS/colamd.cc Tue Feb 09 09:44:19 2010 +0100 @@ -283,7 +283,7 @@ int nargin = args.length (); int spumoni = 0; - if (nargout < 0 || nargout > 2 || nargin < 0 || nargin > 2) + if (nargout > 2 || nargin < 1 || nargin > 2) print_usage (); else { @@ -519,7 +519,7 @@ int nargin = args.length (); int spumoni = 0; - if (nargout < 0 || nargout > 2 || nargin < 0 || nargin > 2) + if (nargout > 2 || nargin < 1 || nargin > 2) print_usage (); else { @@ -664,7 +664,7 @@ int nargin = args.length (); - if (nargout < 0 || nargout > 2 || nargin < 0 || nargin > 2) + if (nargout > 2 || nargin < 1 || nargin > 2) print_usage (); else {