Skip to content

Commit

Permalink
Merge branch 'main' into moo
Browse files Browse the repository at this point in the history
  • Loading branch information
sumny committed Jan 23, 2022
2 parents 744710f + 6549303 commit 1f59e13
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 6 deletions.
1 change: 0 additions & 1 deletion R/AcqFunctionAEI.R
Expand Up @@ -46,7 +46,6 @@ AcqFunctionAEI = R6Class("AcqFunctionAEI",
#' @description
#' Updates acquisition function and sets `y_effective_best`.
update = function() {
super$update()
xdt = self$archive$data[, self$archive$cols_x, with = FALSE]
p = self$surrogate$predict(xdt)
if (self$surrogate_max_to_min == 1) { # minimization
Expand Down
1 change: 0 additions & 1 deletion R/AcqFunctionEI.R
Expand Up @@ -32,7 +32,6 @@ AcqFunctionEI = R6Class("AcqFunctionEI",
#' @description
#' Updates acquisition function and sets `y_best`.
update = function() {
super$update()
self$y_best = min(self$surrogate_max_to_min * self$archive$data[[self$surrogate$y_cols]])
}
),
Expand Down
1 change: 0 additions & 1 deletion R/AcqFunctionEIPS.R
Expand Up @@ -42,7 +42,6 @@ AcqFunctionEIPS = R6Class("AcqFunctionEIPS",
#' @description
#' Updates acquisition function and sets `y_best`.
update = function() {
super$update()
self$y_best = min(self$surrogate_max_to_min[[self$y_col]] * self$archive$data[[self$y_col]])
}
),
Expand Down
1 change: 0 additions & 1 deletion R/AcqFunctionPI.R
Expand Up @@ -33,7 +33,6 @@ AcqFunctionPI = R6Class("AcqFunctionPI",
#' @description
#' Updates acquisition function and sets `y_best`.
update = function() {
super$update()
self$y_best = min(self$surrogate_max_to_min * self$archive$data[[self$surrogate$y_cols]])
}
),
Expand Down
2 changes: 0 additions & 2 deletions R/AcqFunctionSmsEgo.R
Expand Up @@ -69,8 +69,6 @@ AcqFunctionSmsEgo = R6Class("AcqFunctionSmsEgo",
stop("progress is not set.") # needs self$progress here! Originally self$instance$terminator$param_set$values$n_evals - archive$n_evals
}

super$update()

n_obj = length(self$archive$cols_y)
ys = self$archive$data[, self$archive$cols_y, with = FALSE]
ys = as.matrix(ys) %*% diag(self$surrogate_max_to_min)
Expand Down

0 comments on commit 1f59e13

Please sign in to comment.