Mercurial > octave

changeset 26283:83fd5b27ea7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Fri, 21 Dec 2018 15:07:32 -0500
parents f23f27e78aa2 (current diff) 3b917b501087 (diff)
children a2b7c8ffe232
files
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Fri Dec 21 15:07:02 2018 -0500
+++ b/Makefile.am	Fri Dec 21 15:07:32 2018 -0500
@@ -289,6 +289,7 @@
 CLEANFILES += \
   config-vars \
   make-vars \
+  oct-file-pkg-add \
   octave-config.h \
   run-octave
 
--- a/scripts/optimization/fminsearch.m	Fri Dec 21 15:07:02 2018 -0500
+++ b/scripts/optimization/fminsearch.m	Fri Dec 21 15:07:32 2018 -0500
@@ -282,7 +282,7 @@
   nf = 1;
 
   if (trace == 1)
-    printf ("f(x0) = %9.4e\n", f(1));
+    printf ("f(x0) = %9.4e\n", dirn * f(1));
   endif
 
   k = 0; m = 0;
@@ -321,7 +321,7 @@
   if (! isempty (outfcn))
     optimvalues.iteration = 0;
     optimvalues.funccount = nf;
-    optimvalues.fval = f(1);
+    optimvalues.fval = dirn * f(1);
     optimvalues.procedure = how;
     state = "init";
     stop = outfcn (x, optimvalues, state);
@@ -351,7 +351,7 @@
     if (trace == 1)
       printf ("Iter. %2.0f,", k);
       printf ("  how = %-11s", [how ","]);
-      printf ("nf = %3.0f,  f = %9.4e  (%2.1f%%)\n", nf, fmax, ...
+      printf ("nf = %3.0f,  f = %9.4e  (%2.1f%%)\n", nf, dirn * fmax, ...
               100*(fmax-fmax_old)/(abs(fmax_old)+eps));
     endif
     fmax_old = fmax;
@@ -388,7 +388,7 @@
     ## Call OutputFcn
     if (! isempty (outfcn))
       optimvalues.funccount = nf;
-      optimvalues.fval = f(1);
+      optimvalues.fval = dirn * f(1);
       optimvalues.iteration = k;
       optimvalues.procedure = how;
       state = "iter";
@@ -470,7 +470,7 @@
   ##        i.e., only when we have successfully converged?
   if (! isempty (outfcn))
     optimvalues.funccount = nf;
-    optimvalues.fval = f(1);
+    optimvalues.fval = dirn * f(1);
     optimvalues.iteration = k;
     optimvalues.procedure = how;
     state = "done";