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.

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

Tune schedule #974

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
2d0273b
new code to compute the stages of modeling
topepo Dec 1, 2024
7d49eeb
test updates
topepo Dec 2, 2024
5c90128
Merge branch 'main' into tune-schedule
topepo Dec 3, 2024
8e51568
add temp loop code
topepo Dec 5, 2024
4d39423
add code for prediction
topepo Dec 5, 2024
875b7cc
update predict/postproc loop
topepo Dec 5, 2024
87180fa
added note
topepo Dec 5, 2024
d0ddbac
add classes
topepo Dec 5, 2024
989a2c8
cls name update
topepo Dec 6, 2024
174158b
run air to reformat
topepo Dec 8, 2024
a0e13dc
air + pre-allocation of predictions
topepo Dec 8, 2024
3e97ac6
combine data sets into a list
topepo Dec 8, 2024
b56cf09
air
topepo Dec 8, 2024
c9063f1
add .row indicators
topepo Dec 8, 2024
566618b
use predict_wrapper() in some places and also add more notes
topepo Dec 8, 2024
371965f
use predict/multipredict in each of the three prediction/post cases
topepo Dec 9, 2024
1540212
add metrics
topepo Dec 9, 2024
52b36dc
remove namespaces
topepo Dec 9, 2024
1b970ec
move tests
topepo Dec 9, 2024
f18039b
check 'type' argument
topepo Dec 10, 2024
c73d1be
iterate across prediction types
topepo Dec 10, 2024
e60a7c3
fix bug with postprocessing tuning parameters
topepo Dec 10, 2024
e39a6cd
small logging update
topepo Dec 10, 2024
1a542e8
more improvements
topepo Dec 11, 2024
7fda326
update other tests for dev versions
topepo Dec 11, 2024
e03b720
updated version
topepo Dec 11, 2024
35e9e0d
refactored and extended schedule unit tests
topepo Dec 11, 2024
005479b
incomplete test
topepo Dec 18, 2024
978e7a7
Portable packages must use only ASCII characters
topepo Dec 18, 2024
2fb8701
changes for R CMD check
topepo Dec 18, 2024
f6da85f
fixes for #975
topepo Dec 19, 2024
626aaa6
more tests for #975
topepo Dec 19, 2024
2bf534b
changes to avoid test failures
topepo Dec 19, 2024
b9f902f
function name update (undo this later)
topepo Dec 19, 2024
07d0b27
skips for "no suggests" checks
topepo Dec 19, 2024
26d6e21
skips for "no suggests" checks
topepo Dec 19, 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 NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,15 @@ export(fit_resamples)
export(forge_from_workflow)
export(get_metric_time)
export(get_tune_colors)
export(get_tune_schedule)
export(initialize_catalog)
export(int_pctl)
export(is_preprocessor)
export(is_recipe)
export(is_workflow)
export(last_fit)
export(load_pkgs)
export(loopy)
export(maybe_choose_eval_time)
export(message_wrap)
export(metrics_info)
Expand Down
2 changes: 1 addition & 1 deletion R/0_imports.R
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ utils::globalVariables(
"rowwise", ".best", "location", "msg", "..object", ".eval_time",
".pred_survival", ".pred_time", ".weight_censored", "nice_time",
"time_metric", ".lower", ".upper", "i", "results", "term", ".alpha",
".method", "old_term", ".lab_pre", ".model", ".num_models"
".method", "old_term", ".lab_pre", ".model", ".num_models", "predict_stage"
)
)

Expand Down
5 changes: 5 additions & 0 deletions R/grid_helpers.R
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@
}

predict_wrapper <- function(model, new_data, type, eval_time, subgrid = NULL) {
if (length(type) > 1) {
cli::cli_abort("Argument {.arg type} in {.fn predict_wrapper} should be
a single value, not {.obj_type_friendly {type}}.",
call = NULL)

Check warning on line 157 in R/grid_helpers.R

View check run for this annotation

Codecov / codecov/patch

R/grid_helpers.R#L155-L157

Added lines #L155 - L157 were not covered by tests
}
if (is.null(subgrid)) {
fn <- "predict.model_fit"
} else {
Expand Down
Loading
Loading