make real-valued evolutionary operators much faster

jakobbossek · Feb 13, 2015 · d3fbbb7 · d3fbbb7
1 parent b702551
commit d3fbbb7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/R/gaussMutator.R b/R/gaussMutator.R
@@ -16,11 +16,13 @@
 gaussMutator = function(setOfIndividuals, control = list(mutator.gauss.prob = 1, mutator.gauss.sd = 0.05)) {
   n.params = ncol(setOfIndividuals$individuals)
   n = nrow(setOfIndividuals$individuals)
-  for (i in seq(n)) {
-    mutation.bool = (runif(n.params) <= control$mutator.gauss.prob)
-    mutation = ifelse(mutation.bool, rnorm(1, mean = 0, sd = control$mutator.gauss.sd), 0)
-    setOfIndividuals$individuals[i, ] = setOfIndividuals$individuals[i, ] + mutation
-  }
+
+  mutation.bool = matrix(runif(n * n.params) < control$mutator.gauss.prob, ncol = n.params)
+  mutation = matrix(0, ncol = n.params, nrow = n)
+  idx = which(mutation.bool)
+  mutation[idx] = rnorm(length(idx), mean = 0, sd = control$mutator.gauss.sd)
+  setOfIndividuals$individuals = setOfIndividuals$individuals + mutation
+
   return(setOfIndividuals)
 }
 

diff --git a/R/indermediateRecombinator.R b/R/indermediateRecombinator.R
@@ -8,8 +8,8 @@
 #'   Recombined offspring.
 #' @export
 intermediateRecombinator = function(setOfIndividuals, control=list()) {
-  child = apply(setOfIndividuals$individuals, 2, sum) / 2
-  makePopulation(t(as.matrix(child)))
+  child = matrix(colSums(setOfIndividuals$individuals) / 2, nrow = 1L)
+  makePopulation(child)
 }
 
 attr(intermediateRecombinator, "name") = "Intermediate recombinator"

diff --git a/R/nullRecombinator.R b/R/nullRecombinator.R
@@ -8,8 +8,8 @@
 #'   Recombined offspring.
 #' @export
 nullRecombinator = function(setOfIndividuals, control=list()) {
-  child = setOfIndividuals$individuals[1, ]
-  makePopulation(t(as.matrix(child)))
+  child = setOfIndividuals$individuals[1, , drop = FALSE]
+  makePopulation(child)
 }
 
 attr(nullRecombinator, "name") = "null recombinator"