Mercurial > hg > octave-nkf

changeset 9464:e598248a060d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
safer str2func use in optim functions
author Jaroslav Hajek <highegg@gmail.com>
date Mon, 27 Jul 2009 14:15:44 +0200
parents d34baf412786
children 40de4692c860
files scripts/ChangeLog scripts/optimization/fminunc.m scripts/optimization/fsolve.m scripts/optimization/fzero.m
diffstat 4 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-27  Jaroslav Hajek  <highegg@gmail.com>
+
+	* optimization/fzero.m: Use "global" parameter in str2func.
+	* optimization/fsolve.m: Ditto.
+	* optimization/fminunc.m: Ditto.
+
 2009-07-24  John W. Eaton  <jwe@octave.org>
 
 	* plot/gnuplot_binary.in: Accept arguments in addition to program name.
--- a/scripts/optimization/fminunc.m
+++ b/scripts/optimization/fminunc.m
@@ -83,7 +83,7 @@
   endif    
 
   if (ischar (fcn))
-    fcn = str2func (fcn);
+    fcn = str2func (fcn, "global");
   endif
 
   xsiz = size (x0);
--- a/scripts/optimization/fsolve.m
+++ b/scripts/optimization/fsolve.m
@@ -135,7 +135,7 @@
   endif    
 
   if (ischar (fcn))
-    fcn = str2func (fcn);
+    fcn = str2func (fcn, "global");
   endif
 
   xsiz = size (x0);
--- a/scripts/optimization/fzero.m
+++ b/scripts/optimization/fzero.m
@@ -75,7 +75,7 @@
   endif
 
   if (ischar (fun))
-    fun = str2func (fun);
+    fun = str2func (fun, "global");
   endif
 
   ## TODO