Skip to content

Commit fa2bd14

Browse files
committed
rebuild and recheck
1 parent 6a591bc commit fa2bd14

29 files changed

+227
-222
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Package: vtreat
22
Type: Package
33
Title: A Statistically Sound 'data.frame' Processor/Conditioner
44
Version: 1.5.1
5-
Date: 2020-01-14
5+
Date: 2020-01-16
66
Authors@R: c(
77
person("John", "Mount", email = "[email protected]", role = c("aut", "cre")),
88
person("Nina", "Zumel", email = "[email protected]", role = c("aut")),

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# vtreat 1.5.1 2020/01/14
2+
# vtreat 1.5.1 2020/01/16
33

44
* Check for same-frame on prepare paths.
55
* Pipe into ft.

R/utils.R

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,11 @@ vtreat_make_names <- function(nms_in,
385385
#' @importFrom digest digest
386386
NULL
387387

388-
# approximate object identity check
388+
# approximate object identity check, can return NULL
389389
id_f <- function(d) {
390+
if(!isTRUE(getOption('vtreat.check_for_nested_model_bias', TRUE))) {
391+
return(NULL)
392+
}
390393
return(digest::digest(d))
391394
}
392395

R/zzz.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
vtreat_default_options <- list(
55
vtreat.use_data.table_binding = TRUE,
66
vtreat.use_clean_suffix = FALSE,
7-
vtreat.allow_parallel = TRUE
7+
vtreat.allow_parallel = TRUE,
8+
vtreat.check_for_nested_model_bias = TRUE
89
)
910
op <- options()
1011
toset <- setdiff(names(vtreat_default_options), names(op))

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -336,14 +336,14 @@ dTestC <- data.frame(x=c('a', 'b', 'c', NA), z=c(10, 20, 30, NA))
336336
treatmentsC <- designTreatmentsC(dTrainC, colnames(dTrainC), 'y', TRUE,
337337
verbose=FALSE)
338338
print(treatmentsC$scoreFrame[, c('origName', 'varName', 'code', 'rsq', 'sig', 'extraModelDegrees')])
339-
# origName varName code rsq sig extraModelDegrees
340-
# 1 x x_catP catP 0.059315943 0.45141252 2
341-
# 2 x x_catB catB 0.029824903 0.59334713 2
342-
# 3 z z clean 0.237601767 0.13176020 0
343-
# 4 z z_isBAD isBAD 0.296065432 0.09248399 0
344-
# 5 x x_lev_NA lev 0.296065432 0.09248399 0
345-
# 6 x x_lev_x_a lev 0.130005705 0.26490379 0
346-
# 7 x x_lev_x_b lev 0.006067337 0.80967242 0
339+
# origName varName code rsq sig extraModelDegrees
340+
# 1 x x_catP catP 1.559780e-01 0.22202097 2
341+
# 2 x x_catB catB 1.142159e-05 0.99166241 2
342+
# 3 z z clean 2.376018e-01 0.13176020 0
343+
# 4 z z_isBAD isBAD 2.960654e-01 0.09248399 0
344+
# 5 x x_lev_NA lev 2.960654e-01 0.09248399 0
345+
# 6 x x_lev_x_a lev 1.300057e-01 0.26490379 0
346+
# 7 x x_lev_x_b lev 6.067337e-03 0.80967242 0
347347

348348
# help("prepare")
349349

@@ -383,9 +383,9 @@ treatmentsN = designTreatmentsN(dTrainN, colnames(dTrainN), 'y',
383383
verbose=FALSE)
384384
print(treatmentsN$scoreFrame[, c('origName', 'varName', 'code', 'rsq', 'sig', 'extraModelDegrees')])
385385
# origName varName code rsq sig extraModelDegrees
386-
# 1 x x_catP catP 1.348315e-01 0.3708945 2
387-
# 2 x x_catN catN 4.582430e-02 0.6107193 2
388-
# 3 x x_catD catD 2.549856e-01 0.2018336 2
386+
# 1 x x_catP catP 7.174888e-02 0.5212691 2
387+
# 2 x x_catN catN 1.950163e-03 0.9173064 2
388+
# 3 x x_catD catD 3.743113e-01 0.1069707 2
389389
# 4 z z clean 2.880952e-01 0.1701892 0
390390
# 5 z z_isBAD isBAD 3.333333e-01 0.1339746 0
391391
# 6 x x_lev_NA lev 3.333333e-01 0.1339746 0

cran-comments.md

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,45 @@
33

44
### OSX
55

6-
R CMD check --as-cran vtreat_1.5.0.tar.gz
6+
R CMD check --as-cran vtreat_1.5.1.tar.gz
77
* using R version 3.6.0 (2019-04-26)
88
* using platform: x86_64-apple-darwin15.6.0 (64-bit)
99
* using session charset: UTF-8
1010
* using option ‘--as-cran’
1111
* checking for file ‘vtreat/DESCRIPTION’ ... OK
1212
* checking extension type ... Package
13-
* this is package ‘vtreat’ version ‘1.5.0
13+
* this is package ‘vtreat’ version ‘1.5.1
1414
* checking CRAN incoming feasibility ... Note_to_CRAN_maintainers
1515
Maintainer: ‘John Mount <[email protected]>’
1616
Status: OK
1717

1818
### Windows
1919

2020
rhub::check_for_cran()
21-
595#> setting _R_CHECK_FORCE_SUGGESTS_ to false
22-
596#> setting R_COMPILE_AND_INSTALL_PACKAGES to never
23-
597#> setting R_REMOTES_STANDALONE to true
24-
598#> setting R_REMOTES_NO_ERRORS_FROM_WARNINGS to true
25-
599#> setting _R_CHECK_FORCE_SUGGESTS_ to true
26-
600#> setting _R_CHECK_CRAN_INCOMING_USE_ASPELL_ to true
27-
601#> * using log directory 'C:/Users/USERHcCdOFfKjh/vtreat.Rcheck'
28-
602#> * using R Under development (unstable) (2019-11-08 r77393)
29-
603#> * using platform: x86_64-w64-mingw32 (64-bit)
30-
604#> * using session charset: ISO8859-1
31-
605#> * using option '--as-cran'
32-
606#> * checking for file 'vtreat/DESCRIPTION' ... OK
33-
607#> * checking extension type ... Package
34-
608#> * this is package 'vtreat' version '1.5.0'
35-
609#> * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers
36-
610#> Maintainer: 'John Mount '
37-
652#> * checking sizes of PDF files under 'inst/doc' ... NOTE
38-
653#> Unable to find GhostScript executable to run checks on size reduction
39-
668#> Status: 1 NOTE
21+
677#> setting _R_CHECK_FORCE_SUGGESTS_ to false
22+
678#> setting R_COMPILE_AND_INSTALL_PACKAGES to never
23+
679#> setting R_REMOTES_STANDALONE to true
24+
680#> setting R_REMOTES_NO_ERRORS_FROM_WARNINGS to true
25+
681#> setting _R_CHECK_FORCE_SUGGESTS_ to true
26+
682#> setting _R_CHECK_CRAN_INCOMING_USE_ASPELL_ to true
27+
683#> * using log directory 'C:/Users/USERDzGwBgVLWk/vtreat.Rcheck'
28+
684#> * using R Under development (unstable) (2020-01-07 r77637)
29+
685#> * using platform: x86_64-w64-mingw32 (64-bit)
30+
686#> * using session charset: ISO8859-1
31+
687#> * using option '--as-cran'
32+
688#> * checking for file 'vtreat/DESCRIPTION' ... OK
33+
689#> * checking extension type ... Package
34+
690#> * this is package 'vtreat' version '1.5.1'
35+
691#> * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers
36+
692#> Maintainer: 'John Mount '
37+
734#> * checking sizes of PDF files under 'inst/doc' ... NOTE
38+
735#> Unable to find GhostScript executable to run checks on size reduction
39+
750#> Status: 1 NOTE
4040
GhostScript NOTE is a property of the test environment, not of the package.
4141

4242
## Downstream dependencies
4343

4444
No declared reverse dependencies ( https://github.com/WinVector/vtreat/blob/master/extras/check_reverse_dependencies.md ).
45-
4645

4746
Mount and Zumel are not mis-spellings.
4847

docs/articles/MultiClassVtreat.html

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

docs/articles/SavingTreamentPlans.html

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

docs/articles/VariableImportance.html

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

docs/articles/vtreat.html

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

0 commit comments

Comments
 (0)