[Octave-cvsupdate] SF.net SVN: octave:[10554] trunk/octave-forge/main/optim/inst/fminsearch.m

[<par...@us...>]

Revision: 10554
          http://octave.svn.sourceforge.net/octave/?rev=10554&view=rev
Author:   paramaniac
Date:     2012-06-02 07:31:35 +0000 (Sat, 02 Jun 2012)
Log Message:
-----------
optim: use the same argument names as matlab

Modified Paths:
--------------
    trunk/octave-forge/main/optim/inst/fminsearch.m

Modified: trunk/octave-forge/main/optim/inst/fminsearch.m
===================================================================
--- trunk/octave-forge/main/optim/inst/fminsearch.m	2012-06-02 07:16:53 UTC (rev 10553)
+++ trunk/octave-forge/main/optim/inst/fminsearch.m	2012-06-02 07:31:35 UTC (rev 10554)
@@ -14,8 +14,8 @@
 ## this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} {@var{x} =} fminsearch (@var{f}, @var{x0})
-## @deftypefnx {Function File} {[@var{x}, @var{fval}] =} fminsearch (@var{f}, @var{x0}, @var{options}, @var{grad}, @var{P1}, @var{P2}, @dots{})
+## @deftypefn {Function File} {@var{x} =} fminsearch (@var{fun}, @var{x0})
+## @deftypefnx {Function File} {[@var{x}, @var{fval}] =} fminsearch (@var{fun}, @var{x0}, @var{options}, @var{grad}, @var{P1}, @var{P2}, @dots{})
 ##
 ## Find the minimum of a funtion of several variables.
 ## By default the method used is the Nelder&Mead Simplex algorithm.
@@ -24,13 +24,13 @@
 
 ## TODO: describe arguments in texinfo help string
 
-function [x, fval] = fminsearch (funfun, x0, options = [], grad = [], varargin)
+function [x, fval] = fminsearch (fun, x0, options = [], grad = [], varargin)
 
   if (nargin < 2)
     print_usage ();
   endif
 
-  x = fmins (funfun, x0, options, grad, varargin{:});
-  fval = feval (funfun, x, varargin{:});
+  x = fmins (fun, x0, options, grad, varargin{:});
+  fval = feval (fun, x, varargin{:});
 
-endfunction;
+endfunction

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.