fminsearch: Removed unnecessary customized options in the demos
Michaƫl Baudin [Fri, 30 Oct 2009 10:34:27 +0000 (11:34 +0100)]
14 files changed:
scilab/modules/optimization/demos/neldermead/neldermead_boxproblemA.sce
scilab/modules/optimization/demos/neldermead/neldermead_boxproblemB.sce
scilab/modules/optimization/demos/neldermead/neldermead_dimension.sce
scilab/modules/optimization/demos/neldermead/neldermead_outputcmd.sce
scilab/modules/optimization/demos/neldermead/nmplot_han1.sce
scilab/modules/optimization/demos/neldermead/nmplot_han2.sce
scilab/modules/optimization/demos/neldermead/nmplot_mckinnon.sce
scilab/modules/optimization/demos/neldermead/nmplot_mckinnon2.sce
scilab/modules/optimization/demos/neldermead/nmplot_quadratic.fixed.sce
scilab/modules/optimization/demos/neldermead/nmplot_quadratic.fixed2.sce
scilab/modules/optimization/demos/neldermead/nmplot_quadratic.variable.sce
scilab/modules/optimization/demos/neldermead/nmplot_quadratic.variable2.sce
scilab/modules/optimization/demos/neldermead/nmplot_rosenbrock.fixed.sce
scilab/modules/optimization/demos/neldermead/nmplot_rosenbrock.sce

index 59c02e1..22419e2 100644 (file)
@@ -147,9 +147,6 @@ nm = neldermead_configure(nm,"-maxiter",300);
 nm = neldermead_configure(nm,"-maxfunevals",1000);
 nm = neldermead_configure(nm,"-tolsimplexizerelative",1.e-4);
 nm = neldermead_configure(nm,"-method","box");
-nm = neldermead_configure(nm,"-verbose",1);
-nm = neldermead_configure(nm,"-logfile" , "boxproblemA.txt" );
-nm = neldermead_configure(nm,"-verbosetermination",1);
 // Configure like Box
 nm = neldermead_configure(nm,"-boundsmin",[0.0 1.2 20.0 9.0 6.0]);
 nm = neldermead_configure(nm,"-boundsmax",[5.0 2.5 60.0 9.3 7.0]);
@@ -177,7 +174,6 @@ mprintf("f expected=%f\n",fopt);
 shift = abs(fcomp-fopt)/abs(fopt);
 mprintf("Shift =%f\n",shift);
 nm = neldermead_destroy(nm);
-deletefile ( "boxproblemA.txt" )
 mprintf("End of demo.\n");
 
 //
index d2c4026..972c4a7 100644 (file)
@@ -98,9 +98,6 @@ nm = neldermead_configure(nm,"-x0",x0);
 nm = neldermead_configure(nm,"-maxiter",300);
 nm = neldermead_configure(nm,"-maxfunevals",300);
 nm = neldermead_configure(nm,"-method","box");
-nm = neldermead_configure(nm,"-verbose",1);
-nm = neldermead_configure(nm,"-logfile" , "boxproblemB.txt" );
-nm = neldermead_configure(nm,"-verbosetermination",1);
 nm = neldermead_configure(nm,"-boundsmin",[0.0 0.0]);
 nm = neldermead_configure(nm,"-boundsmax",[100.0 57.735026918962582]);
 // Configure like Box
@@ -135,7 +132,6 @@ mprintf("f expected=%f\n",fopt);
 shift = abs(fcomp-fopt)/abs(fopt);
 mprintf("Shift =%f\n",shift);
 nm = neldermead_destroy(nm);
-deletefile ( "boxproblemB.txt" )
 mprintf("End of demo.\n");
 
 //
index 860eeb0..5043c6c 100644 (file)
@@ -33,9 +33,6 @@ function [nbfevals , niter , rho] = solvepb ( n )
     coords (i,1:n) = 2.0 * rand(1,n) - 1.0;
   end
   nm = neldermead_configure(nm,"-coords0",coords);
