Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tunable target weights and initial Fixes #223 and #222 #227

Merged
merged 2 commits into from
Aug 15, 2024
Merged

Tunable target weights and initial Fixes #223 and #222 #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0491f96
add target_weight and initial to step_umap tunable parameters Fixes #…
JamesHWade Aug 15, 2024
1e305c6
update NEWS
JamesHWade Aug 15, 2024
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
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# embed (development version)

* `step_umap()` has tunable `initial` and `target_weight` arguments. [#223](https://github.com/tidymodels/embed/issues/223), [#222](https://github.com/tidymodels/embed/issues/222))

# embed 1.1.4

## Improvements
Expand Down
6 changes: 4 additions & 2 deletions R/umap.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,13 +348,15 @@ required_pkgs.step_umap <- function(x, ...) {
#' @rdname tunable_embed
tunable.step_umap <- function(x, ...) {
tibble::tibble(
name = c("num_comp", "neighbors", "min_dist", "learn_rate", "epochs"),
name = c("num_comp", "neighbors", "min_dist", "learn_rate", "epochs", "initial", "target_weight"),
call_info = list(
list(pkg = "dials", fun = "num_comp", range = c(1, 10)),
list(pkg = "dials", fun = "neighbors", range = c(5, 200)),
list(pkg = "dials", fun = "min_dist", range = c(-4, -0.69897)),
list(pkg = "dials", fun = "learn_rate"),
list(pkg = "dials", fun = "epochs", range = c(100, 700))
list(pkg = "dials", fun = "epochs", range = c(100, 700)),
list(pkg = "dials", fun = "initial_umap", values = c("spectral", "normlaplacian", "random", "lvrandom", "laplacian", "pca", "spca", "agspectral")),
list(pkg = "dials", fun = "target_weight", range = c(0, 1))
),
source = "recipe",
component = "step_umap",
Expand Down
4 changes: 3 additions & 1 deletion man/step_umap.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions tests/testthat/test-umap.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,11 @@ test_that("tunable", {
rec_param <- tunable.step_umap(rec$steps[[1]])
expect_equal(
rec_param$name,
c("num_comp", "neighbors", "min_dist", "learn_rate", "epochs")
c("num_comp", "neighbors", "min_dist", "learn_rate", "epochs", "initial", "target_weight")
)
expect_true(all(rec_param$source == "recipe"))
expect_true(is.list(rec_param$call_info))
expect_equal(nrow(rec_param), 5)
expect_equal(nrow(rec_param), 7L)
expect_equal(
names(rec_param),
c("name", "call_info", "source", "component", "component_id")
Expand Down Expand Up @@ -369,11 +369,13 @@ test_that("tunable is setup to works with extract_parameter_set_dials", {
neighbors = hardhat::tune(),
min_dist = hardhat::tune(),
learn_rate = hardhat::tune(),
epochs = hardhat::tune()
epochs = hardhat::tune(),
initial = hardhat::tune(),
target_weight = hardhat::tune()
)

params <- extract_parameter_set_dials(rec)

expect_s3_class(params, "parameters")
expect_identical(nrow(params), 5L)
expect_identical(nrow(params), 7L)
})
Loading