Skip to content

Commit

Permalink
Merge pull request #345 from tidymodels/rc-1-3-0
Browse files Browse the repository at this point in the history
RC 1.3.0
  • Loading branch information
hfrick authored Jul 30, 2024
2 parents 62ce2d9 + b62715b commit b20cb79
Show file tree
Hide file tree
Showing 19 changed files with 30 additions and 184 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: dials
Title: Tools for Creating Tuning Parameter Values
Version: 1.2.1.9000
Version: 1.3.0
Authors@R: c(
person("Max", "Kuhn", , "[email protected]", role = "aut"),
person("Hannah", "Frick", , "[email protected]", role = c("aut", "cre")),
Expand Down
5 changes: 0 additions & 5 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,15 @@ S3method(finalize,parameters)
S3method(grid_latin_hypercube,list)
S3method(grid_latin_hypercube,param)
S3method(grid_latin_hypercube,parameters)
S3method(grid_latin_hypercube,workflow)
S3method(grid_max_entropy,list)
S3method(grid_max_entropy,param)
S3method(grid_max_entropy,parameters)
S3method(grid_max_entropy,workflow)
S3method(grid_random,list)
S3method(grid_random,param)
S3method(grid_random,parameters)
S3method(grid_random,workflow)
S3method(grid_regular,list)
S3method(grid_regular,param)
S3method(grid_regular,parameters)
S3method(grid_regular,workflow)
S3method(grid_space_filling,list)
S3method(grid_space_filling,param)
S3method(grid_space_filling,parameters)
Expand Down Expand Up @@ -142,7 +138,6 @@ export(prior_terminal_node_expo)
export(prod_degree)
export(prune)
export(prune_method)
export(pull_dials_object)
export(range_get)
export(range_set)
export(range_validate)
Expand Down
12 changes: 10 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
# dials (development version)
# dials 1.3.0

## Improvements

* The space-filling design functionality was expanded to include several new types of designs: Audze-Eglais, max/min L1, max/min L2, and uniform. These are all pre-computed designs accessed from the sfd package (#329).

* A new function is used to access all of the space-filling designs called `grid_space_filling()` (#329).

* Two new parameters, `activation_2()` and `hidden_units_2()`, for use with `brulee::brulee_mlp_two_layer()` (#339).

## Deprecations

* `grid_max_entropy()` and `grid_latin_hypercube()` are deprecated in favor of `grid_space_filling()` (#332).

* Two new parameters, `activation_2()` and `hidden_units_2()`, for use with `brulee::brulee_mlp_two_layer()` (#339).
* `pull_dials_object()` has been removed (#344).

* The `grid_*()` methods for `workflow` objects have been removed (#344).

* The deprecation of the `default` argument to the constructors `new_quant_param()` and `new_qual_param()` has been escalated to an error (#344).


# dials 1.2.1
Expand Down
7 changes: 5 additions & 2 deletions R/constructors.R
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ new_quant_param <- function(type = c("double", "integer"),
...,
call = caller_env()) {
if (lifecycle::is_present(default)) {
lifecycle::deprecate_warn(
lifecycle::deprecate_stop(
when = "1.1.0",
what = "new_quant_param(default)"
)
Expand Down Expand Up @@ -184,7 +184,10 @@ new_qual_param <- function(type = c("character", "logical"),
...,
call = caller_env()) {
if (lifecycle::is_present(default)) {
lifecycle::deprecate_warn(when = "1.1.0", what = "new_qual_param(default)")
lifecycle::deprecate_stop(
when = "1.1.0",
what = "new_qual_param(default)"
)
}

type <- arg_match0(type, values = c("character", "logical"))
Expand Down
26 changes: 0 additions & 26 deletions R/grids.R
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,6 @@ grid_regular.param <- function(x,
grd
}

#' @export
#' @rdname grid_regular
grid_regular.workflow <- function(x,
...,
levels = 3,
original = TRUE,
filter = NULL) {
lifecycle::deprecate_stop(
when = "1.2.0",
what = "grid_regular.workflow()",
details = "Alternatively, first extract the parameter set with `extract_parameter_set_dials()`, then create the grid from that object."
)
}

make_regular_grid <- function(...,
levels = 3,
original = TRUE,
Expand Down Expand Up @@ -241,18 +227,6 @@ grid_random.param <- function(x, ..., size = 5, original = TRUE, filter = NULL)
grd
}


#' @export
#' @rdname grid_regular
grid_random.workflow <- function(x, ..., size = 5, original = TRUE, filter = NULL) {
lifecycle::deprecate_stop(
when = "1.2.0",
what = "grid_random.workflow()",
details = "Alternatively, first extract the parameter set with `extract_parameter_set_dials()`, then create the grid from that object."
)
}


make_random_grid <- function(...,
size = 5,
original = TRUE,
Expand Down
30 changes: 0 additions & 30 deletions R/pull_dials_object.R

This file was deleted.

35 changes: 2 additions & 33 deletions R/space_filling.R
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ grid_max_entropy <- function(x,
variogram_range = 0.5,
iter = 1000) {
lifecycle::deprecate_soft(
"1.2.1.9000",
"1.3.0",
"grid_max_entropy()",
"grid_space_filling()"
)
Expand Down Expand Up @@ -358,24 +358,6 @@ grid_max_entropy.param <- function(x,
new_param_grid(grd)
}

#' @export
#' @rdname grid_max_entropy
grid_max_entropy.workflow <- function(x,
...,
size = 3,
original = TRUE,
variogram_range = 0.5,
iter = 1000) {

lifecycle::deprecate_stop(
when = "1.2.0",
what = "grid_max_entropy.workflow()",
details = "Alternatively, first extract the parameter set with `extract_parameter_set_dials()`, then create the grid from that object."
)
}



make_max_entropy_grid <- function(...,
size = 3,
original = TRUE,
Expand Down Expand Up @@ -420,7 +402,7 @@ make_max_entropy_grid <- function(...,
#' @rdname grid_max_entropy
grid_latin_hypercube <- function(x, ..., size = 3, original = TRUE) {
lifecycle::deprecate_soft(
"1.2.1.9000",
"1.3.0",
"grid_latin_hypercube()",
"grid_space_filling()"
)
Expand Down Expand Up @@ -466,19 +448,6 @@ grid_latin_hypercube.param <- function(x, ..., size = 3, original = TRUE) {
new_param_grid(grd)
}


#' @export
#' @rdname grid_max_entropy
grid_latin_hypercube.workflow <- function(x, ..., size = 3, original = TRUE) {
lifecycle::deprecate_stop(
when = "1.2.0",
what = "grid_latin_hypercube.workflow()",
details = "Alternatively, first extract the parameter set with `extract_parameter_set_dials()`, then create the grid from that object."
)
}



make_latin_hypercube_grid <- function(..., size = 3, original = TRUE, call = caller_env()) {
validate_params(..., call = call)
param_quos <- quos(...)
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pak::pak("tidymodels/dials")

Please note that the dials project is released with a [Contributor Code of Conduct](https://dials.tidymodels.org/CODE_OF_CONDUCT.html). By contributing to this project, you agree to abide by its terms.

- For questions and discussions about tidymodels packages, modeling, and machine learning, please [post on RStudio Community](https://community.rstudio.com/new-topic?category_id=15&tags=tidymodels,question).
- For questions and discussions about tidymodels packages, modeling, and machine learning, please [post on Posit Community](https://forum.posit.co/new-topic?category_id=15&tags=tidymodels,question).

- If you think you have encountered a bug, please [submit an issue](https://github.com/tidymodels/dials/issues).

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ of Conduct](https://dials.tidymodels.org/CODE_OF_CONDUCT.html). By
contributing to this project, you agree to abide by its terms.

- For questions and discussions about tidymodels packages, modeling, and
machine learning, please [post on RStudio
Community](https://community.rstudio.com/new-topic?category_id=15&tags=tidymodels,question).
machine learning, please [post on Posit
Community](https://forum.posit.co/new-topic?category_id=15&tags=tidymodels,question).

- If you think you have encountered a bug, please [submit an
issue](https://github.com/tidymodels/dials/issues).
Expand Down
1 change: 0 additions & 1 deletion cran-comments.md
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
This release contains the requested fix to the documentation of `encode_unit()`, for R-devel.
13 changes: 0 additions & 13 deletions man/grid_max_entropy.Rd

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

6 changes: 0 additions & 6 deletions man/grid_regular.Rd

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

35 changes: 0 additions & 35 deletions man/pull_dials_object.Rd

This file was deleted.

2 changes: 1 addition & 1 deletion revdep/cran.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## revdepcheck results

We checked 24 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
We checked 30 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.

* We saw 0 new problems
* We failed to check 0 packages
Expand Down
8 changes: 4 additions & 4 deletions tests/testthat/_snaps/constructors.md
Original file line number Diff line number Diff line change
Expand Up @@ -286,15 +286,15 @@
quant_param <- new_quant_param(type = "integer", default = 5L, values = 1:10,
label = c(foo = "Foo"))
Condition
Warning:
The `default` argument of `new_quant_param()` is deprecated as of dials 1.1.0.
Error:
! The `default` argument of `new_quant_param()` was deprecated in dials 1.1.0 and is now defunct.

---

Code
qual_param <- new_qual_param(type = "logical", values = c(FALSE, TRUE),
default = TRUE, label = c(foo = "Foo"))
Condition
Warning:
The `default` argument of `new_qual_param()` is deprecated as of dials 1.1.0.
Error:
! The `default` argument of `new_qual_param()` was deprecated in dials 1.1.0 and is now defunct.

9 changes: 0 additions & 9 deletions tests/testthat/_snaps/pull_dials_object.md

This file was deleted.

4 changes: 2 additions & 2 deletions tests/testthat/_snaps/space_filling.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
grid_max_entropy(mixture(), trees(), size = 2)
Condition
Warning:
`grid_max_entropy()` was deprecated in dials 1.2.1.9000.
`grid_max_entropy()` was deprecated in dials 1.3.0.
i Please use `grid_space_filling()` instead.
Output
# A tibble: 2 x 2
Expand All @@ -28,7 +28,7 @@
grid_latin_hypercube(mixture(), trees(), size = 2)
Condition
Warning:
`grid_latin_hypercube()` was deprecated in dials 1.2.1.9000.
`grid_latin_hypercube()` was deprecated in dials 1.3.0.
i Please use `grid_space_filling()` instead.
Output
# A tibble: 2 x 2
Expand Down
Loading

0 comments on commit b20cb79

Please sign in to comment.