Merge branch 'master' into Roxygen-dev

Author: topepo

NEWS.md

@@ -8,6 +8,9 @@
 
 * The model `udpate()` methods gained a `parameters` argument for cases when the parameters are contained in a tibble or list. 
 
+# [A bug](https://github.com/tidymodels/parsnip/issues/174) was fixed standardizing the column names of `nnet` class probability predictions.
+
+
 # parsnip 0.0.3.1
 
 Test case update due to CRAN running extra tests [(#202)](https://github.com/tidymodels/parsnip/issues/202)

R/mlp.R

@@ -389,7 +389,7 @@ nnet_softmax <- function(results, object) {
 
   results <- apply(results, 1, function(x) exp(x)/sum(exp(x)))
   results <- t(results)
-  names(results) <- paste0(".pred_", object$lvl)
+  colnames(results) <- object$lvl
   results <- as_tibble(results)
   results
 }

tests/testthat/test_mlp.R

@@ -170,3 +170,11 @@ test_that('bad input', {
   expect_error(translate(mlp(mode = "regression", formula = y ~ x) %>% set_engine()))
 })
 
+test_that("nnet_softmax", {
+  obj <- mlp(mode = 'classification')
+  obj$lvls <- c("a", "b")
+  res <- nnet_softmax(matrix(c(.8, .2)), obj)
+  expect_equal(names(res), obj$lvls)
+  expect_equal(res$b, 1 - res$a)
+})
+