Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions R/config_space.R
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,11 @@ build_float = function(ConfigSpace, id, lower, upper, default, meta, old_cs_vers

if (old_cs_version) {
hp = ConfigSpace$hyperparameters$UniformFloatHyperparameter
return(hp(id, lower = lower, upper = upper, default_value = default, meta = meta))

# default must not be passed at all if no default is given
return(invoke(hp, .args = discard(list(name = id, lower = lower, upper = upper, default_value = default, meta = meta), is.null)))
}
ConfigSpace$Float(id, bounds = c(lower, upper), default = default, meta = meta)
return(invoke(ConfigSpace$Float, .args = discard(list(name = id, bounds = c(lower, upper), default = default, meta = meta), is.null)))
}

build_int = function(ConfigSpace, id, lower, upper, default, meta, old_cs_version) {
Expand All @@ -154,9 +156,9 @@ build_int = function(ConfigSpace, id, lower, upper, default, meta, old_cs_versio

if (old_cs_version) {
hp = ConfigSpace$hyperparameters$UniformIntegerHyperparameter
return(hp(id, lower = lower, upper = upper, default_value = default, meta = meta))
return(invoke(hp, .args = discard(list(name = id, lower = lower, upper = upper, default_value = default, meta = meta), is.null)))
}
ConfigSpace$Integer(id, bounds = c(lower, upper), default = default, meta = meta)
return(invoke(ConfigSpace$Integer, .args = discard(list(name = id, bounds = c(lower, upper), default = default, meta = meta), is.null)))
}

build_cat = function(ConfigSpace, id, choices, default, meta, old_cs_version) {
Expand All @@ -168,16 +170,17 @@ build_cat = function(ConfigSpace, id, choices, default, meta, old_cs_version) {

if (old_cs_version) {
hp = ConfigSpace$hyperparameters$CategoricalHyperparameter
return(hp(id, choices = choices, default_value = default, meta = meta))
return(invoke(hp, .args = discard(list(name = id, choices = choices, default_value = default, meta = meta), is.null)))
}
ConfigSpace$Categorical(id, items = choices, default = default, meta = meta)
return(invoke(ConfigSpace$Categorical, .args = discard(list(name = id, items = choices, default = default, meta = meta), is.null)))
}

build_bool = function(ConfigSpace, id, default, meta, old_cs_version) {
assert_string(id)
assert_list(meta)
assert_flag(old_cs_version)
default = as.character(normalize_default(default))
default = normalize_default(default)
if (!is.null(default)) default = as.character(default)

build_cat(ConfigSpace, id, c("TRUE", "FALSE"), default, meta, old_cs_version)
}
Expand Down
4 changes: 2 additions & 2 deletions tests/testthat/test_paramset_to_configspace_old.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ test_that("paramset_to_configspace works without defaults with old ConfigSpace A
x3 = p_fct(levels = c("a", "b", "c"))
)
cs = paramset_to_configspace(param_set)
expect_class(cs, "ConfigSpace.configuration_space.ConfigurationSpace")
expect_names(cs$get_hyperparameter_names(), permutation.of = c("x1", "x2", "x3"))
checkmate::expect_class(cs, "ConfigSpace.configuration_space.ConfigurationSpace")
checkmate::expect_names(cs$get_hyperparameter_names(), permutation.of = c("x1", "x2", "x3"))

TRUE
}))
Expand Down
Loading