add n.archive param to AS-EMOA

jakobbossek · Apr 18, 2017 · c8eba4a · c8eba4a
1 parent 0ac5e98
commit c8eba4a
Show file tree

Hide file tree

Showing 93 changed files with 30 additions and 110 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -33,4 +33,4 @@ Suggests:
     testthat (>= 0.9.1)
 ByteCompile: yes
 LazyData: yes
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1
diff --git a/R/emoa.as-emoa.R b/R/emoa.as-emoa.R
@@ -27,6 +27,9 @@
 #' @template arg_optimization_task
 #' @param n.population [\code{integer(1)}]\cr
 #'   Population size. Default is \code{10}.
+#' @param n.archive [\code{integer(1)}]\cr
+#'   Archive size.
+#'   Default is the number of points in the \code{aspiration.set}.
 #' @param aspiration.set [\code{matrix}]\cr
 #'   The aspiration set. Each column contains one point of the set.
 #' @param normalize.fun [\code{function}]\cr
@@ -55,6 +58,7 @@
 asemoa = function(
   task,
   n.population = 10L,
+  n.archive = NULL,
   aspiration.set = NULL,
   normalize.fun = NULL,
   dist.fun = ecr:::computeEuclideanDistance,
@@ -75,10 +79,11 @@ asemoa = function(
     stopf("AS-EMAO: Dimension of the aspiration set needs to be equal to the number of objectives,
       but %i <> %i.", nrow(aspiration.set), task$n.objectives)
   }
-  n.archive = ncol(aspiration.set)
+  if (is.null(n.archive))
+    n.archive = ncol(aspiration.set)
 
-  assertInt(n.population, lower = 5L)
-  assertInt(n.archive, lower = 3L)
+  n.population = asInt(n.population, lower = 5L)
+  n.archive = asInt(n.archive, lower = 3L)
   if (!is.null(normalize.fun)) {
     assertFunction(normalize.fun, args = c("set", "aspiration.set"), ordered = TRUE)
   }
@@ -97,7 +102,7 @@ asemoa = function(
   fastASEMOASelector = makeSelector(
     selector = function(fitness, n.select, task, control, opt.state) {
       aspiration.set = control$aspiration.set
-      n.archive = ncol(aspiration.set)
+      n.archive = control$n.archive
 
       # get nondominated points
       nondom.idx = which.nondominated(fitness)
@@ -165,7 +170,7 @@ asemoa = function(
   asemoaSelector = makeSelector(
     selector = function(fitness, n.select, task, control, opt.state) {
       aspiration.set = control$aspiration.set
-      n.archive = ncol(aspiration.set)
+      n.archive = control$n.archive
 
       # get offspring
       all.idx = 1:ncol(fitness)
@@ -251,6 +256,7 @@ asemoa = function(
 
   #FIXME: this is rather ugly. We simply add some more args to the control object
   # without sanity checks and stuff like that.
+  ctrl$n.archive = n.archive
   ctrl$aspiration.set = aspiration.set
 
   res = doTheEvolution(task, ctrl)

diff --git a/R/operator.terminator.max.evaluations.R b/R/operator.terminator.max.evaluations.R
@@ -6,7 +6,7 @@
 #'
 #' @param max.evals [\code{integer(1)}]\cr
 #'   Maximal number of function evaluations. Default ist \code{Inf}.
-#' @return [\code{function}]
+#' @return [\code{ecr2_terminator}]
 #' @family stopping conditions
 #' @export
 setupMaximumEvaluationsTerminator = function(max.evals = NULL) {

diff --git a/man/OptState.Rd b/man/OptState.Rd
diff --git a/man/OptStateGetter.Rd b/man/OptStateGetter.Rd
diff --git a/man/asemoa.Rd b/man/asemoa.Rd
diff --git a/man/autoplot.ecr_single_objective_result.Rd b/man/autoplot.ecr_single_objective_result.Rd
diff --git a/man/buildInitialPopulation.Rd b/man/buildInitialPopulation.Rd
diff --git a/man/computeAverageHausdorffDistance.Rd b/man/computeAverageHausdorffDistance.Rd
diff --git a/man/computeCrowdingDistance.Rd b/man/computeCrowdingDistance.Rd
diff --git a/man/computeDistanceFromPointToSetOfPoints.Rd b/man/computeDistanceFromPointToSetOfPoints.Rd
diff --git a/man/computeGenerationalDistance.Rd b/man/computeGenerationalDistance.Rd
diff --git a/man/computeInvertedGenerationalDistance.Rd b/man/computeInvertedGenerationalDistance.Rd
diff --git a/man/doNondominatedSorting.Rd b/man/doNondominatedSorting.Rd
diff --git a/man/doTheEvolution.Rd b/man/doTheEvolution.Rd
diff --git a/man/dominated.Rd b/man/dominated.Rd
diff --git a/man/dominated_hypervolume.Rd b/man/dominated_hypervolume.Rd
diff --git a/man/dominates.Rd b/man/dominates.Rd
diff --git a/man/ecr.Rd b/man/ecr.Rd
diff --git a/man/ecr_parallelization.Rd b/man/ecr_parallelization.Rd
diff --git a/man/ecr_result.Rd b/man/ecr_result.Rd
diff --git a/man/ecrpackage.Rd b/man/ecrpackage.Rd
diff --git a/man/emoa_indicators.Rd b/man/emoa_indicators.Rd
diff --git a/man/evaluateFitness.Rd b/man/evaluateFitness.Rd
diff --git a/man/evolutionary_setters.Rd b/man/evolutionary_setters.Rd
diff --git a/man/generateOffspring.Rd b/man/generateOffspring.Rd
diff --git a/man/getAvailableEventNames.Rd b/man/getAvailableEventNames.Rd
diff --git a/man/getEvaluations.Rd b/man/getEvaluations.Rd
diff --git a/man/getGenerations.Rd b/man/getGenerations.Rd
diff --git a/man/getNextGeneration.Rd b/man/getNextGeneration.Rd
diff --git a/man/getOperatorName.Rd b/man/getOperatorName.Rd
diff --git a/man/getOperatorParameters.Rd b/man/getOperatorParameters.Rd
diff --git a/man/getSupportedRepresentations.Rd b/man/getSupportedRepresentations.Rd
diff --git a/man/is.supported.Rd b/man/is.supported.Rd
diff --git a/man/isEcrOperator.Rd b/man/isEcrOperator.Rd
diff --git a/man/makeGenerator.Rd b/man/makeGenerator.Rd
diff --git a/man/makeMonitor.Rd b/man/makeMonitor.Rd
diff --git a/man/makeMutator.Rd b/man/makeMutator.Rd
diff --git a/man/makeOperator.Rd b/man/makeOperator.Rd
diff --git a/man/makeOptimizationTask.Rd b/man/makeOptimizationTask.Rd
diff --git a/man/makePopulation.Rd b/man/makePopulation.Rd
diff --git a/man/makeRecombinator.Rd b/man/makeRecombinator.Rd
diff --git a/man/makeSelector.Rd b/man/makeSelector.Rd
diff --git a/man/makeTerminator.Rd b/man/makeTerminator.Rd
diff --git a/man/mergePopulations.Rd b/man/mergePopulations.Rd
diff --git a/man/normalizeFront.Rd b/man/normalizeFront.Rd
diff --git a/man/nsga2.Rd b/man/nsga2.Rd
diff --git a/man/onePlusOneGA.Rd b/man/onePlusOneGA.Rd
diff --git a/man/print.ecr_control.Rd b/man/print.ecr_control.Rd
diff --git a/man/reference_point_approximation.Rd b/man/reference_point_approximation.Rd
diff --git a/man/registerAction.Rd b/man/registerAction.Rd
diff --git a/man/rescalePoints.Rd b/man/rescalePoints.Rd