-  nm = neldermead_configure(nm,"-method","variable");
-  //nm = neldermead_configure(nm,"-verbose",1);
-  //nm = neldermead_configure(nm,"-verbosetermination",1);
   //
   // Perform optimization
   //
index 1794d4e..790449d 100644 (file)
@@ -56,11 +56,6 @@ nm = neldermead_configure(nm,"-maxiter",200);
 nm = neldermead_configure(nm,"-maxfunevals",300);
 nm = neldermead_configure(nm,"-tolfunrelative",10*%eps);
 nm = neldermead_configure(nm,"-tolxrelative",10*%eps);
-nm = neldermead_configure(nm,"-simplex0method","axes");
-nm = neldermead_configure(nm,"-simplex0length",1.0);
-nm = neldermead_configure(nm,"-method","variable");
-nm = neldermead_configure(nm,"-verbose",0);
-nm = neldermead_configure(nm,"-verbosetermination",0);
 nm = neldermead_configure(nm,"-outputcommand",myoutputcmd);
 nm = neldermead_search(nm);
 nm = neldermead_destroy(nm);
index 5b74d8c..07af9ca 100644 (file)
@@ -45,10 +45,6 @@ nm = nmplot_configure(nm,"-tolfunrelative",10*%eps);
 nm = nmplot_configure(nm,"-tolxrelative",10*%eps);
 nm = nmplot_configure(nm,"-simplex0method","given");
 nm = nmplot_configure(nm,"-coords0",coords0);
-nm = nmplot_configure(nm,"-simplex0length",1.0);
-nm = nmplot_configure(nm,"-method","variable");
-//nm = nmplot_configure(nm,"-verbose",1);
-nm = nmplot_configure(nm,"-verbosetermination",1);
 //
 // Setup output files
 //
index 9d8fa8b..32d678b 100644 (file)
@@ -49,10 +49,6 @@ nm = nmplot_configure(nm,"-tolfunrelative",10*%eps);
 nm = nmplot_configure(nm,"-tolxrelative",10*%eps);
 nm = nmplot_configure(nm,"-simplex0method","given");
 nm = nmplot_configure(nm,"-coords0",coords0);
-nm = nmplot_configure(nm,"-simplex0length",1.0);
-nm = nmplot_configure(nm,"-method","variable");
-//nm = nmplot_configure(nm,"-verbose",1);
-nm = nmplot_configure(nm,"-verbosetermination",1);
 //
 // Setup output files
 //
index 4e49847..4d4c9c9 100644 (file)
@@ -113,10 +113,6 @@ nm = nmplot_configure(nm,"-tolfunrelative",10*%eps);
 nm = nmplot_configure(nm,"-tolxrelative",10*%eps);
 nm = nmplot_configure(nm,"-simplex0method","given");
 nm = nmplot_configure(nm,"-coords0",coords0);
-nm = nmplot_configure(nm,"-simplex0length",1.0);
-nm = nmplot_configure(nm,"-method","variable");
-//nm = nmplot_configure(nm,"-verbose",1);
-nm = nmplot_configure(nm,"-verbosetermination",1);
 //
 // Setup output files
 //
index f84931e..3c0009e 100644 (file)
@@ -112,10 +112,6 @@ nm = nmplot_configure(nm,"-maxfunevals",300);
 nm = nmplot_configure(nm,"-tolsimplexizerelative",1.e-6);
 nm = nmplot_configure(nm,"-simplex0method","given");
 nm = nmplot_configure(nm,"-coords0",coords0);
-nm = nmplot_configure(nm,"-simplex0length",1.0);
-nm = nmplot_configure(nm,"-method","variable");
-//nm = nmplot_configure(nm,"-verbose",0);
-nm = nmplot_configure(nm,"-verbosetermination",0);
 nm = nmplot_configure(nm,"-kelleystagnationflag",%t);
 nm = nmplot_configure(nm,"-restartflag",%t);
 nm = nmplot_configure(nm,"-restartdetection","kelley");
