Mercurial > forge

changeset 9825:b70d2dbc985b octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ga: enable unit tests even if only with standard values
author slackydeb
date Fri, 23 Mar 2012 01:58:11 +0000
parents 45760287bae4
children d8845213ff9e
files main/ga/inst/ga.m
diffstat 1 files changed, 23 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/main/ga/inst/ga.m	Fri Mar 23 01:57:58 2012 +0000
+++ b/main/ga/inst/ga.m	Fri Mar 23 01:58:11 2012 +0000
@@ -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