Merge pull request #178 from tidymodels/internal-refactoring

Internal refactoring of model information

Author: topepo

.travis.yml

@@ -4,48 +4,27 @@ language: r
 dist: trusty
 sudo: true
 
+cran: https://cran.rstudio.com
+
 # until generics is finalized
 warnings_are_errors: false
 
 r:
   - 3.2
-  - oldrel
-  - release
+  - 3.3
+  - 3.4
+  - 3.5
+  - 3.6
   - devel
 
 
 matrix:
   allow_failures:
-    - r: 3.2
-
-r_binary_packages: 
-  - RCurl
-  - dplyr
-  - glue
-  - magrittr
-  - stringi
-  - stringr
-  - munsell
-  - rlang
-  - reshape2
-  - scales
-  - tibble
-  - ggplot2
-  - Rcpp
-  - RcppEigen
-  - BH
-  - glmnet
-  - earth
-  - sparklyr
-  - flexsurv
-  - ranger
-  - randomforest
-  - xgboost
-  - C50
-
+    - r: 3.3       # inum      install failure (seg fault)
+    - r: 3.2       # partykit  install failure (libcoin needs >= 3.4.0)
+    - r: 3.4       # mvtnorm requires >= 3.5.0
 
 cache:
-  packages: true
   directories:
     - $HOME/.keras
     - $HOME/.cache/pip
@@ -69,12 +48,12 @@ before_script:
 
 
 before_install:
-  - sudo apt-get -y install libnlopt-dev 
+  - sudo apt-get -y install libnlopt-dev
   - sudo apt-get update
   - sudo apt-get -y install python3
   - mkdir -p ~/.R && echo "CXX14=g++-6" > ~/.R/Makevars
   - echo "CXX14FLAGS += -fPIC" >> ~/.R/Makevars
- 
+
 
 after_success:
   - Rscript -e 'covr::codecov()'

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: parsnip
-Version: 0.0.2
+Version: 0.0.2.9000
 Title: A Common API to Modeling and Analysis Functions
 Description: A common interface is provided to allow users to specify a model without having to remember the different argument names across different functions or computational engines (e.g. 'R', 'Spark', 'Stan', etc). 
 Authors@R: c(
@@ -27,7 +27,8 @@ Imports:
     magrittr,
     stats,
     tidyr,
-    globals
+    globals,
+    vctrs
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 6.1.1
 Suggests: 
@@ -49,3 +50,4 @@ Suggests:
     rpart,
     MASS,
     nlme
+Remotes: r-lib/vctrs

NAMESPACE

@@ -45,6 +45,7 @@ S3method(translate,decision_tree)
 S3method(translate,default)
 S3method(translate,mars)
 S3method(translate,mlp)
+S3method(translate,nearest_neighbor)
 S3method(translate,rand_forest)
 S3method(translate,surv_reg)
 S3method(translate,svm_poly)
@@ -85,6 +86,11 @@ export(fit.model_spec)
 export(fit_control)
 export(fit_xy)
 export(fit_xy.model_spec)
+export(get_dependency)
+export(get_fit)
+export(get_from_env)
+export(get_model_env)
+export(get_pred_type)
 export(keras_mlp)
 export(linear_reg)
 export(logistic_reg)
@@ -97,13 +103,24 @@ export(multinom_reg)
 export(nearest_neighbor)
 export(null_model)
 export(nullmodel)
+export(pred_value_template)
 export(predict.model_fit)
 export(rand_forest)
 export(rpart_train)
 export(set_args)
+export(set_dependency)
 export(set_engine)
+export(set_env_val)
+export(set_fit)
+export(set_in_env)
 export(set_mode)
+export(set_model_arg)
+export(set_model_engine)
+export(set_model_mode)
+export(set_new_model)
+export(set_pred)
 export(show_call)
+export(show_model_info)
 export(surv_reg)
 export(svm_poly)
 export(svm_rbf)
@@ -180,7 +197,6 @@ importFrom(stats,na.omit)
 importFrom(stats,na.pass)
 importFrom(stats,predict)
 importFrom(stats,qnorm)
-importFrom(stats,qt)
 importFrom(stats,quantile)
 importFrom(stats,setNames)
 importFrom(stats,terms)
@@ -194,4 +210,4 @@ importFrom(utils,capture.output)
 importFrom(utils,getFromNamespace)
 importFrom(utils,globalVariables)
 importFrom(utils,head)
-importFrom(utils,stack)
+importFrom(vctrs,vec_unique)

NEWS.md

@@ -1,5 +1,11 @@
 # parsnip 0.0.2.9000
 
+## Breaking Changes
+
+ * The method that `parsnip` stores the model information has changed. Any custom models from previous versions will need to use the new method for registering models. The methods are detailed in `?get_model_env()` and the [package vignette for adding models](https://tidymodels.github.io/parsnip/articles/articles/Scratch.html).
+ * The mode need to be declared for models that can be used for more than one mode prior to fitting and/or translation). 
+ * For `surv_reg()`, the engine that uses the `survival` package is now called `survival` instead of `survreg`.  
+
 ## New Features
 
  * `add_rowindex()` can create a column called `.row` to a data frame. 

R/aaa.R

@@ -18,3 +18,10 @@ convert_stan_interval <- function(x, level = 0.95, lower = TRUE) {
   res
 }
 
+# ------------------------------------------------------------------------------
+
+#' @importFrom utils globalVariables
+utils::globalVariables(
+  c('.', '.label', '.pred', '.row', 'data', 'engine', 'engine2', 'group',
+    'lab', 'original', 'predicted_label', 'prediction', 'value', 'type')
+  )