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

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

Revision: 10011
          http://octave.svn.sourceforge.net/octave/?rev=10011&view=rev
Author:   slackydeb
Date:     2012-03-23 01:58:11 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
ga: enable unit tests even if only with standard values

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

Modified: trunk/octave-forge/main/ga/inst/ga.m
===================================================================
--- trunk/octave-forge/main/ga/inst/ga.m	2012-03-23 01:57:58 UTC (rev 10010)
+++ trunk/octave-forge/main/ga/inst/ga.m	2012-03-23 01:58:11 UTC (rev 10011)
@@ -177,14 +177,14 @@
 %!  C = [];
 %!  Ceq = [];
 %!test
-%! options = gaoptimset ();
+%! default_options = gaoptimset ();
+%! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, default_options);
+%!test # TODO: use non-default value
+%! options = gaoptimset ("CreationFcn", @gacreationuniform);
 %! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
-%!#test
-%!# options = gaoptimset ("CreationFcn", TODO);
-%!# x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
-%!#test
-%!# options = gaoptimset ("CrossoverFcn", TODO);
-%!# x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
+%!test # TODO: use non-default value
+%! options = gaoptimset ("CrossoverFcn", @crossoverscattered);
+%! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
 %!test
 %! options = gaoptimset ("CrossoverFraction", 0.6);
 %! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
@@ -194,34 +194,34 @@
 %!test
 %! options = gaoptimset ("FitnessLimit", 1e-7);
 %! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
-%!#test
-%!# options = gaoptimset ("FitnessScalingFcn", TODO);
-%!# x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
+%!test # TODO: use non-default value
+%! options = gaoptimset ("FitnessScalingFcn", @fitscalingrank);
+%! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
 %!test
 %! options = gaoptimset ("Generations", 200);
 %! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
 %!test
 %! options = gaoptimset ("InitialPopulation", rand (4, nvars));
 %! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
-%!#test
-%!# options = gaoptimset ("InitialScores", TODO);
-%!# x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
-%!#test
-%!# options = gaoptimset ("MutationFcn", TODO);
-%!# x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
+%!test # TODO: use non-default value
+%! options = gaoptimset ("InitialScores", []);
+%! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
+%!test # TODO: use non-default value
+%! options = gaoptimset ("MutationFcn", {@mutationgaussian, 1, 1});
+%! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
 %!test
 %! options = gaoptimset ("PopInitRange", [-2; 2]);
 %! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
 %!test
 %! options = gaoptimset ("PopulationSize", 200);
 %! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
-%!#test
-%!# options = gaoptimset ("SelectionFcn", TODO);
-%!# x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
-%!#test
-%!# options = gaoptimset ("TimeLimit", TODO);
-%!# x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
-%!#xtest
+%!test # TODO: use non-default value
+%! options = gaoptimset ("SelectionFcn", @selectionstochunif);
+%! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
+%!test # TODO: use non-default value
+%! options = gaoptimset ("TimeLimit", Inf);
+%! x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
+%!#xtest # TODO
 %!# options = gaoptimset ("UseParallel", "always");
 %!# x = ga (f, nvars, [], [], [], [], [], [], @nonlcon, options);
 %!test

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