New Upstream Snapshot - r-cran-paramhelpers
Ready changes
Summary
Merged new upstream version: 1.14.1+git20221025.1.79ae4f2 (was: 1.14.1).
Resulting package
Built on 2023-01-19T14:45 (took 6m35s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots r-cran-paramhelpers-dbgsymapt install -t fresh-snapshots r-cran-paramhelpers
Lintian Result
- r-cran-paramhelpers-dbgsym_1.14.1+git20221025.1.79ae4f2-1~jan+nus2_amd64.deb
- r-cran-paramhelpers_1.14.1+git20221025.1.79ae4f2-1~jan+nus2.dsc
- r-cran-paramhelpers_1.14.1+git20221025.1.79ae4f2-1~jan+nus2_amd64.buildinfo
- r-cran-paramhelpers_1.14.1+git20221025.1.79ae4f2-1~jan+nus2_amd64.deb
- r-cran-paramhelpers_1.14.1+git20221025.1.79ae4f2-1~jan+nus2_amd64.changes
Diff
diff --git a/DESCRIPTION b/DESCRIPTION
index 5553036..2f216de 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: ParamHelpers
Title: Helpers for Parameters in Black-Box Optimization, Tuning and
Machine Learning
-Version: 1.14.1
+Version: 1.14-9000
Authors@R:
c(person(given = "Bernd",
family = "Bischl",
@@ -34,24 +34,27 @@ Authors@R:
family = "Kerschke",
role = "aut",
email = "kerschke@uni-muenster.de"))
-Description: Functions for parameter descriptions and operations
- in black-box optimization, tuning and machine learning. Parameters can
- be described (type, constraints, defaults, etc.), combined to
- parameter sets and can in general be programmed on. A useful OptPath
- object (archive) to log function evaluations is also provided.
+Description: Functions for parameter descriptions and operations in
+ black-box optimization, tuning and machine learning. Parameters can be
+ described (type, constraints, defaults, etc.), combined to parameter
+ sets and can in general be programmed on. A useful OptPath object
+ (archive) to log function evaluations is also provided.
License: BSD_2_clause + file LICENSE
URL: https://paramhelpers.mlr-org.com,
https://github.com/mlr-org/ParamHelpers
BugReports: https://github.com/mlr-org/ParamHelpers/issues
Imports: backports, BBmisc (>= 1.10), checkmate (>= 1.8.2), fastmatch,
methods
-Suggests: interp, covr, eaf, emoa, GGally, ggplot2, grid, gridExtra,
+Suggests: akima, covr, eaf, emoa, GGally, ggplot2, grid, gridExtra,
irace (>= 2.1), lhs, plyr, reshape2, testthat
ByteCompile: yes
+Config/testthat/edition: 3
+Config/testthat/parallel: true
Encoding: UTF-8
-RoxygenNote: 7.1.0
+Roxygen: list(markdown = TRUE)
+RoxygenNote: 7.1.2
NeedsCompilation: yes
-Packaged: 2022-07-04 09:34:57 UTC; ripley
+Packaged: 2023-01-19 14:42:51 UTC; root
Author: Bernd Bischl [aut] (<https://orcid.org/0000-0001-6002-6980>),
Michel Lang [aut] (<https://orcid.org/0000-0001-9754-0393>),
Jakob Richter [cre, aut] (<https://orcid.org/0000-0003-4481-5554>),
@@ -60,5 +63,3 @@ Author: Bernd Bischl [aut] (<https://orcid.org/0000-0001-6002-6980>),
Karin Schork [ctb],
Pascal Kerschke [aut]
Maintainer: Jakob Richter <code@jakob-r.de>
-Repository: CRAN
-Date/Publication: 2022-07-04 11:29:28 UTC
diff --git a/MD5 b/MD5
deleted file mode 100644
index c8daf7b..0000000
--- a/MD5
+++ /dev/null
@@ -1,181 +0,0 @@
-659479ce441a2de0ffd15dcb5e703a26 *DESCRIPTION
-6d62c17754c6c23eb1de160c2004968e *LICENSE
-cd99a6da61285b73913abec0fd05dbb1 *NAMESPACE
-26d9635eee92c8359cc2504759b4bbc4 *NEWS.md
-7b66a8547ca9172607e3809b79a85e5b *R/LearnerParam.R
-d2371bbc84f482fc8c813fdfff9c3ff2 *R/OptPath.R
-407c74bf14841cec7519947ee87fbd2e *R/OptPathDF.R
-4ef75cf2a080cd44e46e6b2bdaefba58 *R/OptPathDF_as_data_frame.R
-3ca41ee81f28fb96640f1bb96a75b1b9 *R/OptPathDF_getter.R
-3bca1a14ec8e9f62524b71ce9d62be4f *R/OptPathDF_setter.R
-06ed5e5f92a6eb8cd7fff5cc555f0f84 *R/OptPath_getter.R
-e180d1bc19036878d4b641f0a09ebbb1 *R/OptPath_plotEAF.R
-65e905b5296e66f6258effe92e816adf *R/OptPath_plotYTraces.R
-ad34ecac9515ad745e2a9f59fb5b7f9f *R/OptPath_plotter.R
-9024dae19dfd16bc5256acd1d3fb054a *R/OptPath_setter.R
-2bb1d6f7b6579a02697fb27d4d19c7c9 *R/ParamSet.R
-d8f3ad12927d7eaa225a40300611f356 *R/aParam.R
-2a0a82d6cc3197f8e870f8a09948d699 *R/checkParamSet.R
-89e3359f6c9ba19c7316d09ad848d069 *R/convertDiscrete.R
-d45d00387959d6b9514a08da5a1f2f6f *R/convertParamSetToIrace.R
-165d0b953e127cd9c69c9d161f83d339 *R/convertTypesToCInts.R
-31f789de30f54efcec4a7770167808ba *R/dfRowsToList.R
-d0e4e0ce5506bceb4732e012f5202933 *R/dropParams.R
-1295c5e9b3c46d0ecc9798a0fe29e047 *R/evaluateParamExpressions.R
-ce87bd90d8e7c29b382700ec8dbcddd3 *R/filterParams.R
-d924eda36b76fcfec786dc010cfc9389 *R/generateDesign.R
-8f56ff6fef8aaef9b896d201b6e90945 *R/generateDesignOfDefaults.R
-1a29fdf9c0a546beb851ce869904d896 *R/generateGridDesign.R
-7e47028a9aeae084df32784c97a1c7b1 *R/generateRandomDesign.R
-816338c83f32f06cef722a99b20cfde5 *R/getBounds.R
-2eb29b9a06c5aa2db7f99195c24f86c9 *R/getDefaults.R
-d34191a8a6616f63cd5587e2e7dfe6b4 *R/getParamIds.R
-c234e388f56181ae5bd243fe60f3b873 *R/getParamLengths.R
-56a2711eea5ac7ea076595c306fc7bf4 *R/getParamNr.R
-9f079c346504c761c6e3b5ab9d950f58 *R/getParamSet.R
-d8f2fd2717b33786ff64a6510fb213ba *R/getParamTypeCounts.R
-da282b9bf042f3f7d92187881601db17 *R/getParamTypes.R
-84933ed3f5184ebae96153a32bdb86aa *R/getRequiredParamNames.R
-10c7727caadc7eebefaaccae46140fe3 *R/getRequirements.R
-49d69ce15741d11f5d4ae5d84af1e94d *R/getTypeStrings.R
-2ca839ce3b194800e8cb303f63298d36 *R/hasExpression.R
-4314bcc23aace0d0f241b760821db4c1 *R/hasFiniteBoxConstraints.R
-7ae41506886f2f26cba23c28c86e3d11 *R/hasForbidden.R
-6618740d7e8dfa826b1dab862ff7ec82 *R/hasRequires.R
-c4ddff6edcbad5c06d9024fe53e83284 *R/hasTrafo.R
-b75eafcbcb756d87569a76d8711e004f *R/hasType.R
-d3395acde8b638f554690a3c8057e62e *R/isFeasible.R
-1068ed2a736baac3b371747dd60dc1ce *R/isForbidden.R
-843cd1faca6e0ab757690b22c7553793 *R/isRequiresOk.R
-9d4f2e8a03d542bacf1c371027d06535 *R/isSpecialValue.R
-a66cbf9b9717f0eec763d2c5232b7434 *R/isType.R
-28b3f8680cfe0633af5fba24d451bf22 *R/isTypeString.R
-ae15aed569541a453528a93eeec82625 *R/isVector.R
-7e7edb0a272366110c65c90af698abe3 *R/listToDfOneRow.R
-f73d3d4aeec4e0cfbe9f59ea1cd52a7f *R/makeLearnerParamFuns.R
-64674a98520cc73c7878fc3423624def *R/makeParamFuns.R
-560b52289b49dfde76381ab4914ed8e2 *R/paramValueToString.R
-8087a8295d6c0bf96c1b1d7d37489231 *R/removeMissingValues.R
-1bde90e3c42c739e0f471650b9ef9600 *R/renderOptPathPlot.R
-1c8724972d5254bfbfc6f69a46a65023 *R/renderOptPathPlot_helpers.R
-663d6fc64f506135361ab1539be748a6 *R/renderOptPathPlot_workers.R
-d063288413dfd635fe8b45b0e0a98145 *R/repairPoint.R
-5cc516b9f23cd978f30727c8600989ba *R/sample.R
-0a7974d5b1e0cc2c6ea9cc6287ee39e5 *R/setValueCNames.R
-717512938f1eb229b2b06904e4b8cbdb *R/trafo.R
-4f3eaa07f9217d05a9e6e87b83165d96 *R/updateParVals.R
-3ed01fbe9db2c9342578cb04e4c78a9b *R/utils.R
-e54402ad4a77ab7ee61f5494f100b963 *R/zzz.R
-37ff1801a409dacb00b7dac6144d9c2d *man/LearnerParam.Rd
-e85a47cca531c973d1a55608d7b9e246 *man/OptPath.Rd
-dbf0ccc6bd64bd319107839578893f08 *man/Param.Rd
-1bfd30f6077c666d7ee21e2ab20ce1b6 *man/addOptPathEl.Rd
-e8dca8bd456265b6ba2478d3c7de9077 *man/as.data.frame.OptPathDF.Rd
-8e2c8ec8d138b604cfda4fc77d57b560 *man/checkParamSet.Rd
-77eb45b65f015686e7e3adebb006a651 *man/convertParamSetToIrace.Rd
-18db72a8c226d6693842266633bd04ea *man/dfRowsToList.Rd
-13c0723d3ab2b30d9bcf7fd950808d12 *man/discreteNameToValue.Rd
-4b1035c7cc4a36542f5990d17075ecfc *man/discreteValueToName.Rd
-e8f21e5c2cd7bd9b8365b21856676df9 *man/dropParams.Rd
-ae224adecc1f81e4ae1784eb2fcfa4b5 *man/evaluateParamExpressions.Rd
-effe96d54bead04806c7f9b803601b4a *man/filterParams.Rd
-f9c1283afd216d67961217cfa1366559 *man/generateDesign.Rd
-eee62bc85b11d02b98f54b94f4dd8157 *man/generateDesignOfDefaults.Rd
-441fe78dc5ebcb4cdf1c6eb2eb47692c *man/generateGridDesign.Rd
-1006e0d5d4cd8e082b0bfdb4bdb8c326 *man/generateRandomDesign.Rd
-e3839fc1445449c0ff5ad1942bf4ebca *man/getDefaults.Rd
-3594d7583915c6685627f31176a94638 *man/getLower.Rd
-a9cc528f3530445bf50b372d8a4ae1cb *man/getOptPathBestIndex.Rd
-e7c2e090d331628306ca6cf6a193800b *man/getOptPathCol.Rd
-bb75fd1285f2457d8ed0e556cc440248 *man/getOptPathCols.Rd
-6962fc83565158e7c55e22978b6b88cd *man/getOptPathDOB.Rd
-7c7b5e87cb3af7ec32d7e5b73d42cdf6 *man/getOptPathEOL.Rd
-5d78b240761003f2e4ecb715e13183c5 *man/getOptPathEl.Rd
-71ff5784efa8d003e86378fea781b6fe *man/getOptPathErrorMessages.Rd
-401a91c1e99e0b82c0fc151fc0ec0242 *man/getOptPathExecTimes.Rd
-1f1d7dbd8b467af4305b078083076492 *man/getOptPathLength.Rd
-f4f1463ea74f90f33a68d66169b52511 *man/getOptPathParetoFront.Rd
-a96160e05d00e9b4b717e8bdee95b7f0 *man/getOptPathX.Rd
-7e2b3044eb0ec0356783488bed6c41d9 *man/getOptPathY.Rd
-73c4b0a08b7f7739b15d53ffdc0f698e *man/getParamIds.Rd
-9cb3030260e5901364f78bebc871de69 *man/getParamLengths.Rd
-0b6cb98702ed81e5f2d229adad6b090b *man/getParamNr.Rd
-87f3579d643169696294a9fe19d342bc *man/getParamSet.Rd
-26eac96ea6f578ac18af528f1be5d219 *man/getParamTypeCounts.Rd
-82a281b457eeca354ffd0e7b4da4f6b6 *man/getParamTypes.Rd
-4a222c4385594ba448cc9d13136fbe50 *man/getRequirements.Rd
-6f7dc5ca442b82fe2665cee82d106296 *man/getTypeStrings.Rd
-5f83cc5af2692fcaee3ab6144441403f *man/hasExpression.Rd
-e19cad6229e913fbe0131aefd925b7cc *man/hasFiniteBoxConstraints.Rd
-35050d6f2f0bf689b5b3fdf135b33873 *man/hasForbidden.Rd
-582029a92d82de013cb6ea75f1dd71aa *man/hasRequires.Rd
-43c969d76acc9cd0dfee928f2fcd4178 *man/hasTrafo.Rd
-1cf2ce9f4ac6324817898138f7287dbf *man/hasType.Rd
-afe0714984bbe83e6532212e44d6eba3 *man/isEmpty.Rd
-5ad0fdddaec95753c075f6bf0d4d8d17 *man/isFeasible.Rd
-1c80d555cc65a127ceb8803470aa4425 *man/isForbidden.Rd
-c70588d6f2bc1a3d16378391354c7039 *man/isRequiresOk.Rd
-6fddf781a02d08d8fe9059a17de3aaa6 *man/isSpecialValue.Rd
-2d6a82f77cdebb8f97718509032ae3da *man/isType.Rd
-0931bec166bc26d62392f5da10281f4c *man/isTypeString.Rd
-4fece3dd393a827ecc45b51ad8b8f747 *man/isVector.Rd
-b3340f1604b409e65a5775ae486f27ae *man/listToDfOneRow.Rd
-21b76ed7a0f9de2ebb78ee5e89019d63 *man/makeParamSet.Rd
-b0d25ac4f91e105c4e4c259d38f46c68 *man/paramValueToString.Rd
-a9908ff27e100789ad303204d329d659 *man/plotEAF.Rd
-1fc082c8eebb67b5f70974ddce02ab3e *man/plotOptPath.Rd
-25ab6001ce2621660a6fc6720436ead6 *man/plotYTraces.Rd
-bd5033f7e277dd5bf6fcb3b7e0939212 *man/removeMissingValues.Rd
-34202b1e88325837896ef555568cd057 *man/renderOptPathPlot.Rd
-f0c819174674069227e5dd9c93c5d2cc *man/renderYTraces.Rd
-497cb777a2c14d396082daae5fcdf6d3 *man/repairPoint.Rd
-47435d93c8b9904dd8ccbb19a4ce2f46 *man/sampleValue.Rd
-43df522e75cd6a907792bea77d8e42b3 *man/sampleValues.Rd
-ee123668a6b98a8d9226344106accf7e *man/setOptPathElDOB.Rd
-659fe5a0db624cab5887ddc70d4fc500 *man/setOptPathElEOL.Rd
-69910b5b5c6ce146df484c10c3965bef *man/setValueCNames.Rd
-83fa515b5be78760417fa5746f5a954c *man/trafoOptPath.Rd
-3c10c67f8fc96707a080fe4d57bce507 *man/trafoValue.Rd
-d5b882163900b0f3ef402ebc06d54366 *man/updateParVals.Rd
-7ad010d3392781d3f82ffad741af6a76 *src/c_dfRowsToList.c
-96b3056a7b4def6007172ecff32e738f *src/init.c
-7d247dc5379c71c326956bd2c10b3b28 *tests/run-all.R
-4dd8da7b525b1fd255a514b0f57fd984 *tests/testthat/Rplots.pdf
-5c2824a8ec0dd6207be1b0eead24b969 *tests/testthat/helper_zzz.R
-2492625465e84b4da8dd78598e0a0cd3 *tests/testthat/test_LearnerParam.R
-a5692236ce56d855be8b2735abee19b2 *tests/testthat/test_OptPath.R
-fc4068e6c6fa85dcbae170260e778339 *tests/testthat/test_Param.R
-a70184dd697e1cebb4b1aebfeb03a51a *tests/testthat/test_ParamSet.R
-cc80d409f99c8912a5c28780716ba0df *tests/testthat/test_cnames.R
-69d06b3ed480e0be665d08c1eb157675 *tests/testthat/test_convertDiscrete.R
-6fb50b89f84f9afb4ca4eff98cd5e908 *tests/testthat/test_convertParamSetToIrace.R
-bd9b81a4e8b9ec6ee72b0d1e71990183 *tests/testthat/test_dfRowToList.R
-2dc5f315b3cf14ba2fe6f7d8170de1ad *tests/testthat/test_dropParams.R
-768a302d845503c5483dcc6256d8e4da *tests/testthat/test_evaluateParamExpressions.R
-d77751092b704bf8387087037d48e54d *tests/testthat/test_filterParams.R
-79c696049efee6e7fe864ac35965cb64 *tests/testthat/test_forbidden.R
-9b65419edf86025bdc7797ae04d41e3f *tests/testthat/test_generateDesign.R
-faa0613b48423d1f1b631a9a07547085 *tests/testthat/test_generateDesignOfDefaults.R
-5bc1362feef9428f7024507d16403d81 *tests/testthat/test_generateGridDesign.R
-fcff861dbb859f27a889bdb03f7327fd *tests/testthat/test_generateRandomDesign.R
-0e00445dc63d14869f42d33c3a430047 *tests/testthat/test_getDefaults.R
-77fb3f676858d9f2b0f88a5a35077ecf *tests/testthat/test_getParamNr.R
-400bf7d864b7931501e0ef07405dd153 *tests/testthat/test_getParamTypeCounts.R
-d1d7550e963cad551375bf835c86e456 *tests/testthat/test_getParamTypes.R
-b855c8d700fcaee898c0efcb98c33982 *tests/testthat/test_getRequiredParamNames.R
-acc0e49c5d35db2e209baa11d942e7c8 *tests/testthat/test_getRequirements.R
-1d5d795790a51106bca662ed5d4b8442 *tests/testthat/test_hasExpression.R
-03738e8b38f64a66e83aeeabc4c19705 *tests/testthat/test_hasFiniteBoxConstraints.R
-edb448edbf1007bdd1a15e8db96446f2 *tests/testthat/test_hasIsType.R
-492d2b566092bcb0c08a33dbfc9b9664 *tests/testthat/test_hasRequires.R
-054d42295b5fa82cca703b574a77f6b3 *tests/testthat/test_isFeasible.R
-66742ba7449a55794f6fba59e3d03eed *tests/testthat/test_isSpecialValue.R
-cd4063e88a67f217f15fabf0098933ac *tests/testthat/test_isVector.R
-856935ca5211a27e106d33eb3b837ffa *tests/testthat/test_paramValueToString.R
-6bfe0e97c65c2f1087b700de9a199cb4 *tests/testthat/test_plotEAF.R
-04d13a44aa43c99f9da4e1ba50bac3b0 *tests/testthat/test_plotYTrace.R
-bfa28a66c1b0de9096d71e625f4051c8 *tests/testthat/test_renderOptPathPlot.R
-a8160bd26188d83a3ad6f0e960af0d7b *tests/testthat/test_repairPoint.R
-632df43a0ea75905275cc2f5782b9e6c *tests/testthat/test_sample.R
-e5e2aea03a3673f106a534d83af86fa0 *tests/testthat/test_trafo.R
-285a1987b554767657ede2a87ed329f6 *tests/testthat/test_updateParVals.R
diff --git a/R/ParamSet.R b/R/ParamSet.R
index 4cf14ee..b0f75b8 100644
--- a/R/ParamSet.R
+++ b/R/ParamSet.R
@@ -170,7 +170,6 @@ makeNumericParamSet = function(id = "x", len, lower = -Inf, upper = Inf, vector
} else {
return(makeParamSet(params = lapply(1:len, function(i) {
makeNumericParam(id = paste(id, i, sep = ""), lower = lower[i], upper = upper[i])
- })
- ))
+ })))
}
}
diff --git a/R/evaluateParamExpressions.R b/R/evaluateParamExpressions.R
index d886be2..909a8f2 100644
--- a/R/evaluateParamExpressions.R
+++ b/R/evaluateParamExpressions.R
@@ -3,12 +3,12 @@
#' @description Evaluates the expressions of a parameter, parameter set or list
#' of parameters for a given dictionary.
#'
-#' @param obj ([Param()] | [ParamHelpers::ParamSet()] | `list`)\cr
+#' @param obj ([Param()] | `ParamHelpers::ParamSet()` | `list`)\cr
#' Parameter, parameter set or list of parameter values. Expressions within
#' `len`, `lower` or `upper` boundaries, `default` or `values` will be
#' evaluated using the provided dictionary (`dict`).
#' @template arg_dict
-#' @return [[Param()] | [ParamHelpers::ParamSet()] | `list`].
+#' @return [[Param()] | `ParamHelpers::ParamSet()` | `list`].
#' @export
#' @examples
#' ps = makeParamSet(
diff --git a/R/generateDesign.R b/R/generateDesign.R
index 4e04e7e..9acaa07 100644
--- a/R/generateDesign.R
+++ b/R/generateDesign.R
@@ -140,16 +140,16 @@ generateDesign = function(n = 10L, par.set, fun, fun.args = list(), trafo = FALS
getMapping = function(i) {
# Numeric
if (types.df[i] == "numeric") {
- newdes[,i] * (upper2[i] - lower2[i]) + lower2[i]
+ newdes[, i] * (upper2[i] - lower2[i]) + lower2[i]
} else if (types.df[i] == "integer") {
- # Integer
- as.integer(floor(newdes[,i] * ((upper2[i] - lower2[i]) + 1L) * (1 - 1e-16)) + lower2[i])
- # Logic
+ # Integer
+ as.integer(floor(newdes[, i] * ((upper2[i] - lower2[i]) + 1L) * (1 - 1e-16)) + lower2[i])
+ # Logic
} else if (types.df[i] == "logical") {
- newdes[,i] < 0.5
- # Discrete
+ newdes[, i] < 0.5
+ # Discrete
} else if (types.df[i] == "character") {
- values[[i]][floor(newdes[,i] * length(values[[i]]) * (1 - 1e-16)) + 1]
+ values[[i]][floor(newdes[, i] * length(values[[i]]) * (1 - 1e-16)) + 1]
} else {
stopf("%s for Param %s is an unsupported type.", types.df[i], pids[i])
}
@@ -270,7 +270,7 @@ setRequiresToNA = function(res, pars, par.ids.each = NULL, par.nas.each = NULL,
} else {
# unfortunately we allowed requirements to be not vectorized
set.to.na = !vapply(seq_len(nrow(res)), function(i) {
- eval(req, res[i,])
+ eval(req, res[i, ])
}, FUN.VALUE = logical(1))
}
set.to.na = set.to.na & !is.na(res[[par.ids.each[[par$id]][1]]])
diff --git a/R/getParamSet.R b/R/getParamSet.R
index 7832c83..63eb0c1 100644
--- a/R/getParamSet.R
+++ b/R/getParamSet.R
@@ -5,7 +5,7 @@
#'
#' @param x (`object`) \cr
#' Object to extract the ParamSet from.
-#' @return [ParamHelpers::ParamSet()]
+#' @return `ParamHelpers::ParamSet()`
#' @export
getParamSet = function(x) {
UseMethod("getParamSet")
diff --git a/R/hasExpression.R b/R/hasExpression.R
index 4efc2d6..8999892 100644
--- a/R/hasExpression.R
+++ b/R/hasExpression.R
@@ -2,7 +2,7 @@
#'
#' @description Checks if a parameter, parameter set or list of parameters
#' contain expressions.
-#' @param obj ([Param()] | [ParamHelpers::ParamSet()] | `list`)\cr
+#' @param obj ([Param()] | `ParamHelpers::ParamSet()` | `list`)\cr
#' Parameter, parameter set or list of parameters.
#' @return `logical(1)`.
#' @examples
diff --git a/R/renderOptPathPlot_helpers.R b/R/renderOptPathPlot_helpers.R
index 3a6f68c..d21be51 100644
--- a/R/renderOptPathPlot_helpers.R
+++ b/R/renderOptPathPlot_helpers.R
@@ -160,10 +160,10 @@ getOptPathLims = function(xlim, ylim, op.x, op.y, iters, scale) {
imputeMissingValues = function(x, impute.scale, impute.value) {
na.index = which(is.na(x))
if (length(na.index) > 0) {
- if (inherits(x, "numeric")) {
+ if (class(x) == "numeric") {
x[na.index] = max(x, na.rm = TRUE) + impute.scale * (diff(range(x, na.rm = TRUE)))
}
- if (inherits(x, "factor")) {
+ if (class(x) == "factor") {
levels(x) = c(levels(x), impute.value)
x[na.index] = impute.value
}
diff --git a/R/renderOptPathPlot_workers.R b/R/renderOptPathPlot_workers.R
index 0c01ae9..f4e9d00 100644
--- a/R/renderOptPathPlot_workers.R
+++ b/R/renderOptPathPlot_workers.R
@@ -59,7 +59,7 @@ plot1DNum = function(op, .alpha, .type, log, names, short.names,
} else {
pl = pl + ggplot2::coord_cartesian(xlim = xlim)
}
- pl = pl + ggplot2::guides(alpha = FALSE)
+ pl = pl + ggplot2::guides(alpha = "none")
pl = pl + ggplot2::scale_alpha_continuous(range = c(max(1 / (iter + 1), 0.1), 1L))
pl = pl + ggplot2::scale_colour_manual(name = "type",
values = c(init = colours[1L], seq = colours[2L], prop = colours[3L], marked = colours[4L]))
@@ -93,7 +93,7 @@ plot1DDisc = function(op, .alpha, .type, log, names, short.names,
pl = pl + ggplot2::scale_fill_manual(name = "type",
values = c(init = colours[1L], seq = colours[2L], prop = colours[3L], marked = colours[4L]))
pl = pl + ggplot.theme
- pl = pl + ggplot2::guides(alpha = FALSE)
+ pl = pl + ggplot2::guides(alpha = "none")
return(pl)
}
@@ -130,8 +130,8 @@ plot2D = function(op, .alpha, .type, log, names, short.names, y.name = NULL, op.
# prepare contour plot
if (!is.null(y.name)) {
- requirePackages(c("interp", "reshape2"), why = "renderOptPathPlot plot2D")
- fld = with(cbind(op, op.y), interp::interp(x = get(names[1L]), y = get(names[2L]), z = get(y.name)))
+ requirePackages(c("akima", "reshape2"), why = "renderOptPathPlot plot2D")
+ fld = with(cbind(op, op.y), akima::interp(x = get(names[1L]), y = get(names[2L]), z = get(y.name)))
df = reshape2::melt(fld$z, na.rm = TRUE)
names(df) = c(names, y.name)
df[[names[1L]]] = fld$x[df[[names[1L]]]]
@@ -147,7 +147,7 @@ plot2D = function(op, .alpha, .type, log, names, short.names, y.name = NULL, op.
}
pl = pl + title
pl = pl + ggplot2::xlab(short.names[1L]) + ggplot2::ylab(short.names[2L])
- pl = pl + ggplot2::guides(alpha = FALSE)
+ pl = pl + ggplot2::guides(alpha = "none")
pl = pl + ggplot2::scale_colour_manual(name = "type",
values = c(init = colours[1L], seq = colours[2L], prop = colours[3L], marked = colours[4L]))
pl = pl + ggplot2::scale_shape_manual(name = "type",
@@ -207,7 +207,7 @@ plotMultiD = function(op, .alpha, .type, log, names, short.names,
pl = pl + ggplot2::ylab("scaled values")
pl = pl + ggplot2::scale_x_discrete(labels = short.names)
pl = pl + title
- pl = pl + ggplot2::guides(alpha = FALSE, size = FALSE)
+ pl = pl + ggplot2::guides(alpha = "none", size = "none")
pl = pl + ggplot2::scale_colour_manual(name = "type",
values = c(init = colours[1L], seq = colours[2L], prop = colours[3L], marked = colours[4L]))
pl = pl + ggplot.theme
@@ -260,7 +260,7 @@ multiVariablesOverTime = function(op, .alpha, dob, log, names, short.names,
pl = pl + ggplot2::scale_x_continuous(breaks = function(x) pretty(x, n = min(5, iter + 1)))
# fixed number of decimals:
- fmt <- function() {
+ fmt = function() {
function(x) format(x, nsmall = 3, scientific = FALSE)
}
@@ -339,7 +339,7 @@ oneVariableOverTime = function(op, .alpha, .type, dob, log, names, short.names,
}
# fixed number of decimals:
- fmt <- function() {
+ fmt = function() {
function(x) format(x, nsmall = 3, scientific = FALSE)
}
@@ -349,7 +349,7 @@ oneVariableOverTime = function(op, .alpha, .type, dob, log, names, short.names,
pl = pl + ggplot2::scale_y_continuous(labels = fmt())
}
pl = pl + ggplot2::geom_vline(xintercept = 0.5)
- pl = pl + ggplot2::guides(alpha = FALSE)
+ pl = pl + ggplot2::guides(alpha = "none")
pl = pl + ggplot2::ylab(short.names)
pl = pl + ggplot2::scale_colour_manual(name = "type",
values = c(init = colours[1L], seq = colours[2L], prop = colours[3L], marked = colours[4L]))
diff --git a/debian/changelog b/debian/changelog
index 293d972..b70b896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+r-cran-paramhelpers (1.14.1+git20221025.1.79ae4f2-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 19 Jan 2023 14:42:55 -0000
+
r-cran-paramhelpers (1.14.1-1) unstable; urgency=medium
* New upstream version
diff --git a/man/evaluateParamExpressions.Rd b/man/evaluateParamExpressions.Rd
index d31aeee..0015a62 100644
--- a/man/evaluateParamExpressions.Rd
+++ b/man/evaluateParamExpressions.Rd
@@ -7,7 +7,7 @@
evaluateParamExpressions(obj, dict = NULL)
}
\arguments{
-\item{obj}{(\code{\link[=Param]{Param()}} | \code{\link[ParamHelpers:ParamSet]{ParamHelpers::ParamSet()}} | \code{list})\cr
+\item{obj}{(\code{\link[=Param]{Param()}} | \code{ParamHelpers::ParamSet()} | \code{list})\cr
Parameter, parameter set or list of parameter values. Expressions within
\code{len}, \code{lower} or \code{upper} boundaries, \code{default} or \code{values} will be
evaluated using the provided dictionary (\code{dict}).}
@@ -18,7 +18,7 @@ expressions within a parameter, parameter set or list of parameters. The
default is \code{NULL}.}
}
\value{
-[\code{\link[=Param]{Param()}} | \code{\link[ParamHelpers:ParamSet]{ParamHelpers::ParamSet()}} | \code{list}].
+[\code{\link[=Param]{Param()}} | \code{ParamHelpers::ParamSet()} | \code{list}].
}
\description{
Evaluates the expressions of a parameter, parameter set or list
diff --git a/man/getParamSet.Rd b/man/getParamSet.Rd
index b598449..6222aaf 100644
--- a/man/getParamSet.Rd
+++ b/man/getParamSet.Rd
@@ -11,7 +11,7 @@ getParamSet(x)
Object to extract the ParamSet from.}
}
\value{
-\code{\link[ParamHelpers:ParamSet]{ParamHelpers::ParamSet()}}
+\code{ParamHelpers::ParamSet()}
}
\description{
\code{getParamSet} is a generic and can be called to extract the
diff --git a/man/hasExpression.Rd b/man/hasExpression.Rd
index 6ee2cb2..9d46442 100644
--- a/man/hasExpression.Rd
+++ b/man/hasExpression.Rd
@@ -7,7 +7,7 @@
hasExpression(obj)
}
\arguments{
-\item{obj}{(\code{\link[=Param]{Param()}} | \code{\link[ParamHelpers:ParamSet]{ParamHelpers::ParamSet()}} | \code{list})\cr
+\item{obj}{(\code{\link[=Param]{Param()}} | \code{ParamHelpers::ParamSet()} | \code{list})\cr
Parameter, parameter set or list of parameters.}
}
\value{
diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf
index baf66fc..39ed3ad 100644
Binary files a/tests/testthat/Rplots.pdf and b/tests/testthat/Rplots.pdf differ
diff --git a/tests/testthat/test_LearnerParam.R b/tests/testthat/test_LearnerParam.R
index 6a896df..8927fb4 100644
--- a/tests/testthat/test_LearnerParam.R
+++ b/tests/testthat/test_LearnerParam.R
@@ -1,5 +1,3 @@
-context("LearnerParam")
-
test_that("num vec", {
p = makeNumericVectorLearnerParam("x", len = 2, lower = 0, upper = 2)
expect_equal(p$id, "x")
diff --git a/tests/testthat/test_OptPath.R b/tests/testthat/test_OptPath.R
index 11977e7..9bb7ef1 100644
--- a/tests/testthat/test_OptPath.R
+++ b/tests/testthat/test_OptPath.R
@@ -1,5 +1,3 @@
-context("OptPath")
-
test_that("OptPath", {
ps = makeParamSet(
makeNumericParam("x"),
diff --git a/tests/testthat/test_Param.R b/tests/testthat/test_Param.R
index c8892ca..6e1560b 100644
--- a/tests/testthat/test_Param.R
+++ b/tests/testthat/test_Param.R
@@ -1,5 +1,3 @@
-context("Parameter")
-
test_that("num param", {
p = makeNumericParam(id = "x", lower = -1L, upper = 1)
expect_equal("numeric", p$type)
diff --git a/tests/testthat/test_ParamSet.R b/tests/testthat/test_ParamSet.R
index 6dffaff..7c569a3 100644
--- a/tests/testthat/test_ParamSet.R
+++ b/tests/testthat/test_ParamSet.R
@@ -1,5 +1,3 @@
-context("ParameterSet")
-
test_that("empty paramset", {
ps = makeParamSet()
expect_equal(getParamIds(ps), character(0))
@@ -213,7 +211,7 @@ test_that("expressions get converted", {
makeLogicalLearnerParam("a", default = FALSE),
makeLogicalLearnerParam("b", default = FALSE, requires = quote(a == TRUE))
)
- expect_is(ps1$pars$b$requires, "call")
+ expect_class(ps1$pars$b$requires, "call")
expect_equal(ps1, ps2)
expect_error({
ps = makeParamSet(
@@ -224,7 +222,7 @@ test_that("expressions get converted", {
})
test_that("test whether paramset fails gracefully", {
- li <- list(
+ li = list(
makeLogicalLearnerParam("a", default = FALSE),
makeLogicalLearnerParam("b", default = FALSE, requires = expression(a == TRUE))
)
diff --git a/tests/testthat/test_cnames.R b/tests/testthat/test_cnames.R
index 14cd89d..db0e3ba 100644
--- a/tests/testthat/test_cnames.R
+++ b/tests/testthat/test_cnames.R
@@ -1,5 +1,3 @@
-context("cnames")
-
test_that("cnames work with different operations", {
p = makeNumericVectorParam(id = "x", len = 2L, lower = 0, upper = 1, cnames = c("a", "b"))
diff --git a/tests/testthat/test_convertDiscrete.R b/tests/testthat/test_convertDiscrete.R
index d929ea4..f10900f 100644
--- a/tests/testthat/test_convertDiscrete.R
+++ b/tests/testthat/test_convertDiscrete.R
@@ -1,6 +1,3 @@
-context("convertDiscrete")
-
-
test_that("discrete param NameToValue", {
f = function(x) 2 * x
p = makeDiscreteParam(id = "x", values = list(a = "char", b = 2L, c = 2.2, d = f, "e"))
diff --git a/tests/testthat/test_convertParamSetToIrace.R b/tests/testthat/test_convertParamSetToIrace.R
index d0e09e9..98a586a 100644
--- a/tests/testthat/test_convertParamSetToIrace.R
+++ b/tests/testthat/test_convertParamSetToIrace.R
@@ -1,5 +1,3 @@
-context("convertParamSetToIrace")
-
test_that("convertParamSetToIrace", {
skip_on_cran() # FIXME: Delete if IRACE checks on R 3.6 --as-cran
skip_if_not_installed("irace", minimum_version = "3.3.1")
diff --git a/tests/testthat/test_dfRowToList.R b/tests/testthat/test_dfRowToList.R
index f018f9d..042734c 100644
--- a/tests/testthat/test_dfRowToList.R
+++ b/tests/testthat/test_dfRowToList.R
@@ -1,6 +1,3 @@
-context("dfRowToList")
-
-
test_that("dfRowToList", {
ps = makeParamSet(
makeDiscreteParam("x", values = list(a = iris, b = 123)),
diff --git a/tests/testthat/test_dropParams.R b/tests/testthat/test_dropParams.R
index 6bc742d..30872e8 100644
--- a/tests/testthat/test_dropParams.R
+++ b/tests/testthat/test_dropParams.R
@@ -1,5 +1,3 @@
-context("dropParams")
-
test_that("dropParams", {
ps = makeParamSet(
makeNumericParam("u", lower = 1),
diff --git a/tests/testthat/test_evaluateParamExpressions.R b/tests/testthat/test_evaluateParamExpressions.R
index 2f8ffc1..2f71fca 100644
--- a/tests/testthat/test_evaluateParamExpressions.R
+++ b/tests/testthat/test_evaluateParamExpressions.R
@@ -1,5 +1,3 @@
-context("evaluateParamExpressions")
-
test_that("no changes", {
ps = makeParamSet()
expect_identical(evaluateParamExpressions(ps), ps)
diff --git a/tests/testthat/test_filterParams.R b/tests/testthat/test_filterParams.R
index ac61bd4..fb63f4d 100644
--- a/tests/testthat/test_filterParams.R
+++ b/tests/testthat/test_filterParams.R
@@ -1,5 +1,3 @@
-context("FilterParams")
-
test_that("filter empty paramset", {
ps = makeParamSet()
expect_true(isEmpty(filterParams(ps, type = "numeric")))
diff --git a/tests/testthat/test_forbidden.R b/tests/testthat/test_forbidden.R
index c58dfc9..69a7876 100644
--- a/tests/testthat/test_forbidden.R
+++ b/tests/testthat/test_forbidden.R
@@ -1,6 +1,3 @@
-context("forbidden")
-
-
test_that("forbidden", {
ps = makeParamSet(
makeNumericParam("x", lower = 1, upper = 5),
diff --git a/tests/testthat/test_generateDesign.R b/tests/testthat/test_generateDesign.R
index e40242b..6d8f169 100644
--- a/tests/testthat/test_generateDesign.R
+++ b/tests/testthat/test_generateDesign.R
@@ -1,5 +1,3 @@
-context("generateDesign")
-
test_that("simple num design", {
requirePackages("_lhs")
ps1 = makeParamSet(
diff --git a/tests/testthat/test_generateDesignOfDefaults.R b/tests/testthat/test_generateDesignOfDefaults.R
index 2a9b5e6..23b46e8 100644
--- a/tests/testthat/test_generateDesignOfDefaults.R
+++ b/tests/testthat/test_generateDesignOfDefaults.R
@@ -1,6 +1,3 @@
-context("generateDesignOfDefaults")
-
-
test_that("generateDesignOfDefaults", {
ps = makeParamSet(
makeNumericParam("x", lower = 1, upper = 5, default = 1),
@@ -84,21 +81,21 @@ test_that("generateDesignOfDefaults works with discrete params and complex value
makeDiscreteParam("p", values = c("a", "b"), default = "b")
)
d = generateDesignOfDefaults(ps)
- expect_equal(d, data.frame(p = factor("b", levels = c("a", "b"))), check.attributes = FALSE)
+ expect_equal(d, data.frame(p = factor("b", levels = c("a", "b"))), ignore_attr = TRUE)
ps = makeParamSet(
makeDiscreteParam("p", values = c(ir = "ir", foo = "bar"), default = "ir")
)
d = generateDesignOfDefaults(ps)
- expect_equal(d, data.frame(p = factor("ir", levels = c("ir", "foo"))), check.attributes = FALSE)
+ expect_equal(d, data.frame(p = factor("ir", levels = c("ir", "foo"))), ignore_attr = TRUE)
p = makeDiscreteParam("p", values = c(ir = "ir", foo = "bar"), default = "bar")
ps = makeParamSet(p)
d = generateDesignOfDefaults(ps)
- expect_equal(d, data.frame(p = factor("foo", levels = c("ir", "foo"))), check.attributes = FALSE)
+ expect_equal(d, data.frame(p = factor("foo", levels = c("ir", "foo"))), ignore_attr = TRUE)
p = makeDiscreteParam("p", values = list(ir = "ir", foo = iris), default = iris)
ps = makeParamSet(p)
d = generateDesignOfDefaults(ps)
- expect_equal(d, data.frame(p = factor("foo", levels = c("ir", "foo"))), check.attributes = FALSE)
+ expect_equal(d, data.frame(p = factor("foo", levels = c("ir", "foo"))), ignore_attr = TRUE)
})
diff --git a/tests/testthat/test_generateGridDesign.R b/tests/testthat/test_generateGridDesign.R
index 7ed29d5..60c1bc2 100644
--- a/tests/testthat/test_generateGridDesign.R
+++ b/tests/testthat/test_generateGridDesign.R
@@ -1,5 +1,3 @@
-context("generateGridDesign")
-
test_that("generateGridDesign", {
ps = makeParamSet(
makeNumericParam("x", lower = 1, upper = 5),
diff --git a/tests/testthat/test_generateRandomDesign.R b/tests/testthat/test_generateRandomDesign.R
index af38142..2189ea2 100644
--- a/tests/testthat/test_generateRandomDesign.R
+++ b/tests/testthat/test_generateRandomDesign.R
@@ -1,5 +1,3 @@
-context("generateRandomDesign")
-
test_that("num/int/disc vec design", {
ps = makeParamSet(
makeNumericParam("x", lower = -2, upper = 1),
diff --git a/tests/testthat/test_getDefaults.R b/tests/testthat/test_getDefaults.R
index 70f829b..b56459f 100644
--- a/tests/testthat/test_getDefaults.R
+++ b/tests/testthat/test_getDefaults.R
@@ -1,5 +1,3 @@
-context("getDefaults")
-
test_that("getDefaults", {
ps = makeParamSet()
expect_equal(getDefaults(ps), list())
diff --git a/tests/testthat/test_getParamNr.R b/tests/testthat/test_getParamNr.R
index c47fb6d..4fa4125 100644
--- a/tests/testthat/test_getParamNr.R
+++ b/tests/testthat/test_getParamNr.R
@@ -1,5 +1,3 @@
-context("getParamNr")
-
test_that("getParamNr", {
ps = makeParamSet()
expect_equal(getParamNr(ps), 0L)
diff --git a/tests/testthat/test_getParamTypeCounts.R b/tests/testthat/test_getParamTypeCounts.R
index 685a1c2..213958a 100644
--- a/tests/testthat/test_getParamTypeCounts.R
+++ b/tests/testthat/test_getParamTypeCounts.R
@@ -1,5 +1,3 @@
-context("getParamTypeCounts")
-
test_that("getParamTypeCounts", {
checkNonOccuringTypes = function(or, par.set) {
sapply(setdiff(getTypeStringsAll(), getParamTypes(par.set)), function(type) {
diff --git a/tests/testthat/test_getParamTypes.R b/tests/testthat/test_getParamTypes.R
index 9152c80..fac2cbd 100644
--- a/tests/testthat/test_getParamTypes.R
+++ b/tests/testthat/test_getParamTypes.R
@@ -1,5 +1,3 @@
-context("getParamTypes")
-
test_that("getParamTypes", {
ps = makeParamSet(
makeDiscreteParam("x", values = c("a", "b")),
diff --git a/tests/testthat/test_getRequiredParamNames.R b/tests/testthat/test_getRequiredParamNames.R
index c410b1a..ce9abff 100644
--- a/tests/testthat/test_getRequiredParamNames.R
+++ b/tests/testthat/test_getRequiredParamNames.R
@@ -1,5 +1,3 @@
-context("getRequiredParamNames")
-
test_that("getRequiredParamNames", {
ps = makeParamSet(
makeIntegerParam("a", default = 1L),
diff --git a/tests/testthat/test_getRequirements.R b/tests/testthat/test_getRequirements.R
index 797f2b2..2b8a297 100644
--- a/tests/testthat/test_getRequirements.R
+++ b/tests/testthat/test_getRequirements.R
@@ -1,5 +1,3 @@
-context("getRequirements")
-
test_that("getRequirements", {
ps = makeParamSet()
# FIXME: BBmisc::namedList still buggy, only return list()
diff --git a/tests/testthat/test_hasExpression.R b/tests/testthat/test_hasExpression.R
index 0593134..53ad5c7 100644
--- a/tests/testthat/test_hasExpression.R
+++ b/tests/testthat/test_hasExpression.R
@@ -1,5 +1,3 @@
-context("hasExpression")
-
test_that("hasExpression.Param", {
expect_true(!hasExpression(obj = makeDiscreteParam("u", values = 1:2)))
expect_true(hasExpression(obj = makeDiscreteParam("v", values = expression(n * p))))
diff --git a/tests/testthat/test_hasFiniteBoxConstraints.R b/tests/testthat/test_hasFiniteBoxConstraints.R
index cedac50..b1805d2 100644
--- a/tests/testthat/test_hasFiniteBoxConstraints.R
+++ b/tests/testthat/test_hasFiniteBoxConstraints.R
@@ -1,5 +1,3 @@
-context("hasFiniteBoxConstraints")
-
test_that("hasFiniteBoxConstraints", {
par = makeParamSet()
expect_true(hasFiniteBoxConstraints(par))
diff --git a/tests/testthat/test_hasIsType.R b/tests/testthat/test_hasIsType.R
index dc8fd2f..c3e48a3 100644
--- a/tests/testthat/test_hasIsType.R
+++ b/tests/testthat/test_hasIsType.R
@@ -1,5 +1,3 @@
-context("is{Discrete, Integer, Numeric, Character} and has{Discrete, Integer, Numeric, Character}")
-
test_that("is{Discrete, Integer, Numeric, Character} and has{Discrete, Integer, Numeric, Character}", {
par.set.empty = makeParamSet()
has.methods = c(hasInteger, hasDiscrete, hasNumeric, hasCharacter)
diff --git a/tests/testthat/test_hasRequires.R b/tests/testthat/test_hasRequires.R
index fee65c7..83cc1ed 100644
--- a/tests/testthat/test_hasRequires.R
+++ b/tests/testthat/test_hasRequires.R
@@ -1,5 +1,3 @@
-context("hasRequires")
-
test_that("hasRequires", {
ps = makeParamSet()
expect_false(hasRequires(ps))
diff --git a/tests/testthat/test_isFeasible.R b/tests/testthat/test_isFeasible.R
index 88045fe..994b46f 100644
--- a/tests/testthat/test_isFeasible.R
+++ b/tests/testthat/test_isFeasible.R
@@ -1,5 +1,3 @@
-context("isFeasible")
-
test_that("isFeasible ParamSet", {
ps = makeParamSet(
makeIntegerParam("a", default = 1L),
diff --git a/tests/testthat/test_isSpecialValue.R b/tests/testthat/test_isSpecialValue.R
index 7c293e8..fa59a7e 100644
--- a/tests/testthat/test_isSpecialValue.R
+++ b/tests/testthat/test_isSpecialValue.R
@@ -1,5 +1,3 @@
-context("isSpecialValue")
-
test_that("isSpecialValue", {
p = makeIntegerParam("a", special.vals = list(NULL))
expect_true(isSpecialValue(p, NULL))
diff --git a/tests/testthat/test_isVector.R b/tests/testthat/test_isVector.R
index 1d702ed..eb203fb 100644
--- a/tests/testthat/test_isVector.R
+++ b/tests/testthat/test_isVector.R
@@ -1,5 +1,3 @@
-context("isVector")
-
test_that("isVector", {
ps = makeParamSet()
expect_true(isVector(ps))
diff --git a/tests/testthat/test_paramValueToString.R b/tests/testthat/test_paramValueToString.R
index 057ff83..9257c95 100644
--- a/tests/testthat/test_paramValueToString.R
+++ b/tests/testthat/test_paramValueToString.R
@@ -1,5 +1,3 @@
-context("paramValueToString")
-
test_that("paramValueToString ", {
u = makeNumericParam("u")
v = makeIntegerVectorParam("v", len = 2)
diff --git a/tests/testthat/test_plotEAF.R b/tests/testthat/test_plotEAF.R
index 2d43356..123e82f 100644
--- a/tests/testthat/test_plotEAF.R
+++ b/tests/testthat/test_plotEAF.R
@@ -1,5 +1,3 @@
-context("plotEAF")
-
test_that("plotEAF works", {
# Build 3 artifical opt.paths with 2 crits
@@ -12,7 +10,7 @@ test_that("plotEAF works", {
for (i in 1:20) {
addOptPathEl(op, x = list(
x = X[i * 3]),
- y = X[ i * 3 - 1:2],
+ y = X[i * 3 - 1:2],
dob = dob[i])
}
op
diff --git a/tests/testthat/test_plotYTrace.R b/tests/testthat/test_plotYTrace.R
index c800c8b..4920736 100644
--- a/tests/testthat/test_plotYTrace.R
+++ b/tests/testthat/test_plotYTrace.R
@@ -1,5 +1,3 @@
-context("plotYTrace")
-
test_that("plotYTrace works", {
makeArtOP = function() {
ps = makeNumericParamSet(len = 1L)
@@ -10,7 +8,7 @@ test_that("plotYTrace works", {
for (i in 1:20) {
addOptPathEl(op, x = list(
x = X[i * 2]),
- y = X[ i * 2 - 1],
+ y = X[i * 2 - 1],
dob = dob[i],
exec.time = rexp(1))
}
@@ -25,10 +23,10 @@ test_that("plotYTrace works", {
pl = renderYTraces(opt.paths, over.time = "dob")
- expect_is(pl, "gg")
- expect_is(pl, "ggplot")
+ expect_class(pl, "gg")
+ expect_class(pl, "ggplot")
pl = renderYTraces(opt.paths, over.time = "exec.time")
- expect_is(pl, "gg")
- expect_is(pl, "ggplot")
+ expect_class(pl, "gg")
+ expect_class(pl, "ggplot")
plotYTraces(opt.paths)
})
diff --git a/tests/testthat/test_renderOptPathPlot.R b/tests/testthat/test_renderOptPathPlot.R
index c14ce07..d19fdd7 100644
--- a/tests/testthat/test_renderOptPathPlot.R
+++ b/tests/testthat/test_renderOptPathPlot.R
@@ -1,5 +1,3 @@
-context("renderOptPathPlot")
-
muffle = function(x) expect_warning(x, "to numeric for over time plot")
test_that("renderOptPathPlot", {
@@ -13,7 +11,7 @@ test_that("renderOptPathPlot", {
for (i in 1:7) {
addOptPathEl(op0, x = list(
x = X[i * 2]),
- y = X[ i * 2 - 1],
+ y = X[i * 2 - 1],
dob = dob[i])
}
pl = renderOptPathPlot(op0, iter = 0, alpha = FALSE)
diff --git a/tests/testthat/test_repairPoint.R b/tests/testthat/test_repairPoint.R
index abea814..9202c90 100644
--- a/tests/testthat/test_repairPoint.R
+++ b/tests/testthat/test_repairPoint.R
@@ -1,5 +1,3 @@
-context("repairPoint")
-
test_that("repairPoint", {
ps = makeParamSet(
makeNumericParam("num1", lower = 1, upper = 5),
diff --git a/tests/testthat/test_sample.R b/tests/testthat/test_sample.R
index 83e120e..8eb2f09 100644
--- a/tests/testthat/test_sample.R
+++ b/tests/testthat/test_sample.R
@@ -1,5 +1,3 @@
-context("sample")
-
test_that("numeric sampling", {
p = makeNumericParam(id = "x", lower = 10, upper = 20)
r = sampleValues(p, 13)
diff --git a/tests/testthat/test_trafo.R b/tests/testthat/test_trafo.R
index a2b4f45..779740f 100644
--- a/tests/testthat/test_trafo.R
+++ b/tests/testthat/test_trafo.R
@@ -1,5 +1,3 @@
-context("trafo")
-
test_that("trafoValue with param", {
p = makeNumericParam(id = "x", lower = -10, upper = 10, trafo = function(x) x^2)
expect_equal(trafoValue(p, 1), 1)
diff --git a/tests/testthat/test_updateParVals.R b/tests/testthat/test_updateParVals.R
index 81077c8..f480a50 100644
--- a/tests/testthat/test_updateParVals.R
+++ b/tests/testthat/test_updateParVals.R
@@ -1,5 +1,3 @@
-context("updateParVals")
-
test_that("updateParVals works", {
# simple dependency
pa = list(a = 1, b = 2, d = 4, e = 5)
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/c7/0f37181302ba8e8156d8f0615ba7f73e819df1.debug -rw-r--r-- root/root /usr/share/doc/r-cran-paramhelpers/tests/testthat/test_filterParams.R -rw-r--r-- root/root /usr/share/doc/r-cran-paramhelpers/tests/testthat/test_renderOptPathPlot.R
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/ca/8a578544b993e6ab66e5d542b2831987da9388.debug -rw-r--r-- root/root /usr/share/doc/r-cran-paramhelpers/tests/testthat/test_filterParams.R.gz -rw-r--r-- root/root /usr/share/doc/r-cran-paramhelpers/tests/testthat/test_renderOptPathPlot.R.gz
Control files of package r-cran-paramhelpers: lines which differ (wdiff format)
Depends: r-base-core (>= 4.2.2-1), 4.2.2.20221110-1), r-api-4.0, r-cran-backports, r-cran-bbmisc (>= 1.10), r-cran-checkmate (>= 1.8.2), r-cran-fastmatch
Suggests: r-cran-interp, r-cran-covr, r-cran-plyr, r-cran-reshape2
Control files of package r-cran-paramhelpers-dbgsym: lines which differ (wdiff format)
Build-Ids: ca8a578544b993e6ab66e5d542b2831987da9388 c70f37181302ba8e8156d8f0615ba7f73e819df1