Mercurial > octave
diff src/fsolve.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 | e81d3a66725e |
line wrap: on
line diff
--- a/src/fsolve.cc Sun Sep 18 23:34:35 1994 +0000 +++ b/src/fsolve.cc Mon Sep 19 14:18:48 1994 +0000 @@ -84,10 +84,8 @@ int n = x.capacity (); -// tree_constant name = fsolve_fcn->name (); Octave_object args; - args.resize (2); -// args(0) = name; + args.resize (1); if (n > 1) { @@ -95,13 +93,13 @@ for (int i = 0; i < n; i++) m (i, 0) = x.elem (i); tree_constant vars (m); - args(1) = vars; + args(0) = vars; } else { double d = x.elem (0); tree_constant vars (d); - args(1) = vars; + args(0) = vars; } if (fsolve_fcn) @@ -137,17 +135,17 @@ int nargin = args.length (); - if (nargin < 3 || nargin > 7 || nargout > 3) + if (nargin < 2 || nargin > 6 || nargout > 3) { print_usage ("fsolve"); return retval; } - fsolve_fcn = is_valid_function (args(1), "fsolve", 1); + fsolve_fcn = is_valid_function (args(0), "fsolve", 1); if (! fsolve_fcn || takes_correct_nargs (fsolve_fcn, 2, "fsolve", 1) != 1) return retval; - ColumnVector x = args(2).vector_value (); + ColumnVector x = args(1).vector_value (); if (error_state) { @@ -155,7 +153,7 @@ return retval; } - if (nargin > 3) + if (nargin > 2) warning ("fsolve: ignoring extra arguments"); if (nargout > 2) @@ -271,18 +269,18 @@ int nargin = args.length (); - if (nargin == 1) + if (nargin == 0) { print_fsolve_option_list (); return retval; } - else if (nargin == 3) + else if (nargin == 2) { - char *keyword = args(1).string_value (); + char *keyword = args(0).string_value (); if (! error_state) { - double val = args(2).double_value (); + double val = args(1).double_value (); if (! error_state) {