Skip to content

Commit 14c7926

Browse files
committed
Merge branch 'master' of github.com:tidymodels/parsnip into time-elapsed
2 parents 3956848 + 3fef9c3 commit 14c7926

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+802
-826
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Imports:
3030
globals,
3131
vctrs (>= 0.2.0)
3232
Roxygen: list(markdown = TRUE)
33-
RoxygenNote: 6.1.1
33+
RoxygenNote: 6.1.99.9001
3434
Suggests:
3535
testthat,
3636
knitr,

NEWS.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ parsnip model object, and is printed when the model object is printed.
1313

1414
* A bug was fixed related to the column names generated by `multi_predict()`. The top-level tibble will always have a column named `.pred` and this list column contains tibbles across sub-models. The column names for these sub-model tibbles will have names consistent with `predict()` (which was previously incorrect). See [43c15db](https://github.com/tidymodels/parsnip/commit/43c15db377ea9ef27483ff209f6bd0e98cb830d2).
1515

16+
# [A bug](https://github.com/tidymodels/parsnip/issues/174) was fixed
17+
standardizing the column names of `nnet` class probability predictions.
18+
1619
# parsnip 0.0.3.1
1720

1821
Test case update due to CRAN running extra tests [(#202)](https://github.com/tidymodels/parsnip/issues/202)

R/aaa_multi_predict.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ has_multi_predict.workflow <- function(object, ...) {
9393
}
9494

9595

96-
#' @rdname has_multi_predict
9796
#' @export
9897
#' @rdname has_multi_predict
9998
multi_predict_args <- function(object, ...) {

R/boost_tree.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ print.boost_tree <- function(x, ...) {
147147
# ------------------------------------------------------------------------------
148148

149149
#' @export
150-
#' @inheritParams boost_tree
151150
#' @param object A boosted tree model specification.
152151
#' @param ... Not used for `update()`.
153152
#' @param fresh A logical for whether the arguments should be

R/fit.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ fit.model_spec <-
178178
#' @rdname fit
179179
#' @export
180180
#' @export fit_xy.model_spec
181-
#' @inheritParams fit.model_spec
182181
fit_xy.model_spec <-
183182
function(object,
184183
x = NULL,

R/mlp.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ nnet_softmax <- function(results, object) {
381381

382382
results <- apply(results, 1, function(x) exp(x)/sum(exp(x)))
383383
results <- t(results)
384-
names(results) <- paste0(".pred_", object$lvl)
384+
colnames(results) <- object$lvl
385385
results <- as_tibble(results)
386386
results
387387
}

R/nearest_neighbor.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#' here (`NULL`), the values are taken from the underlying model
2424
#' functions. If parameters need to be modified, `update()` can be used
2525
#' in lieu of recreating the object from scratch.
26-
#' @inheritParams boost_tree
2726
#' @param mode A single character string for the type of model.
2827
#' Possible values for this model are `"unknown"`, `"regression"`, or
2928
#' `"classification"`.

docs/dev/404.html

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/dev/articles/articles/Classification.html

Lines changed: 31 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/dev/articles/articles/Models.html

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)