add cross over probability and recombinator.control for all recombina…

…tors
jakobbossek · Jun 29, 2015 · 57888e1 · 57888e1
1 parent faeea3d
commit 57888e1
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 11 deletions.
diff --git a/R/generateOffspring.R b/R/generateOffspring.R
@@ -14,6 +14,7 @@ generateOffspring = function(matingPool, objective.fun, control, opt.path) {
   mutationStrategyAdaptor = control$mutationStrategyAdaptor
   mutator.control = control$mutator.control
   recombinator = control$recombinator
+  recombinator.control = control$recombinator.control
   n.offspring = control$n.offspring
 
   offspring = vector("list", n.offspring)
@@ -23,7 +24,7 @@ generateOffspring = function(matingPool, objective.fun, control, opt.path) {
     parents = getParents(matingPool)
     #print(parents)
     # pass just the individuals and get a single individual
-    child = recombinator(parents, control)
+    child = recombinator(parents, recombinator.control, control)
     #catf("Child %i", i)
     #print(child)
     mutator.control = mutationStrategyAdaptor(mutator.control, opt.path)

diff --git a/R/recombinator.crossover.R b/R/recombinator.crossover.R
@@ -1,9 +1,21 @@
 #' Generator of the One-point crossover recombination operator.
 #'
+#' @param recombinator.crossover.prob [\code{numeric(1)}]\cr
+#'   Cross over probability to form an offspring. Default is \code{1}.
 #' @return [\code{ecr_recombinator}]
 #' @export
-makeCrossoverRecombinator = function() {
-  recombinator = function(inds, control = list()) {
+makeCrossoverRecombinator = function(recombinator.crossover.prob = 1) {
+  recombinatorCheck = function(operator.control) {
+    assertNumber(operator.control$recombinator.crossover.prob
+                 , lower = 0, upper = 1, na.ok = FALSE
+    )
+  }
+
+  force(recombinator.crossover.prob)
+  defaults = list(recombinator.crossover.prob = recombinator.crossover.prob)
+  recombinatorCheck(defaults)
+
+  recombinator = function(inds, args = defaults, control = list()) {
     parent1 = inds[[1]]
     parent2 = inds[[2]]
     n = length(parent1)
@@ -12,12 +24,15 @@ makeCrossoverRecombinator = function() {
     if (n == 1L) {
       stopf("Crossover recombinator requires genes to have length > 1.")
     }
-    idx = sample(1:(n - 1), size = 1L)
     # at least one allele of each parent should be contained
     child1 = parent1
     child2 = parent2
-    child1[(idx + 1L):n] = parent2[(idx + 1L):n]
-    child2[1:idx] = parent1[1:idx]
+    do.recombinate = runif(1L) < args$recombinator.crossover.prob
+    if (do.recombinate) {
+      idx = sample(1:(n - 1), size = 1L)
+      child1[(idx + 1L):n] = parent2[(idx + 1L):n]
+      child2[1:idx] = parent1[1:idx]
+    }
     #FIXME: here we just return one offspring for now
     return(child1)
   }
@@ -27,6 +42,8 @@ makeCrossoverRecombinator = function() {
     name = "Crossover recombinator",
     description = "Performs classical one-point crossover.",
     n.parents = 2L,
-    supported = c("float", "binary")
+    supported = c("float", "binary"),
+    defaults = defaults,
+    checker = recombinatorCheck
   )
 }
diff --git a/R/recombinator.intermediate.R b/R/recombinator.intermediate.R
@@ -3,7 +3,7 @@
 #' @return [\code{ecr_recombinator}]
 #' @export
 makeIntermediateRecombinator = function() {
-  recombinator = function(inds, control = list()) {
+  recombinator = function(inds, args = list(), control = list()) {
     n = length(inds[[1]])
     child = rep(0, n)
     for (i in 1:length(inds)) {

diff --git a/R/recombinator.null.R b/R/recombinator.null.R
@@ -3,7 +3,7 @@
 #' @return [\code{ecr_recombinator}]
 #' @export
 makeNullRecombinator = function() {
-  recombinator = function(inds, control=list()) {
+  recombinator = function(inds, args = list(), control=list()) {
     return(inds[[1L]])
   }
 

diff --git a/R/recombinator.pmx.R b/R/recombinator.pmx.R
@@ -8,7 +8,7 @@
 #' @return [\code{ecr_recombinator}]
 #' @export
 makePMXRecombinator = function() {
-  recombinator = function(inds, control = list()) {
+  recombinator = function(inds, args = list(), control = list()) {
     p1 = inds[[1]]
     p2 = inds[[2]]
     n = length(p1)

diff --git a/man/makeCrossoverRecombinator.Rd b/man/makeCrossoverRecombinator.Rd
@@ -4,7 +4,11 @@
 \alias{makeCrossoverRecombinator}
 \title{Generator of the One-point crossover recombination operator.}
 \usage{
-makeCrossoverRecombinator()
+makeCrossoverRecombinator(recombinator.crossover.prob = 1)
+}
+\arguments{
+\item{recombinator.crossover.prob}{[\code{numeric(1)}]\cr
+Cross over probability to form an offspring. Default is \code{1}.}
 }
 \value{
 [\code{ecr_recombinator}]