Merge 3d645e9 into 72cea54

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: flipTrees
 Type: Package
 Title: Tools for classification and regression trees
-Version: 1.0.0
+Version: 1.0.1
 Author: Displayr <opensource@displayr.com>
 Maintainer: Displayr <opensource@displayr.com>
 Description: Wrappers for classification and regression trees using the flip

R/cart.R

@@ -331,6 +331,11 @@ predict.CART <- function(object, newdata = NULL, seed = 1232, ...)
         CheckPredictionVariables(object, newdata)
 
     class(object) <- "rpart"
+
+    ## old CART outputs used outcome.numeric instead of numeric.outcome; DS-2488
+    if (is.null(object$numeric.outcome))
+        object$numeric.outcome <- object$outcome.numeric
+
     type <- ifelse(object$numeric.outcome, "vector", "class")
 
     # If error or exclude missing data, then predict NA for cases with any missing data.
@@ -356,6 +361,9 @@ flipData::Probabilities
 #' @export
 Probabilities.CART <- function(object, ...)
 {
+    ## old CART outputs used outcome.numeric instead of numeric.outcome; DS-2488
+    if (is.null(object$numeric.outcome))
+        object$numeric.outcome <- object$outcome.numeric
     if(object$numeric.outcome)
         stop("Probabilities not available for numeric dependent variables.")
 

tests/testthat/test-CART.R

@@ -208,3 +208,8 @@ test_that("Many factor levels", {
                  fixed = TRUE)
 })
 
+test_that("predict method works with old outputs; DS-2488",
+{
+    load("oldCART.rda")
+    expect_error(predict(cart), NA)
+})