Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
3367fab
prototype registration methods for #167
topepo May 5, 2019
fee8383
a little better printing
topepo May 5, 2019
435ee57
testing out registration of a model
topepo May 5, 2019
6705074
moved to aaa_models
topepo May 5, 2019
d8e093a
dependencies, fit, and predict
topepo May 5, 2019
0dc6e92
testing to see if rf could be registered
topepo May 5, 2019
10d51a9
changed register to set; restructured the pkg information
topepo May 9, 2019
a4df557
Added submodel info for issue #167
topepo May 21, 2019
eda3e97
more model conversions
topepo May 23, 2019
33f63d1
more model conversions
topepo May 23, 2019
613a91e
model conversions and keyword internal
topepo May 23, 2019
a4c0955
temp commented out until new model structures are ready
topepo May 23, 2019
5dc131d
added some replacement functions for new model structure
topepo May 23, 2019
7d9cca7
disabled Rd Sexpr until new data structure ready
topepo May 23, 2019
05f7eff
updated check_engine
topepo May 23, 2019
53d40f9
basic translate is working
topepo May 23, 2019
de5ea8b
added missing engine filter
topepo May 23, 2019
409fdf1
new structure working up to `fit` and `fit_xy`
topepo May 25, 2019
fbd544a
_almost_ all tests pass
topepo May 27, 2019
edcddce
removed or consolidated functions
topepo May 27, 2019
d6e80c7
some documentation
topepo May 27, 2019
91d1296
changed `mod` argument to `model`
topepo May 28, 2019
fc6ccbe
re-enable Sexpr in man files
topepo May 28, 2019
4130745
changed some argument names to be a little more specific
topepo May 28, 2019
d0aaee9
better model summary code and examples
topepo May 30, 2019
75f5c47
a little more documentation
topepo May 30, 2019
ef96a46
updated vignette for custom models
topepo May 31, 2019
1113ed5
more banners
topepo May 31, 2019
eab824e
added a translate function for knn
topepo May 31, 2019
8b321eb
Merge branch 'internal-refactoring' of https://github.com/tidymodels/…
topepo May 31, 2019
4b0808f
start of unit tests
topepo May 31, 2019
e7cb16f
Merge branch 'internal-refactoring' of https://github.com/tidymodels/…
topepo May 31, 2019
e29daa2
fixed some test cases
topepo Jun 1, 2019
697ca0e
figuring out travis issues
topepo Jun 1, 2019
13d43ab
added mode specification
topepo Jun 1, 2019
b869d6a
bug fixes
topepo Jun 1, 2019
2700f96
more travis investigations
topepo Jun 1, 2019
c69037b
fixed rd files
topepo Jun 1, 2019
c7054fe
version exclusions from rmarkdown and partykit
topepo Jun 1, 2019
648a9d0
test change and pkgdown update
topepo Jun 1, 2019
3c23479
pkgdown docs
topepo Jun 1, 2019
1d6f9f3
remvoed validation function
topepo Jun 1, 2019
d1bee75
added links
topepo Jun 1, 2019
87d58be
prevent overwriting arguments
topepo Jun 1, 2019
4b1d49f
more test cases
topepo Jun 1, 2019
0216d4d
Update .travis.yml
topepo Jun 1, 2019
f619e29
another exclusions with notes
topepo Jun 1, 2019
4922df9
remove cache for R packages and binaries for 3.5 failures
topepo Jun 3, 2019
8f8a142
adjust failure allowances
topepo Jun 3, 2019
3fbc3f8
un-exported check_* functions
topepo Jun 6, 2019
4f82ee9
removed the distinct() check from set_fit()
topepo Jun 6, 2019
bf06b9c
added the missing has_submodel column
topepo Jun 6, 2019
1aac943
small changes
topepo Jun 6, 2019
de7c048
modularized interface check
topepo Jun 6, 2019
0ae5d36
added rlm for an engine only explanation
topepo Jun 13, 2019
c90b698
Merge branch 'internal-refactoring' of https://github.com/tidymodels/…
topepo Jun 13, 2019
0c90d72
removed `others` references
topepo Jun 24, 2019
39bf71e
template for prediction objects
topepo Jun 26, 2019
92701aa
check_eng_val
topepo Jun 26, 2019
8973a2e
two setting funcitons
topepo Jun 26, 2019
1b76e44
restructured documentation for model devel
topepo Jun 26, 2019
218cc73
proper uniqueness enforcement for argument tibbles
topepo Jun 26, 2019
6553e39
change cran mirror
topepo Jun 26, 2019
073370a
remotes for vctrs
topepo Jun 26, 2019
08817e7
cleaned up check_mod_val
topepo Jun 26, 2019
28d7ace
tightened up tests
topepo Jun 27, 2019
2034a3f
remove some warnings in tests
topepo Jun 27, 2019
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
43 changes: 11 additions & 32 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()'
Expand Down
6 changes: 4 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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(
Expand Down Expand Up @@ -27,7 +27,8 @@ Imports:
magrittr,
stats,
tidyr,
globals
globals,
vctrs
Roxygen: list(markdown = TRUE)
RoxygenNote: 6.1.1
Suggests:
Expand All @@ -49,3 +50,4 @@ Suggests:
rpart,
MASS,
nlme
Remotes: r-lib/vctrs
20 changes: 18 additions & 2 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -194,4 +210,4 @@ importFrom(utils,capture.output)
importFrom(utils,getFromNamespace)
importFrom(utils,globalVariables)
importFrom(utils,head)
importFrom(utils,stack)
importFrom(vctrs,vec_unique)
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
7 changes: 7 additions & 0 deletions R/aaa.R
Original file line number Diff line number Diff line change
Expand Up @@ -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')
)
Loading