rebase and small stuff

Author: ja-thomas

R/infillOptFocus.R

@@ -89,14 +89,14 @@ infillOptFocus = function(infill.crit, models, control, par.set, opt.path, desig
            }
          } else if (isDiscrete(par)) {
            # randomly drop a level, which is not val
-           if (length(par$values) <= 1L) {
+           if (length(par$values) == 1L) {
              return(par)
            }
            # need to do some magic to handle discrete vectors
            if (par$type %nin% c("discretevector", "logicalvector")) {
              val.names = names(par$values)
              # remove current val from delete options, should work also for NA
-             val.names = val.names[!sapply(par$values, identical, y=val)]  # remember, 'val' can be any type
+             val.names = val.names[!vlapply(par$values, identical, y=val)]  # remember, 'val' can be any type
              to.del = sample(val.names, 1)
              par$values[[to.del]] = NULL
            } else {

tests/testthat/test_infill_opt_focus.R

@@ -64,9 +64,9 @@ test_that("complex param space, dependencies, focusing, restarts", {
       if(x$disc2 == 'a') tmp3 = log(x$realA) + x$intA^4 + ifelse(x$discA == 'm', 5, 0)
       if(x$disc2 == 'b') tmp3 = exp(x$realB) + ifelse(x$discB == 'R', sin(x$realBR), sin(x$realBNR))
       if(x$disc2 == "c") tmp3 = 500
-      assert(is.list(x$discVec))
-      assert(x$discVec[[1]] %in% c("a", "b", "c"))
-      assert(x$discScal %in% c("x", "y", "z"))
+      expect_list(x$discVec)
+      expect_subset(x$discVec[[1]], c("a", "b", "c"))
+      expect_subset(x$discScal, c("x", "y", "z"))
       tmp1 + tmp2 + tmp3
     },
     par.set = makeParamSet(