[Octave-cvsupdate] SF.net SVN: octave:[6913] trunk/octave-forge/main/optim

[<i7...@us...>]

Revision: 6913
          http://octave.svn.sourceforge.net/octave/?rev=6913&view=rev
Author:   i7tiol
Date:     2010-02-17 14:27:06 +0000 (Wed, 17 Feb 2010)

Log Message:
-----------
optim: some helptext corrections

Modified Paths:
--------------
    trunk/octave-forge/main/optim/DESCRIPTION
    trunk/octave-forge/main/optim/INDEX
    trunk/octave-forge/main/optim/inst/__poly_2_extrema.m
    trunk/octave-forge/main/optim/inst/cg_min.m
    trunk/octave-forge/main/optim/inst/cg_min_example_1.m
    trunk/octave-forge/main/optim/inst/fmin.m

Modified: trunk/octave-forge/main/optim/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/optim/DESCRIPTION	2010-02-17 13:17:01 UTC (rev 6912)
+++ trunk/octave-forge/main/optim/DESCRIPTION	2010-02-17 14:27:06 UTC (rev 6913)
@@ -1,5 +1,5 @@
 Name: Optim
-Version: 1.0.9
+Version: 1.0.10
 Date: 2009-09-21
 Author: Various Authors
 Maintainer: The Octave Community

Modified: trunk/octave-forge/main/optim/INDEX
===================================================================
--- trunk/octave-forge/main/optim/INDEX	2010-02-17 13:17:01 UTC (rev 6912)
+++ trunk/octave-forge/main/optim/INDEX	2010-02-17 14:27:06 UTC (rev 6913)
@@ -16,16 +16,13 @@
  wpolyfit wpolyfitdemo 
  leasqr leasqrdemo
  LinearRegression
-Root finding
- fzero 
- fsolve fsolve_options
 Compatibility
- fminunc
+ fminunc_compat
  optimset
  quadprog= try Yinyu Ye's <a href="http://dollar.biz.uiowa.edu/col/ye/matlab.html">code</a>
  linprog
 Numerical derivatives
- dfdp bs_gradient cdiff deriv leval
+ dfdp cdiff deriv leval
  numgradient numhessian
 Tests
   test_min_1 test_min_2 test_min_3 test_min_4
@@ -36,4 +33,4 @@
  bfgsmin_example
  rosenbrock
  samin_example
-  cg_min_test_1 cg_min_test_2 cg_min_test_3
+ cg_min_example_1 cg_min_example_2 cg_min_example_3

Modified: trunk/octave-forge/main/optim/inst/__poly_2_extrema.m
===================================================================
--- trunk/octave-forge/main/optim/inst/__poly_2_extrema.m	2010-02-17 13:17:01 UTC (rev 6912)
+++ trunk/octave-forge/main/optim/inst/__poly_2_extrema.m	2010-02-17 14:27:06 UTC (rev 6913)
@@ -8,7 +8,7 @@
 ## Assuming that f(i) = a*l(i)^2 + b* l(i) + c = P(l(i)) for some a, b, c,
 ## ex is the extremum of the polynome P.
 ##
-function ex = __poly_2_ex (l, f)
+function ex = __poly_2_extrema (l, f)
 
 
 ### This somewhat helps if solution is very close to one of the points.

Modified: trunk/octave-forge/main/optim/inst/cg_min.m
===================================================================
--- trunk/octave-forge/main/optim/inst/cg_min.m	2010-02-17 13:17:01 UTC (rev 6912)
+++ trunk/octave-forge/main/optim/inst/cg_min.m	2010-02-17 14:27:06 UTC (rev 6913)
@@ -26,7 +26,7 @@
 ## where Deltaf is the decrease in f observed in the last iteration
 ## (each iteration consists R*C line searches).
 ## @item @var{ctl}(1)==2    : Stopping criterion : Stop search when updates are small,
-## as tested by @math{ ctl(2) > max { dx(i)/max(|x(i)|,1) | i in 1..N }}
+## as tested by @math{ ctl(2) > max @{ dx(i)/max(|x(i)|,1) | i in 1..N @}}
 ## where  dx is the change in the x that occured in the last iteration.
 ## @item @var{ctl}(2)       : Threshold used in stopping tests.           Default=10*eps
 ## @item @var{ctl}(2)==0    : Default value
@@ -44,7 +44,7 @@
 ## not passed or if nan values are given.
 ## @subheading Example:
 ##
-## function r=df( l )  b=[1;0;-1]; r = -( 2*l@{1@} - 2*b + rand(size(l{1}))); endfunction @*
+## function r=df( l )  b=[1;0;-1]; r = -( 2*l@{1@} - 2*b + rand(size(l@{1@}))); endfunction @*
 ## function r=ff( l )  b=[1;0;-1]; r = (l@{1@}-b)' * (l@{1@}-b); endfunction @*
 ## ll = @{ [10; 2; 3] @}; @*
 ## ctl(5) = 3; @*

Modified: trunk/octave-forge/main/optim/inst/cg_min_example_1.m
===================================================================
--- trunk/octave-forge/main/optim/inst/cg_min_example_1.m	2010-02-17 13:17:01 UTC (rev 6912)
+++ trunk/octave-forge/main/optim/inst/cg_min_example_1.m	2010-02-17 14:27:06 UTC (rev 6913)
@@ -1,3 +1,4 @@
+##
 ## ok = test_conjgrad_min       - Test that conjgrad_min works
 ##
 ## Defines some simple functions and verifies that calling

Modified: trunk/octave-forge/main/optim/inst/fmin.m
===================================================================
--- trunk/octave-forge/main/optim/inst/fmin.m	2010-02-17 13:17:01 UTC (rev 6912)
+++ trunk/octave-forge/main/optim/inst/fmin.m	2010-02-17 14:27:06 UTC (rev 6913)
@@ -15,6 +15,8 @@
 
 function ret=fmin(varargin)
 
+  ## alias for fminbnd
+
 	ret = fminbnd(varargin{:});
 
 endfunction


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