# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1252412855 -7200
# Node ID 73e6ad869f08ed777c8c98b1430eb4dd53666e6a
# Parent  5bcfa0b346e83b4d855355102570bb7f0be2ccf7
further correct initial TR step strategy

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-06  Jaroslav Hajek  <highegg@gmail.com>
+
+	* optimization/fsolve.m: Change initial TR step strategy.
+	* optimization/fminunc.m: Change initial TR step strategy.
+
 2009-09-08  Jaroslav Hajek  <highegg@gmail.com>
 
 	* optimization/fminunc.m: Correct extra output params handling.
diff --git a/scripts/optimization/fminunc.m b/scripts/optimization/fminunc.m
--- a/scripts/optimization/fminunc.m
+++ b/scripts/optimization/fminunc.m
@@ -189,7 +189,7 @@
       dg = d2f;
       xn = norm (dg .* x);
       ## FIXME: something better?
-      delta = max (factor * xn, 1);
+      delta = factor * max (xn, 1);
     endif
 
     ## FIXME: maybe fixed lower and upper bounds?
diff --git a/scripts/optimization/fsolve.m b/scripts/optimization/fsolve.m
--- a/scripts/optimization/fsolve.m
+++ b/scripts/optimization/fsolve.m
@@ -234,7 +234,7 @@
       dg(dg == 0) = 1;
       xn = norm (dg .* x);
       ## FIXME: something better?
-      delta = max (factor * xn, 1);
+      delta = factor * max (xn, 1);
     endif
 
     ## Rescale adaptively.