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

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

Revision: 9889
          http://octave.svn.sourceforge.net/octave/?rev=9889&view=rev
Author:   slackydeb
Date:     2012-03-14 22:48:11 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
ga: move tests from ga to gaoptimset

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

Modified: trunk/octave-forge/main/ga/inst/ga.m
===================================================================
--- trunk/octave-forge/main/ga/inst/ga.m	2012-03-14 22:44:06 UTC (rev 9888)
+++ trunk/octave-forge/main/ga/inst/ga.m	2012-03-14 22:48:11 UTC (rev 9889)
@@ -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")));

Modified: trunk/octave-forge/main/ga/inst/gaoptimset.m
===================================================================
--- trunk/octave-forge/main/ga/inst/gaoptimset.m	2012-03-14 22:44:06 UTC (rev 9888)
+++ trunk/octave-forge/main/ga/inst/gaoptimset.m	2012-03-14 22:48:11 UTC (rev 9889)
@@ -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

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