pass opt.state to selectors

jakobbossek · Jan 24, 2016 · 1183d0b · 1183d0b
1 parent 57abb8f
commit 1183d0b
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/R/emoa.as-emoa.R b/R/emoa.as-emoa.R
@@ -82,7 +82,7 @@ asemoa = function(
 
   # Implementation of surival selection operator of the AS-EMOA algorithm.
   asemoaSelector = makeSelector(
-    selector = function(fitness, n.select, task, control, storage) {
+    selector = function(fitness, n.select, task, control, opt.state) {
       all.idx = 1:ncol(fitness)
 
       # filter nondominated points

diff --git a/R/emoa.nsga2.R b/R/emoa.nsga2.R
@@ -50,7 +50,7 @@ nsga2 = function(
 
   # set up the core of NSGA-II, namely the survival selection
   nsga2SurvivalSelector = makeSelector(
-    selector = function(fitness, n.select, task, control, storage) {
+    selector = function(fitness, n.select, task, control, opt.state) {
       nondom.layers = doNondominatedSorting(fitness)
 
       # storage for indizes of selected individuals

diff --git a/R/emoa.sms-emoa.R b/R/emoa.sms-emoa.R
@@ -47,7 +47,7 @@ smsemoa = function(
   max.time = NULL, ...) {
 
   hypervolumeSelector = makeSelector(
-    selector = function(fitness, n.select, task, control, storage) {
+    selector = function(fitness, n.select, task, control, opt.state) {
       all.idx = 1:ncol(fitness)
 
       # do non-dominated sorting

diff --git a/R/makeSelector.R b/R/makeSelector.R
@@ -29,7 +29,7 @@ makeSelector = function(
   supported = getAvailableRepresentations(),
   supported.objectives,
   supported.opt.direction = "minimize") {
-  assertFunction(selector, args = c("fitness", "n.select", "task", "control", "storage"), ordered = TRUE)
+  assertFunction(selector, args = c("fitness", "n.select", "task", "control", "opt.state"), ordered = TRUE)
   assertSubset(supported.objectives, c("single-objective", "multi-objective"))
   assertChoice(supported.opt.direction, choices = c("maximize", "minimize"))
   selector = makeOperator(selector, name, description, supported)

diff --git a/R/selector.greedy.R b/R/selector.greedy.R
@@ -9,7 +9,7 @@
 #' @family selectors
 #' @export
 makeGreedySelector = function() {
-  selector = function(fitness, n.select, task, control, storage) {
+  selector = function(fitness, n.select, task, control, opt.state) {
     fitness = as.numeric(fitness)
     idx = order(fitness)[seq(n.select)]
     return(idx)

diff --git a/R/selector.k-tournament.R b/R/selector.k-tournament.R
@@ -17,7 +17,7 @@ makeTournamentSelector = function(k = 3L) {
 
   force(k)
 
-  selector = function(fitness, n.select, task, control, storage) {
+  selector = function(fitness, n.select, task, control, opt.state) {
     fitness = as.numeric(fitness)
     pop.idx = seq_along(fitness)
     idx = integer(n.select)

diff --git a/R/selector.roulettewheel.R b/R/selector.roulettewheel.R
@@ -32,7 +32,7 @@ makeRouletteWheelSelector = function(offset = 0.1) {
 
   force(offset)
 
-  selector = function(fitness, n.select, task, control, storage) {
+  selector = function(fitness, n.select, task, control, opt.state) {
     fitness = as.numeric(fitness)
     # shift negative values
     if (any(fitness <= 0L)) {

diff --git a/R/selector.simple.R b/R/selector.simple.R
@@ -9,7 +9,7 @@
 #' @family selectors
 #' @export
 makeSimpleSelector = function() {
-  selector = function(fitness, n.select, task, control, storage) {
+  selector = function(fitness, n.select, task, control, opt.state) {
     return(1:ncol(fitness))
   }
   makeSelector(

diff --git a/R/setupECRControl.R b/R/setupECRControl.R
@@ -188,7 +188,7 @@ selectForMating = function(opt.state, control) {
   task = opt.state$task
   fitness = population$fitness
   fitness2 = transformFitness(fitness, task, control$parent.selector)
-  idx.mating = control$parent.selector(fitness2, control$n.mating.pool, task, control, NULL)
+  idx.mating = control$parent.selector(fitness2, control$n.mating.pool, task, control, opt.state)
   subsetPopulation(population, idx = idx.mating)
 }
 
@@ -197,6 +197,6 @@ selectForSurvival = function(opt.state, population, control, n.select = control$
   fitness = population$fitness
   task = opt.state$task
   fitness2 = transformFitness(fitness, task, control$survival.selector)
-  idx.survival = control$survival.selector(fitness2, n.population, task, control, NULL)
+  idx.survival = control$survival.selector(fitness2, n.population, task, control, opt.state)
   subsetPopulation(population, idx = idx.survival)
 }