Skip to content

Commit c388232

Browse files
authored
Merge pull request #418 from tidymodels:jarl
Try out Jarl
2 parents 64c0d34 + 9a844a5 commit c388232

File tree

9 files changed

+55
-49
lines changed

9 files changed

+55
-49
lines changed

R/aaa_ranges.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ range_validate <- function(
9898
call = call
9999
)
100100
}
101-
if (any(!is_num[!is_unk])) {
101+
if (!all(is_num[!is_unk])) {
102102
cli::cli_abort(
103103
c("Value ranges must be numeric.", ukn_txt),
104104
call = call

R/constructors.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ new_quant_param <- function(
160160

161161
check_label(label, call = call)
162162
if (is.null(label)) {
163-
label = "Unlabeled parameter"
163+
label <- "Unlabeled parameter"
164164
names(label) <- "Unlabeled parameter"
165165
}
166166

@@ -223,7 +223,7 @@ new_qual_param <- function(
223223

224224
check_label(label, call = call)
225225
if (is.null(label)) {
226-
label = "Unlabeled parameter"
226+
label <- "Unlabeled parameter"
227227
names(label) <- "Unlabeled parameter"
228228
}
229229

R/misc.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ check_inclusive <- function(x, ..., arg = caller_arg(x), call = caller_env()) {
182182

183183
check_logical(x, arg = arg, call = call)
184184

185-
if (any(is.na(x))) {
185+
if (anyNA(x)) {
186186
cli::cli_abort("{.arg {arg}} can't contain missing values.", call = call)
187187
}
188188

R/parameters.R

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ parameters.list <- function(x, ...) {
4545
check_dots_empty()
4646

4747
elem_param <- purrr::map_lgl(x, inherits, "param")
48-
if (any(!elem_param)) {
48+
if (!all(elem_param)) {
4949
cli::cli_abort("The objects should all be {.cls param} objects.")
5050
}
5151
elem_name <- purrr::map_chr(x, \(.x) names(.x$label))
@@ -98,7 +98,7 @@ check_list_of_param <- function(x, ..., call = caller_env()) {
9898
)
9999
}
100100
is_good_boi <- map_lgl(x, param_or_na)
101-
if (any(!is_good_boi)) {
101+
if (!all(is_good_boi)) {
102102
offenders <- which(!is_good_boi)
103103

104104
cli::cli_abort(
@@ -141,10 +141,7 @@ parameters_constr <- function(
141141
check_character(component_id, call = call)
142142
check_list_of_param(object, call = call)
143143

144-
n_elements <- map_int(
145-
list(name, id, source, component, component_id, object),
146-
length
147-
)
144+
n_elements <- lengths(list(name, id, source, component, component_id, object))
148145
n_elements_unique <- unique(n_elements)
149146
if (length(n_elements_unique) > 1) {
150147
cli::cli_abort(

tests/testthat/test-constructors.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ test_that("printing", {
133133
expect_snapshot(surv_dist())
134134

135135
expect_snapshot(
136-
value_set(cost_complexity(), log10(c(.09, .0001)))
136+
value_set(cost_complexity(), log10(c(0.09, 0.0001)))
137137
)
138138

139139
expect_snapshot({
@@ -177,9 +177,9 @@ test_that("bad ranges", {
177177
expect_snapshot(error = TRUE, mixture(c(1L, unknown())))
178178
expect_snapshot(error = TRUE, mixture(c(unknown(), 1L)))
179179
expect_snapshot(error = TRUE, mixture(letters[1:2]))
180-
expect_snapshot(error = TRUE, mtry(c(.1, .5)))
181-
expect_snapshot(error = TRUE, mtry(c(.1, unknown())))
182-
expect_snapshot(error = TRUE, mtry(c(unknown(), .5)))
180+
expect_snapshot(error = TRUE, mtry(c(0.1, 0.5)))
181+
expect_snapshot(error = TRUE, mtry(c(0.1, unknown())))
182+
expect_snapshot(error = TRUE, mtry(c(unknown(), 0.5)))
183183
})
184184

185185
test_that("can supply `values` without `range` and `inclusive` (#87)", {

tests/testthat/test-encode_unit.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ test_that("to [0, 1] for quantitative values", {
2626

2727
x_back <- encode_unit(
2828
x,
29-
c(0.000001, 1 / 3, .99999, 1),
29+
c(0.000001, 1 / 3, 0.99999, 1),
3030
direction = "backward"
3131
)
3232
expect_equal(x_back, c(2L, 4L, 7L, 7L))

tests/testthat/test-finalize.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ test_that("estimate rows", {
7272

7373
test_that("`get_batch_size() is deprecated", {
7474
expect_snapshot(
75-
bsizes <- get_batch_sizes(batch_size(), iris, frac = c(.3, .7))
75+
bsizes <- get_batch_sizes(batch_size(), iris, frac = c(0.3, 0.7))
7676
)
7777
})
7878

tests/testthat/test-grids.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ test_that("wrong argument name", {
8888
test_that("filter arg yields same results", {
8989
p <- parameters(penalty(), mixture())
9090
expect_equal(
91-
filter(with_seed(36L, grid_random(p)), penalty < .01),
92-
with_seed(36L, grid_random(p, filter = penalty < .01))
91+
filter(with_seed(36L, grid_random(p)), penalty < 0.01),
92+
with_seed(36L, grid_random(p, filter = penalty < 0.01))
9393
)
9494
expect_equal(
95-
filter(with_seed(36L, grid_random(p)), penalty > .001),
96-
with_seed(36L, grid_random(p, filter = penalty > .001))
95+
filter(with_seed(36L, grid_random(p)), penalty > 0.001),
96+
with_seed(36L, grid_random(p, filter = penalty > 0.001))
9797
)
9898
expect_equal(
99-
filter(with_seed(36L, grid_random(p)), mixture == .01),
100-
with_seed(36L, grid_random(p, filter = mixture == .01))
99+
filter(with_seed(36L, grid_random(p)), mixture == 0.01),
100+
with_seed(36L, grid_random(p, filter = mixture == 0.01))
101101
)
102102
})
103103

tests/testthat/test-params.R

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ test_that("param ranges", {
33
expect_equal(sample_size(1:2)$range, list(lower = 1L, upper = 2L))
44
expect_equal(learn_rate(c(.1, .9))$range, list(lower = 0.1, upper = 0.9))
55
expect_equal(loss_reduction(c(.1, .9))$range, list(lower = 0.1, upper = 0.9))
6-
expect_equal(buffer(c(0, .25))$range, list(lower = 0, upper = .25))
6+
expect_equal(buffer(c(0, 0.25))$range, list(lower = 0, upper = 0.25))
77
expect_equal(cost_complexity(c(.1, .9))$range, list(lower = 0.1, upper = 0.9))
88
expect_equal(epochs(1:2)$range, list(lower = 1L, upper = 2L))
99
expect_equal(degree()$range, list(lower = 1, upper = 3))
@@ -15,14 +15,14 @@ test_that("param ranges", {
1515
expect_equal(num_comp(1:2)$range, list(lower = 1L, upper = 2L))
1616
expect_equal(cost(c(-2.0, -1.0))$range, list(lower = -2, upper = -1))
1717
expect_equal(scale_factor(c(-2.0, -1.0))$range, list(lower = -2, upper = -1))
18-
expect_equal(svm_margin(c(.1, .15))$range, list(lower = .1, upper = .15))
18+
expect_equal(svm_margin(c(0.1, 0.15))$range, list(lower = 0.1, upper = 0.15))
1919
expect_equal(deg_free(1:2)$range, list(lower = 1L, upper = 2L))
2020
expect_equal(hidden_units(1:2)$range, list(lower = 1L, upper = 2L))
2121
expect_equal(hidden_units_2(1:2)$range, list(lower = 1L, upper = 2L))
2222
expect_equal(batch_size(1:2)$range, list(lower = 1L, upper = 2L))
2323
expect_equal(Laplace(c(.1, .9))$range, list(lower = 0.1, upper = 0.9))
2424
expect_equal(dist_power(c(.1, .9))$range, list(lower = 0.1, upper = 0.9))
25-
expect_equal(threshold(c(.1, .15))$range, list(lower = .1, upper = .15))
25+
expect_equal(threshold(c(0.1, 0.15))$range, list(lower = 0.1, upper = 0.15))
2626
expect_equal(weight(c(-2.0, -1.0))$range, list(lower = -2, upper = -1))
2727
expect_equal(max_times(1:2)$range, list(lower = 1L, upper = 2L))
2828
expect_equal(min_times(1:2)$range, list(lower = 1L, upper = 2L))
@@ -36,36 +36,45 @@ test_that("param ranges", {
3636
expect_equal(min_unique(1:2)$range, list(lower = 1L, upper = 2L))
3737
expect_equal(freq_cut(c(1.0, 2.0))$range, list(lower = 1, upper = 2))
3838
expect_equal(unique_cut(c(1.0, 2.0))$range, list(lower = 1, upper = 2))
39-
expect_equal(over_ratio(c(.5, 1.5))$range, list(lower = .5, upper = 1.5))
40-
expect_equal(under_ratio(c(.5, 1.5))$range, list(lower = .5, upper = 1.5))
39+
expect_equal(over_ratio(c(0.5, 1.5))$range, list(lower = 0.5, upper = 1.5))
40+
expect_equal(under_ratio(c(0.5, 1.5))$range, list(lower = 0.5, upper = 1.5))
4141
expect_equal(rbf_sigma(c(-2.0, -1.0))$range, list(lower = -2, upper = -1))
4242
expect_equal(kernel_offset(c(0.0, 1.0))$range, list(lower = 0, upper = 1))
4343
expect_equal(min_dist(c(-2.0, -1.0))$range, list(lower = -2, upper = -1))
44-
expect_equal(sample_prop(c(.5, .6))$range, list(lower = .5, upper = .6))
44+
expect_equal(sample_prop(c(0.5, 0.6))$range, list(lower = 0.5, upper = 0.6))
4545
expect_equal(num_hash(1:2)$range, list(lower = 1, upper = 2))
46-
expect_equal(smoothness(c(.25, 1.75))$range, list(lower = .25, upper = 1.75))
47-
expect_equal(predictor_prop(c(.1, .5))$range, list(lower = .1, upper = .5))
46+
expect_equal(
47+
smoothness(c(0.25, 1.75))$range,
48+
list(lower = 0.25, upper = 1.75)
49+
)
50+
expect_equal(
51+
predictor_prop(c(0.1, 0.5))$range,
52+
list(lower = 0.1, upper = 0.5)
53+
)
4854
expect_equal(
4955
num_random_splits(c(7L, 15L))$range,
5056
list(lower = 7L, upper = 15L)
5157
)
52-
expect_equal(lower_quantile(c(.1, .5))$range, list(lower = .1, upper = .5))
58+
expect_equal(
59+
lower_quantile(c(0.1, 0.5))$range,
60+
list(lower = 0.1, upper = 0.5)
61+
)
5362
expect_equal(
5463
significance_threshold(c(-3, -2))$range,
5564
list(lower = -3, upper = -2)
5665
)
5766
expect_equal(
58-
regularization_factor(c(.1, .5))$range,
59-
list(lower = .1, upper = .5)
67+
regularization_factor(c(0.1, 0.5))$range,
68+
list(lower = 0.1, upper = 0.5)
6069
)
6170
expect_equal(
62-
confidence_factor(c(-1, -.5))$range,
63-
list(lower = -1, upper = -.5)
71+
confidence_factor(c(-1, -0.5))$range,
72+
list(lower = -1, upper = -0.5)
6473
)
6574
expect_equal(rule_bands(c(5L, 10L))$range, list(lower = 5L, upper = 10L))
6675
expect_equal(max_rules(c(5L, 10L))$range, list(lower = 5L, upper = 10L))
6776
expect_equal(extrapolation(c(1, 10))$range, list(lower = 1, upper = 10))
68-
expect_equal(momentum(c(.1, .5))$range, list(lower = .1, upper = .5))
77+
expect_equal(momentum(c(0.1, 0.5))$range, list(lower = 0.1, upper = 0.5))
6978
expect_equal(stop_iter(c(7L, 15L))$range, list(lower = 7L, upper = 15L))
7079
expect_equal(
7180
conditional_min_criterion(c(1, 2))$range,
@@ -81,27 +90,27 @@ test_that("param ranges", {
8190
)
8291
expect_equal(prior_slab_dispersion(c(1, 2))$range, list(lower = 1, upper = 2))
8392
expect_equal(
84-
prior_mixture_threshold(c(.1, .5))$range,
85-
list(lower = .1, upper = .5)
93+
prior_mixture_threshold(c(0.1, 0.5))$range,
94+
list(lower = 0.1, upper = 0.5)
8695
)
8796
expect_equal(
88-
shrinkage_correlation(c(.1, .5))$range,
89-
list(lower = .1, upper = .5)
97+
shrinkage_correlation(c(0.1, 0.5))$range,
98+
list(lower = 0.1, upper = 0.5)
9099
)
91100
expect_equal(
92-
shrinkage_variance(c(.1, .5))$range,
93-
list(lower = .1, upper = .5)
101+
shrinkage_variance(c(0.1, 0.5))$range,
102+
list(lower = 0.1, upper = 0.5)
94103
)
95104
expect_equal(
96-
shrinkage_frequencies(c(.1, .5))$range,
97-
list(lower = .1, upper = .5)
105+
shrinkage_frequencies(c(0.1, 0.5))$range,
106+
list(lower = 0.1, upper = 0.5)
98107
)
99108
expect_equal(penalty_L1(c(-5, 3))$range, list(lower = -5, upper = 3))
100109
expect_equal(penalty_L2(c(-5, 3))$range, list(lower = -5, upper = 3))
101110
expect_equal(class_weights(c(1, 5))$range, list(lower = 1, upper = 5))
102111
expect_equal(
103-
prior_terminal_node_coef(c(.1, .5))$range,
104-
list(lower = .1, upper = .5)
112+
prior_terminal_node_coef(c(0.1, 0.5))$range,
113+
list(lower = 0.1, upper = 0.5)
105114
)
106115
expect_equal(
107116
prior_terminal_node_expo(c(1, 2))$range,
@@ -140,9 +149,9 @@ test_that("param ranges", {
140149
expect_equal(max_num_terms(c(31, 100))$range, list(lower = 31, upper = 100))
141150
expect_equal(max_nodes(c(31, 100))$range, list(lower = 31, upper = 100))
142151
expect_equal(num_tokens(c(31, 100))$range, list(lower = 31, upper = 100))
143-
expect_equal(mtry_prop(c(.1, .2))$range, list(lower = .1, upper = .2))
144-
expect_equal(dropout(c(.1, .2))$range, list(lower = .1, upper = .2))
145-
expect_equal(prop_terms(c(.1, .2))$range, list(lower = .1, upper = .2))
152+
expect_equal(mtry_prop(c(0.1, 0.2))$range, list(lower = 0.1, upper = 0.2))
153+
expect_equal(dropout(c(0.1, 0.2))$range, list(lower = 0.1, upper = 0.2))
154+
expect_equal(prop_terms(c(0.1, 0.2))$range, list(lower = 0.1, upper = 0.2))
146155
expect_equal(num_estimators(c(1L, 10L))$range, list(lower = 1L, upper = 10L))
147156
expect_equal(
148157
softmax_temperature(c(0.1, 2.0))$range,

0 commit comments

Comments
 (0)