do not use deprecated checkmate functions

mlr-org · Jun 2, 2017 · e233aa7 · e233aa7
1 parent 4fab041
commit e233aa7
Show file tree

Hide file tree

Showing 72 changed files with 31 additions and 102 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -20,7 +20,7 @@ License: BSD_2_clause + file LICENSE
 Roxygen: list(wrap = FALSE)
 Imports:
     BBmisc (>= 1.10),
-    checkmate (>= 1.8.1),
+    checkmate (>= 1.8.2),
     methods
 Suggests:
     akima,
@@ -38,4 +38,4 @@ Suggests:
 LazyData: yes
 ByteCompile: yes
 Version: 1.11
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1
diff --git a/R/generateGridDesign.R b/R/generateGridDesign.R
@@ -62,8 +62,7 @@ generateGridDesign = function(par.set, resolution, trafo = FALSE) {
     if (isScalarNumeric(resolution)) {
       resolution = setNames(rep(resolution, length(pids.num)), pids.num)
     }
-    resolution = asInteger(resolution, lower = 1L, len = length(pids.num))
-    assertNamed(resolution, type = "named")
+    resolution = asInteger(resolution, lower = 1L, len = length(pids.num), names = "named")
     if (!all(names(resolution) %in% pids.num))
       stop("'resolution' must be named with parameter ids!")
   }

diff --git a/R/isRequiresOk.R b/R/isRequiresOk.R
@@ -15,8 +15,7 @@
 #' @export
 isRequiresOk = function(par.set, par.vals, ids = names(par.vals), use.defaults = TRUE) {
   assertClass(par.set, "ParamSet")
-  assertList(par.vals)
-  assertNamed(par.vals)
+  assertList(par.vals, names = "named")
   if (is.numeric(ids))
     assertInteger(ids, lower = 1L, upper = length(par.vals), unique = TRUE)
   else

diff --git a/man/LearnerParam.Rd b/man/LearnerParam.Rd
diff --git a/man/OptPath.Rd b/man/OptPath.Rd
diff --git a/man/Param.Rd b/man/Param.Rd
diff --git a/man/addOptPathEl.Rd b/man/addOptPathEl.Rd
diff --git a/man/as.data.frame.OptPathDF.Rd b/man/as.data.frame.OptPathDF.Rd
diff --git a/man/checkParamSet.Rd b/man/checkParamSet.Rd
diff --git a/man/convertParamSetToIrace.Rd b/man/convertParamSetToIrace.Rd
diff --git a/man/dfRowsToList.Rd b/man/dfRowsToList.Rd
diff --git a/man/discreteNameToValue.Rd b/man/discreteNameToValue.Rd
diff --git a/man/discreteValueToName.Rd b/man/discreteValueToName.Rd
diff --git a/man/dropParams.Rd b/man/dropParams.Rd
diff --git a/man/evaluateParamExpressions.Rd b/man/evaluateParamExpressions.Rd
diff --git a/man/filterParams.Rd b/man/filterParams.Rd
diff --git a/man/generateDesign.Rd b/man/generateDesign.Rd
diff --git a/man/generateDesignOfDefaults.Rd b/man/generateDesignOfDefaults.Rd
diff --git a/man/generateGridDesign.Rd b/man/generateGridDesign.Rd
diff --git a/man/generateRandomDesign.Rd b/man/generateRandomDesign.Rd
diff --git a/man/getDefaults.Rd b/man/getDefaults.Rd
diff --git a/man/getLower.Rd b/man/getLower.Rd
diff --git a/man/getOptPathBestIndex.Rd b/man/getOptPathBestIndex.Rd
diff --git a/man/getOptPathCol.Rd b/man/getOptPathCol.Rd
diff --git a/man/getOptPathCols.Rd b/man/getOptPathCols.Rd
diff --git a/man/getOptPathDOB.Rd b/man/getOptPathDOB.Rd
diff --git a/man/getOptPathEOL.Rd b/man/getOptPathEOL.Rd
diff --git a/man/getOptPathEl.Rd b/man/getOptPathEl.Rd
diff --git a/man/getOptPathErrorMessages.Rd b/man/getOptPathErrorMessages.Rd
diff --git a/man/getOptPathExecTimes.Rd b/man/getOptPathExecTimes.Rd
diff --git a/man/getOptPathLength.Rd b/man/getOptPathLength.Rd
diff --git a/man/getOptPathParetoFront.Rd b/man/getOptPathParetoFront.Rd
diff --git a/man/getOptPathX.Rd b/man/getOptPathX.Rd
diff --git a/man/getOptPathY.Rd b/man/getOptPathY.Rd
diff --git a/man/getParamIds.Rd b/man/getParamIds.Rd
diff --git a/man/getParamLengths.Rd b/man/getParamLengths.Rd
diff --git a/man/getParamNr.Rd b/man/getParamNr.Rd
diff --git a/man/getParamSet.Rd b/man/getParamSet.Rd
diff --git a/man/getParamTypeCounts.Rd b/man/getParamTypeCounts.Rd
diff --git a/man/getParamTypes.Rd b/man/getParamTypes.Rd
diff --git a/man/getRequirements.Rd b/man/getRequirements.Rd
diff --git a/man/getTypeStrings.Rd b/man/getTypeStrings.Rd
diff --git a/man/hasExpression.Rd b/man/hasExpression.Rd
diff --git a/man/hasForbidden.Rd b/man/hasForbidden.Rd
diff --git a/man/hasRequires.Rd b/man/hasRequires.Rd
diff --git a/man/hasTrafo.Rd b/man/hasTrafo.Rd
diff --git a/man/hasType.Rd b/man/hasType.Rd
diff --git a/man/isEmpty.Rd b/man/isEmpty.Rd
diff --git a/man/isFeasible.Rd b/man/isFeasible.Rd
diff --git a/man/isForbidden.Rd b/man/isForbidden.Rd
diff --git a/man/isRequiresOk.Rd b/man/isRequiresOk.Rd
diff --git a/man/isSpecialValue.Rd b/man/isSpecialValue.Rd