Mercurial > octave
diff src/minmax.cc @ 712:36ba0576bd1b
[project @ 1994-09-19 14:18:15 by jwe]
author | jwe |
---|---|
date | Mon, 19 Sep 1994 14:18:48 +0000 |
parents | 0a81458ef677 |
children | a2f9d3fd720c |
line wrap: on
line diff
--- a/src/minmax.cc Sun Sep 18 23:34:35 1994 +0000 +++ b/src/minmax.cc Mon Sep 19 14:18:48 1994 +0000 @@ -150,7 +150,7 @@ int nargin = args.length (); - if (nargin == 1 || nargin > 3 || nargout > 2) + if (nargin < 1 || nargin > 2 || nargout > 2) { print_usage ("min"); return retval; @@ -161,18 +161,18 @@ switch (nargin) { - case 3: - arg2 = args(2); + case 2: + arg2 = args(1); // Fall through... - case 2: - arg1 = args(1); + case 1: + arg1 = args(0); break; default: panic_impossible (); break; } - if (nargin == 2 && (nargout == 1 || nargout == 0)) + if (nargin == 1 && (nargout == 1 || nargout == 0)) { if (arg1.is_real_scalar ()) { @@ -212,7 +212,7 @@ return retval; } } - else if (nargin == 2 && nargout == 2) + else if (nargin == 1 && nargout == 2) { if (arg1.is_real_scalar ()) { @@ -266,7 +266,7 @@ return retval; } } - else if (nargin == 3) + else if (nargin == 2) { if (arg1.rows () == arg2.rows () && arg1.columns () == arg2.columns ()) @@ -325,7 +325,7 @@ int nargin = args.length (); - if (nargin == 1 || nargin > 3 || nargout > 2) + if (nargin < 1 || nargin > 2 || nargout > 2) { print_usage ("max"); return retval; @@ -336,18 +336,18 @@ switch (nargin) { - case 3: - arg2 = args(2); + case 2: + arg2 = args(1); // Fall through... - case 2: - arg1 = args(1); + case 1: + arg1 = args(0); break; default: panic_impossible (); break; } - if (nargin == 2 && (nargout == 1 || nargout == 0)) + if (nargin == 1 && (nargout == 1 || nargout == 0)) { if (arg1.is_real_scalar ()) { @@ -379,7 +379,7 @@ return retval; } } - else if (nargin == 2 && nargout == 2) + else if (nargin == 1 && nargout == 2) { if (arg1.is_real_scalar ()) { @@ -425,7 +425,7 @@ return retval; } } - else if (nargin == 3) + else if (nargin == 2) { if (arg1.rows () == arg2.rows () && arg1.columns () == arg2.columns ())