update tests

jakobbossek · Feb 17, 2015 · f855571 · f855571
1 parent 0f44868
commit f855571
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 28 deletions.
diff --git a/tests/testthat/test_ecr.R b/tests/testthat/test_ecr.R
@@ -24,7 +24,8 @@ test_that("ecr works with simple soo function", {
     max.iter = max.iter,
     n.params = 2L,
     representation = "float",
-    monitor = makeNullMonitor()
+    monitor = makeNullMonitor(),
+    stoppingConditions = list(makeMaximumIterationsStoppingCondition(max.iter = max.iter))
   )
   }
 

diff --git a/tests/testthat/test_stoppingConditions.R b/tests/testthat/test_stoppingConditions.R
@@ -1,6 +1,6 @@
 context("termination codes")
 
-test_that("termination codes do work", {
+test_that("stopping conditions work", {
 	obj.fn = makeSingleObjectiveFunction(
 		name = "1D Sphere",
 		fn = function(x) sum(x^2),
@@ -11,31 +11,24 @@ test_that("termination codes do work", {
 		global.opt.value = 0
 	)
 
-	makeControlForTestCase = function(max.iter = 100000L, max.time = 3600L, termination.eps = 0) {
-		ecr.control(
-			population.size = 20L,
-			offspring.size = 20L,
-			n.params = 1L,
-			survival.strategy = "plus",
-			elite.size = 1L,
-			representation = "float",
-			max.iter = max.iter,
-			max.time = max.time,
-			termination.eps = termination.eps,
-			monitor = makeNullMonitor()
-		)
-	}
-
-	# check for max iterations
-	control = makeControlForTestCase(max.iter = 5L)
-	expect_equal(ecr(obj.fn, control)$convergence, 0L)
-
-	# check for reached tolerence level
-	set.seed(1)
-	control = makeControlForTestCase(termination.eps = 2)
-	expect_equal(ecr(obj.fn, control)$convergence, 1L)
+	control = ecr.control(
+		population.size = 2L,
+		offspring.size = 2L,
+		n.params = 1L,
+		survival.strategy = "plus",
+		elite.size = 1L,
+		representation = "float",
+		max.iter = 100L,
+		max.time = 100,
+		termination.eps = 0.003,
+		monitor = makeNullMonitor()
+	)
 
 	# check for max time budget
-	control = makeControlForTestCase(max.time = 2L)
-	expect_equal(ecr(obj.fn, control)$convergence, 2L)
-})
+	control$stoppingConditions = list(makeMaximumTimeStoppingCondition(max.time = 2))
+	expect_true(grepl("Time limit", ecr(obj.fn, control)$message))
+
+	# check for max iterations
+	control$stoppingConditions = list(makeMaximumIterationsStoppingCondition(max.iter = 10L))
+	expect_true(grepl("iterations", ecr(obj.fn, control)$message))
+})