index dcf22cb..363e059 100644 (file)
@@ -25,8 +25,6 @@ nm = nmplot_configure(nm,"-tolxmethod",%f);
 nm = nmplot_configure(nm,"-tolsimplexizerelative",1.e-8);
 nm = nmplot_configure(nm,"-simplex0method","spendley");
 nm = nmplot_configure(nm,"-method","fixed");
-//nm = nmplot_configure(nm,"-verbose",1);
-//nm = nmplot_configure(nm,"-verbosetermination",1);
 //
 // Setup output files
 //
index 39073be..987ecab 100644 (file)
@@ -26,8 +26,6 @@ nm = nmplot_configure(nm,"-tolxmethod",%f);
 nm = nmplot_configure(nm,"-tolsimplexizerelative",1.e-8);
 nm = nmplot_configure(nm,"-simplex0method","spendley");
 nm = nmplot_configure(nm,"-method","fixed");
-//nm = nmplot_configure(nm,"-verbose",1);
-//nm = nmplot_configure(nm,"-verbosetermination",0);
 //
 // Setup output files
 //
index 7d6cabe..9044ee5 100644 (file)
@@ -24,9 +24,6 @@ nm = nmplot_configure(nm,"-maxfunevals",300);
 nm = nmplot_configure(nm,"-tolxmethod",%f);
 nm = nmplot_configure(nm,"-tolsimplexizerelative",1.e-8);
 nm = nmplot_configure(nm,"-simplex0method","spendley");
-nm = nmplot_configure(nm,"-method","variable");
-//nm = nmplot_configure(nm,"-verbose",1);
-//nm = nmplot_configure(nm,"-verbosetermination",1);
 //
 // Setup output files
 //
index b6b05ef..394d1f3 100644 (file)
@@ -25,9 +25,6 @@ nm = nmplot_configure(nm,"-maxfunevals",400);
 nm = nmplot_configure(nm,"-tolxmethod",%f);
 nm = nmplot_configure(nm,"-tolsimplexizerelative",1.e-8);
 nm = nmplot_configure(nm,"-simplex0method","spendley");
-nm = nmplot_configure(nm,"-method","variable");
-//nm = nmplot_configure(nm,"-verbose",1);
-//nm = nmplot_configure(nm,"-verbosetermination",0);
 //
 // Perform optimization
 //
index 5e326de..6d0eb32 100644 (file)
@@ -23,11 +23,7 @@ nm = nmplot_configure(nm,"-maxiter",100);
 nm = nmplot_configure(nm,"-maxfunevals",300);
 nm = nmplot_configure(nm,"-tolfunrelative",10*%eps);
 nm = nmplot_configure(nm,"-tolxrelative",10*%eps);
-nm = nmplot_configure(nm,"-simplex0method","axes");
-nm = nmplot_configure(nm,"-simplex0length",1.0);
 nm = nmplot_configure(nm,"-method","fixed");
-//nm = nmplot_configure(nm,"-verbose",1);
-nm = nmplot_configure(nm,"-verbosetermination",0);
 //
 // Setup output files
 //
index 8ef82db..096a7ce 100644 (file)
@@ -23,11 +23,6 @@ nm = nmplot_configure(nm,"-maxiter",200);
 nm = nmplot_configure(nm,"-maxfunevals",300);
 nm = nmplot_configure(nm,"-tolfunrelative",10*%eps);
 nm = nmplot_configure(nm,"-tolxrelative",10*%eps);
-nm = nmplot_configure(nm,"-simplex0method","axes");
-nm = nmplot_configure(nm,"-simplex0length",1.0);
-nm = nmplot_configure(nm,"-method","variable");
-//nm = nmplot_configure(nm,"-verbose",1);
-nm = nmplot_configure(nm,"-verbosetermination",0);
 //
 // Setup output files
 //