fix gain report bug

rebuild and recheck
WinVector · Jan 18, 2020 · 4360d59 · 4360d59
1 parent 9b69bfc
commit 4360d59
Show file tree

Hide file tree

Showing 101 changed files with 943 additions and 318 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: WVPlots
 Type: Package
 Title: Common Plots for Analysis
-Version: 1.2.2
-Date: 2019-11-03
+Version: 1.2.3
+Date: 2020-01-18
 Authors@R: c(
     person("John", "Mount", email = "[email protected]", role = c("aut", "cre")),
     person("Nina", "Zumel", email = "[email protected]", role = c("aut")),
@@ -21,11 +21,11 @@ Depends:
     R (>= 3.4.0)
 Imports:
     ggplot2 (>= 2.2.0),
-    wrapr (>= 1.9.2),
+    wrapr (>= 1.9.4),
     sigr (>= 1.0.6),
-    cdata (>= 1.1.3),
-    rqdatatable (>= 1.2.3),
-    rquery (>= 1.3.9),
+    cdata (>= 1.1.4),
+    rqdatatable (>= 1.2.5),
+    rquery (>= 1.4.1),
     utils,
     grid,
     gridExtra,
@@ -37,5 +37,5 @@ Suggests:
     RUnit,
     plotly,
     hexbin
-RoxygenNote: 6.1.1
+RoxygenNote: 7.0.2
 ByteCompile: true
diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,8 @@
 
+# WVPlots 1.2.3 2020-01-18
+
+ * Fix gini report.
+
 # WVPlots 1.2.2 2019-11-03
 
  * Fix typo in loglog plot (and remove sig presentation).

diff --git a/R/GainCurve.R b/R/GainCurve.R
@@ -252,7 +252,7 @@ GainCurvePlot = function(frame, xvar, truthVar, title,
         xvar),
       subtitle=paste0(
         'Gini score: ',
-        format(idealArea, digits = 2),
+        format(modelArea, digits = 2),
         ', relative Gini score: ',
         format(relGiniScore, digits = 2),
         pString
@@ -483,7 +483,7 @@ GainCurvePlotC = function(frame, xvar, costVar, truthVar, title,
         xvar),
       subtitle=paste0(
         'Gini score: ',
-        format(idealArea, digits = 2),
+        format(modelArea, digits = 2),
         ', relative Gini score: ',
         format(relGiniScore, digits = 2),
         pString

diff --git a/R/run_WVPlots_tests.R b/R/run_WVPlots_tests.R
@@ -7,8 +7,7 @@
 #' Attaches RUnit and pkg, requires RUnit.
 #' Stops on error.
 #'
-#' Based on \url{https://github.com/RcppCore/Rcpp/blob/master/tests/doRUnit.R}.  This
-#' version is GPL-3, works derived from it must be distributed GPL-3.
+#' Based on \code{Rcpp/doRUnit.R}.
 #'
 #' @param ... not used, force later arguments to bind by name.
 #' @param verbose logical, if TRUE print more.

diff --git a/cran-comments.md b/cran-comments.md
@@ -3,54 +3,38 @@
 
 ### OSX
 
-    R CMD check --as-cran WVPlots_1.2.2.tar.gz 
+    R CMD check --as-cran WVPlots_1.2.3.tar.gz
     * using R version 3.6.0 (2019-04-26)
     * using platform: x86_64-apple-darwin15.6.0 (64-bit)
     * using session charset: UTF-8
     * using option ‘--as-cran’
     * checking for file ‘WVPlots/DESCRIPTION’ ... OK
     * checking extension type ... Package
-    * this is package ‘WVPlots’ version ‘1.2.2’
+    * this is package ‘WVPlots’ version ‘1.2.3’
     * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers
     Maintainer: ‘John Mount <[email protected]>’
     Status: OK
 
 ### Windows
 
     rhub::check_for_cran()
-    (service broken)
-
-    devtools::check_win_devel()
-    (not yet run)
-
-### Linux
-
-    rhub::check_for_cran()
-    5691#> * using R version 3.6.1 (2019-07-05)
-    5692#> * using platform: x86_64-pc-linux-gnu (64-bit)
-    5693#> * using session charset: UTF-8
-    5694#> * using option ‘--as-cran’
-    5695#> * checking for file ‘WVPlots/DESCRIPTION’ ... OK
-    5696#> * checking extension type ... Package
-    5697#> * this is package ‘WVPlots’ version ‘1.2.2’
-    5698#> * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers
-    5699#> Maintainer: ‘John Mount ’
-    5754#> Status: OK
-
-    rhub::check_for_cran()
-    2766#> About to run xvfb-run R CMD check --as-cran WVPlots_1.2.2.tar.gz
-    2767#> * using log directory ‘/home/docker/WVPlots.Rcheck’
-    2768#> * using R Under development (unstable) (2019-11-03 r77361)
-    2769#> * using platform: x86_64-pc-linux-gnu (64-bit)
-    2770#> * using session charset: UTF-8
-    2771#> * using option ‘--as-cran’
-    2772#> * checking for file ‘WVPlots/DESCRIPTION’ ... OK
-    2773#> * checking extension type ... Package
-    2774#> * this is package ‘WVPlots’ version ‘1.2.2’
-    2775#> * checking CRAN incoming feasibility ...NB: need Internet access to use CRAN incoming checks
-    2776#> Note_to_CRAN_maintainers
-    2777#> Maintainer: ‘John Mount ’
-    2834#> Status: OK
+     968#> setting _R_CHECK_FORCE_SUGGESTS_ to false
+     969#> setting R_COMPILE_AND_INSTALL_PACKAGES to never
+     970#> setting R_REMOTES_STANDALONE to true
+     971#> setting R_REMOTES_NO_ERRORS_FROM_WARNINGS to true
+     972#> setting _R_CHECK_FORCE_SUGGESTS_ to true
+     973#> setting _R_CHECK_CRAN_INCOMING_USE_ASPELL_ to true
+     974#> * using log directory 'C:/Users/USERkZjcMBnuWD/WVPlots.Rcheck'
+     975#> * using R Under development (unstable) (2020-01-07 r77637)
+     976#> * using platform: x86_64-w64-mingw32 (64-bit)
+     977#> * using session charset: ISO8859-1
+     978#> * using option '--as-cran'
+     979#> * checking for file 'WVPlots/DESCRIPTION' ... OK
+     980#> * checking extension type ... Package
+     981#> * this is package 'WVPlots' version '1.2.3'
+     982#> * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers
+     983#> Maintainer: 'John Mount '
+     1039#> Status: OK
 
 ## Downstream dependencies
 

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/WVPlots_concept.html b/docs/articles/WVPlots_concept.html
diff --git a/docs/articles/WVPlots_concept_files/figure-html/unnamed-chunk-5-1.png b/docs/articles/WVPlots_concept_files/figure-html/unnamed-chunk-5-1.png
diff --git a/docs/articles/WVPlots_examples.html b/docs/articles/WVPlots_examples.html
diff --git a/docs/articles/WVPlots_examples_files/figure-html/unnamed-chunk-11-1.png b/docs/articles/WVPlots_examples_files/figure-html/unnamed-chunk-11-1.png
diff --git a/docs/articles/WVPlots_examples_files/figure-html/unnamed-chunk-12-1.png b/docs/articles/WVPlots_examples_files/figure-html/unnamed-chunk-12-1.png
diff --git a/docs/articles/WVPlots_examples_files/figure-html/unnamed-chunk-13-1.png b/docs/articles/WVPlots_examples_files/figure-html/unnamed-chunk-13-1.png
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/reference/BinaryYScatterPlot.html b/docs/reference/BinaryYScatterPlot.html
diff --git a/docs/reference/ClevelandDotPlot.html b/docs/reference/ClevelandDotPlot.html
diff --git a/docs/reference/ConditionalSmoothedScatterPlot.html b/docs/reference/ConditionalSmoothedScatterPlot.html
diff --git a/docs/reference/DiscreteDistribution.html b/docs/reference/DiscreteDistribution.html
diff --git a/docs/reference/DoubleDensityPlot.html b/docs/reference/DoubleDensityPlot.html