[Octave-cvsupdate] SF.net SVN: octave:[9958] trunk/octave-forge/main/ga/inst/gaoptimset.m

[<sla...@us...>]

Revision: 9958
          http://octave.svn.sourceforge.net/octave/?rev=9958&view=rev
Author:   slackydeb
Date:     2012-03-19 00:34:11 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
ga: polish gaoptimset

Modified Paths:
--------------
    trunk/octave-forge/main/ga/inst/gaoptimset.m

Modified: trunk/octave-forge/main/ga/inst/gaoptimset.m
===================================================================
--- trunk/octave-forge/main/ga/inst/gaoptimset.m	2012-03-19 00:33:59 UTC (rev 9957)
+++ trunk/octave-forge/main/ga/inst/gaoptimset.m	2012-03-19 00:34:11 UTC (rev 9958)
@@ -21,7 +21,8 @@
 ## @strong{Inputs}
 ## @table @var
 ## @item param
-## Parameter to set. Unspecified parameters are set to their default values; specifying no parameters is allowed.
+## Parameter to set. Unspecified parameters are set to their default
+## values; specifying no parameters is allowed.
 ## @item value
 ## Value of @var{param}.
 ## @end table
@@ -60,7 +61,7 @@
 ## @end deftypefn
 
 ## Author: Luca Favatella <sla...@gm...>
-## Version: 4.4.6
+## Version: 4.4.7
 
 function options = gaoptimset (varargin)
   if ((nargout != 1) ||
@@ -86,21 +87,35 @@
 endfunction
 
 
-%!error gaoptimset ("Generations", 123)
-%!error [a, b] = gaoptimset ("Generations", 123)
-
+## number of input arguments
 %!error options = gaoptimset ("odd number of arguments")
 %!error options = gaoptimset ("Generations", 123, "odd number of arguments")
 
+## number of output arguments
+%!error gaoptimset ("Generations", 123)
+%!error [a, b] = gaoptimset ("Generations", 123)
 
+## type of arguments
+# TODO
 %!#error options = gaoptimset ("Vectorized", "bad value") # TODO: fix
 %!#error options = gaoptimset ("UseParallel", "bad value") # TODO: fix
 
+# TODO: structure/add tests below
 
 %!assert (getfield (gaoptimset ("Generations", 123), "Generations"), 123)
 
 %!test
-%! options = gaoptimset ("EliteCount", 1, "FitnessLimit", 1e-7, "Generations", 1000, "PopInitRange", [-5; 5], "PopulationSize", 200);
+%! options = gaoptimset ("EliteCount", 1,
+%!                       "FitnessLimit", 1e-7,
+%!                       "Generations", 1000,
+%!                       "PopInitRange", [-5; 5],
+%!                       "PopulationSize", 200);
 %!
 %! ## "CrossoverFraction" is not specified, so gaoptimset should put the default value: testing this too
-%! assert ([(getfield (options, "CrossoverFraction")); (getfield (options, "EliteCount")); (getfield (options, "FitnessLimit")); (getfield (options, "Generations")); (getfield (options, "PopInitRange")); (getfield (options, "PopulationSize"))], [0.8; 1; 1e-7; 1000; [-5; 5]; 200])
\ No newline at end of file
+%! assert ([(getfield (options, "CrossoverFraction"));
+%!          (getfield (options, "EliteCount"));
+%!          (getfield (options, "FitnessLimit"));
+%!          (getfield (options, "Generations"));
+%!          (getfield (options, "PopInitRange"));
+%!          (getfield (options, "PopulationSize"))],
+%!         [0.8; 1; 1e-7; 1000; [-5; 5]; 200])

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