Skip to content

Commit f18e88f

Browse files
committed
better defaults, cli, pred is scalar in propagate_samples
1 parent 7294c00 commit f18e88f

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

R/layer_cdc_flatline_quantiles.R

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layer_cdc_flatline_quantiles <- function(
33
...,
44
aheads = 1:4,
55
quantiles = c(.01, .025, 1:19 / 20, .975, .99),
6-
nsims = 1e5,
6+
nsims = 1e3,
77
by_key = "geo_value",
88
symmetrize = FALSE,
99
nonneg = TRUE,
@@ -73,15 +73,15 @@ slather.layer_cdc_flatline_quantiles <-
7373
cols_in_preds <- hardhat::check_column_names(p, object$by_key)
7474
if (!cols_in_preds$ok) {
7575
cli::cli_warn(c(
76-
"Predicted values are missing key columns: {.var cols_in_preds$missing_names}.",
76+
"Predicted values are missing key columns: {.val {cols_in_preds$missing_names}}.",
7777
"Ignoring these."
7878
))
7979
}
8080
if (inherits(the_fit, "_flatline")) {
8181
cols_in_resids <- hardhat::check_column_names(r, object$by_key)
8282
if (!cols_in_resids$ok) {
8383
cli::cli_warn(c(
84-
"Existing residuals are missing key columns: {.var cols_in_resids$missing_names}.",
84+
"Existing residuals are missing key columns: {.val {cols_in_resids$missing_names}}.",
8585
"Ignoring these."
8686
))
8787
}
@@ -98,7 +98,7 @@ slather.layer_cdc_flatline_quantiles <-
9898
cols_in_resids <- hardhat::check_column_names(key_cols, object$by_key)
9999
if (!cols_in_resids$ok) {
100100
cli::cli_warn(c(
101-
"Requested residuals are missing key columns: {.var cols_in_resids$missing_names}.",
101+
"Requested residuals are missing key columns: {.val {cols_in_resids$missing_names}}.",
102102
"Ignoring these."
103103
))
104104
}
@@ -139,9 +139,6 @@ propogate_samples <- function(
139139
samp <- quantile(r, probs = c(0, seq_len(nsim - 1)) / (nsim - 1), na.rm = TRUE)
140140
res <- list()
141141

142-
# p should be all the same
143-
p <- max(p, na.rm = TRUE)
144-
145142
raw <- samp + p
146143
if (nonneg) raw <- pmax(0, raw)
147144
res[[1]] <- raw

0 commit comments

Comments
 (0)