Mercurial > forge

changeset 9703:0253d5aba9a2 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ga: move tests from ga to gaoptimset
author slackydeb
date Wed, 14 Mar 2012 22:48:11 +0000
parents cee6027d95a8
children 1e7e27284c93
files main/ga/inst/ga.m main/ga/inst/gaoptimset.m
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/main/ga/inst/ga.m	Wed Mar 14 22:44:06 2012 +0000
+++ b/main/ga/inst/ga.m	Wed Mar 14 22:48:11 2012 +0000
@@ -162,10 +162,6 @@
 
 ## Vectorized and UseParallel options
 
-%!error ga (struct ("fitnessfcn", @rastriginsfcn, "nvars", 2, "options", gaoptimset ("Vectorized", "bad value")));
-
-%!error ga (struct ("fitnessfcn", @rastriginsfcn, "nvars", 2, "options", gaoptimset ("UseParallel", "bad value")));
-
 %!test ga (struct ("fitnessfcn", @rastriginsfcn, "nvars", 2, "options", gaoptimset ("Generations", 10, "Vectorized", "on")));
 
 %!xtest ga (struct ("fitnessfcn", @rastriginsfcn, "nvars", 2, "options", gaoptimset ("Generations", 10, "UseParallel", "always")));
--- a/main/ga/inst/gaoptimset.m	Wed Mar 14 22:44:06 2012 +0000
+++ b/main/ga/inst/gaoptimset.m	Wed Mar 14 22:48:11 2012 +0000
@@ -93,6 +93,10 @@
 %!error gaoptimset ("Generations", 123, "odd number of arguments")
 
 
+%!#error options = gaoptimset ("Vectorized", "bad value") # TODO: fix
+%!#error options = gaoptimset ("UseParallel", "bad value") # TODO: fix
+
+
 %!assert (getfield (gaoptimset ("Generations", 123), "Generations"), 123)
 
 %!test