Merge pull request #79 from HughParsonage/RM-RcppParallel

Rm rcpp parallel

Author: HughParsonage

.travis.yml

@@ -24,7 +24,6 @@ r_github_packages:
 after_success:
   - Rscript -e 'formalCoverage::formalPackageCoverage()'
   - Rscript -e 'library(taxstats);library(data.table);print(sample_file_1415_synth)'
-  - Rscript -e 'library(taxstats);library(data.table);print(setDT(sample_file_0304))'
   - Rscript -e 'remove.packages("taxstats")'
   - Rscript -e 'install.packages(c("devtools", "roxygen2"))'
   - Rscript -e 'devtools::test()'

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: grattan
 Type: Package
 Title: Australian Tax Policy Analysis
-Version: 1.5.3.6
-Date: 2018-02-21
+Version: 1.5.3.7
+Date: 2018-02-22
 Authors@R: c(person("Hugh", "Parsonage", role = c("aut", "cre"), email = "hugh.parsonage@gmail.com"),
               person("Tim", "Cameron", role = "aut"),
               person("Brendan", "Coates", role = "aut"), 
@@ -29,12 +29,10 @@ Imports:
     assertthat,
     magrittr,
     Rcpp (>= 0.12.3),
-    RcppParallel,
     utils,
     zoo
 LinkingTo: 
-    Rcpp,
-    RcppParallel
+    Rcpp
 RoxygenNote: 6.0.1
 Suggests:
     dplyr,
@@ -54,4 +52,3 @@ Suggests:
 Additional_repositories: https://hughparsonage.github.io/drat/
 LazyData: true
 VignetteBuilder: knitr
-SystemRequirements: GNU make

NAMESPACE

@@ -60,7 +60,6 @@ export(weighted_ntile)
 export(yr2fy)
 import(data.table)
 importFrom(Rcpp,sourceCpp)
-importFrom(RcppParallel,RcppParallelLibs)
 importFrom(fastmatch,"%fin%")
 importFrom(hutils,AND)
 importFrom(hutils,NEITHER)

R/RcppExports.R

@@ -69,7 +69,7 @@ pmax3 <- function(x, y, z) {
 #' @name pmaxC
 #' @param x A numeric vector.
 #' @param a A single numeric value.
-#' @return The parallel maximum of the input values.
+#' @return The parallel maximum of the input values. \code{pmax0(x)} is shorthand for \code{pmaxC(x, 0)}, i.e. convert negative values in \code{x} to 0.
 #' @note This function will always be faster than \code{pmax(x, a)} when \code{a} is a single value, but can be slower than \code{pmax.int(x, a)} when \code{x} is short. Use this function when comparing a numeric vector with a single value.
 #' @export pmaxC
 NULL
@@ -78,6 +78,10 @@ pmaxC <- function(x, a) {
     .Call(`_grattan_pmaxC`, x, a)
 }
 
+pmax0 <- function(x) {
+    .Call(`_grattan_pmax0`, x)
+}
+
 #' @title Parallel maximum
 #' @description A faster \code{pmax()}.
 #'
@@ -98,7 +102,7 @@ pmaxV <- function(x, y) {
 #' @name pminC
 #' @param x A numeric vector.
 #' @param a A single numeric value.
-#' @return The parallel minimum of the input values.
+#' @return The parallel minimum of the input values. The \code{0} versions are shortcuts for \code{a = 0}.
 #' @note This function will always be faster than \code{pmin(x, a)} when \code{a} is a single value, but can be slower than \code{pmin.int(x, a)} when \code{x} is short. Use this function when comparing a numeric vector with a single value.
 #' @export pminC
 NULL
@@ -107,6 +111,10 @@ pminC <- function(x, a) {
     .Call(`_grattan_pminC`, x, a)
 }
 
+pmin0 <- function(x) {
+    .Call(`_grattan_pmin0`, x)
+}
+
 #' @title Parallel maximum
 #' @description A faster \code{pmin()}.
 #'

R/grattan-package.R

@@ -25,7 +25,6 @@
 #' @importFrom magrittr and
 
 #' @importFrom Rcpp sourceCpp
-#' @importFrom RcppParallel RcppParallelLibs
 #' @importFrom stats complete.cases
 #' 
 #' 

R/income_tax.R

@@ -501,7 +501,8 @@ income_tax_cpp <- function(income, fy.year, .dots.ATO = NULL, sapto.eligible = N
       .[, "lito" := lito.] %>%
       .[, "sapto" := sapto.] %>%
       .[, "medicare_levy" := medicare_levy.] %>%
-      .[, "income_tax" := out]
+      .[, "income_tax" := out] %>%
+      .[, "SBTO" := sbto.] 
 
     # if (fy.year == "2011-12") {
     #   result[, "flood_levy" := flood_levy.]

R/small_business_tax_offset.R

@@ -135,8 +135,9 @@ small_business_tax_offset <- function(taxable_income,
       }
       smbto_p <- tax_discount
     }
-    
-    out <- pminC(prop_tax_for_biz * smbto_p, 1000)
+    out <- prop_tax_for_biz * smbto_p
+    out[is.nan(out)] <- 0
+    out <- pminC(out, 1000)
 
     # Only business with an aggregate annual turnover of less than $2M
     out[aggregated_turnover >= 2e6] <- 0

cran-comments.md

@@ -2,15 +2,17 @@
 0 ERRORS | 0 WARNINGS | 1-3 NOTEs
 
 ### Test environments:
-* Local Windows R 3.4.3
+* Local Windows MRAN 3.4.3:
+  - taxstats 0.0.4.1314
+  - taxstats 0.0.5.1415
 * Travis-CI: R 3.3, 3.4, and dev
-* Appveyor: dev and release.
+* Appveyor: dev (ERROR as data.table was unavailable) and release.
 * winbuilder: dev and release.
 
-This is an update to skip tests that do not run reliably on CRAN, following updates to dependencies. There was a single new NOTE indicating that the last submission was not long ago: this update was requested by CRAN.
+This is an update and resubmission to skip tests that do not run reliably on CRAN, following updates to dependencies. There was a single new NOTE indicating that the last submission was not long ago: this update was requested by CRAN. In addition, the UBSAN issues have been avoided by removing the dependency on RcppParallel entirely.
 
 NOTES:
-'Days since last update: 3'
+'Days since last update: 4'
   ==> Update requested by CRAN.
 
 Possibly mis-spelled words in DESCRIPTION: ...
@@ -19,9 +21,6 @@ Possibly mis-spelled words in DESCRIPTION: ...
 Suggests or Enhances not in mainstream repositories: ...
   ==> Normal due to taxstats dependency
 
-GNU make is a SystemRequirements.
-  ==> Required.
-
 ## Note to CRAN: moderately-large vignette
 The vignette is quite lengthy and, while it will run on CRAN, requires the installation of 'taxstats', a 58 MB source package, each time the package is checked.