Update data, CRAN release (#185)

Update data, CRAN release

Author: DaniWood

.Rbuildignore

@@ -1,3 +1,4 @@
+^CRAN-RELEASE$
 ^Meta$
 ^doc$
 ^\.circleci$

CRAN-RELEASE

@@ -0,0 +1,2 @@
+This package was submitted to CRAN on 2019-05-02.
+Once it is accepted, delete this file and tag the release (commit 3d114211b5).

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: grattan
 Type: Package
 Title: Australian Tax Policy Analysis
-Version: 1.7.1.901
-Date: 2019-03-21
+Version: 1.7.1.1
+Date: 2019-05-01
 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"),
@@ -11,14 +11,14 @@ Authors@R: c(person("Hugh", "Parsonage", role = c("aut", "cre"), email = "hugh.p
               person("Ittima", "Cherastidtham", role = "dtc"),
               person("W.", "Karsten", role = "ctb"),
               person("M.", "Enrique Garcia", role = "ctb"),
-              person("Matt", "Cowgill", role = "ctb"))
+              person("Matt", "Cowgill", role = "aut"))
 Maintainer: Hugh Parsonage <hugh.parsonage@gmail.com>
 URL: https://github.com/HughParsonage/grattan, https://hughparsonage.github.io/grattan/
 BugReports: https://github.com/HughParsonage/grattan/issues
 Description: Utilities for costing and evaluating Australian tax policy, including high-performance tax and transfer calculators, a fast method of projecting tax collections, and an interface to common indices from the Australian Bureau of Statistics.  Written to support Grattan Institute's Australian Perspectives program. For access to the 'taxstats' package, please run
  install.packages("taxstats", repos = "https://hughparsonage.github.io/tax-drat/", type = "source"). 
  N.B. The 'taxstats' package is approximately 50 MB.
-Depends: R (>= 3.3.0)
+Depends: R (>= 3.5.0)
 License: GPL-2
 Imports:
     data.table,

NEWS.md

@@ -1,3 +1,8 @@
+## 1.7.1.1
+* `grattan` now depends on R 3.5.0 due to serialization format version 3 becoming the default
+  in R 3.6.0.
+* `cpi_inflator` fails more gracefully when the ABS's website is not available
+
 ## 1.7.1.0
 
 ### Bug fixes

R/cpi_inflator.R

@@ -12,7 +12,7 @@
 #' If the SDMX connection fails, a message is emitted (not a warning) and
 #' the function contines as if \code{useABSConnection = FALSE}.
 #' 
-#' The internal data was updated on 2019-03-23 to 2018-Q4. 
+#' The internal data was updated on 2019-05-02 to 2019-Q1. 
 #' If using \code{useABSConnection = TRUE}, ensure you have \code{rsdmx (>= 0.5-10)} up-to-date.
 #' @param allow.projection Should projections beyond the ABS's data be allowed?
 #' @param accelerate.above An integer setting the threshold for 'acceleration'. 

R/cpi_inflator_quarters.R

@@ -4,7 +4,7 @@
 #' @param to_qtr (date in quarters) the date to be inflated to, where nominal price = real price. Must be of the form "YYYY-Qq" e.g. "1066-Q2".
 #' @param adjustment Should there be an adjustment made to the index? Adjustments include 'none' (no adjustment), 'seasonal', or 'trimmed' [referring to trimmed mean]. By default, \code{seasonal}.
 #' @param useABSConnection Should the function connect with ABS.Stat via an SDMX connection? By default set to \code{FALSE} in which case a pre-prepared index table is used. This is much faster and more reliable (in terms of errors), though of course relies on the package maintainer to keep the tables up-to-date.
-#' The internal data was updated on 2019-03-23 to 2018-Q4.
+#' The internal data was updated on 2019-05-02 to 2019-Q1.
 #' If using \code{useABSConnection = TRUE}, ensure you have \code{rsdmx (>= 0.5-10)} up-to-date.
 #' @return A vector of real prices.
 #' @export

R/lf_inflator.R

@@ -15,7 +15,7 @@
 #' If the SDMX connection fails, a message is emitted (not a warning) and
 #' the function contines as if \code{useABSConnection = FALSE}.
 #' 
-#' The internal data was updated on 2019-04-03 to 2019-02-01.
+#' The internal data was updated on 2019-05-02 to 2019-03-01.
 #' @param allow.projection Logical. Should projections be allowed?
 #' @param use.month An integer (corresponding to the output of \code{data.table::month}) representing the month of the series used for the inflation.
 #' @param forecast.series Whether to use the forecast mean, or the upper or lower boundaries of the prediction intervals.

R/project.R

@@ -123,15 +123,15 @@ project <- function(sample_file,
     # without updating the fy.year.of.sample.file
     if (is.null(fy.year.of.sample.file)) {
       fy.year.of.sample.file <-
-        match(nrow(sample_file), c(254318L, 258774L, 263339L, 269639L))
+        match(nrow(sample_file), c(254318L, 258774L, 263339L, 269639L,  277202L))
       if (is.na(fy.year.of.sample.file)) {
         stop("`fy.year.of.sample.file` was not provided, and its value could not be ",
              "inferred from nrow(sample_file) = ", nrow(sample_file), ". Either use ", 
              "a 2% sample file of the years 2012-13, 2013-14, or 2014-15 or ", 
              "supply `fy.year.of.sample.file` manually.")
       }
       fy.year.of.sample.file <- 
-        c("2012-13", "2013-14", "2014-15", "2015-16")[fy.year.of.sample.file]
+        c("2012-13", "2013-14", "2014-15", "2015-16", "2016-17")[fy.year.of.sample.file]
     }
 
 
@@ -156,7 +156,12 @@ project <- function(sample_file,
                warning("nrow(sample_file) != 269639. Should you choose a different fy.year.of.sample.file?")
              }
            },
-           stop("`fy.year.of.sample.file` must be '2012-13', '2013-14', or '2014-15'."))
+           "2016-17" = {
+             if (nrow(sample_file) != 277202) {
+               warning("nrow(sample_file) != 277202. Should you choose a different fy.year.of.sample.file?")
+             }
+           },
+           stop("`fy.year.of.sample.file` must be '2012-13', '2013-14', '2014-15', '2015-16', or '2016-17'."))
   }
 
   if (h == 0) {
@@ -315,6 +320,7 @@ project <- function(sample_file,
              "2013-14" = generic_inflators_1314, 
              "2014-15" = generic_inflators_1415, 
              "2015-16" = generic_inflators_1516, 
+             "2016-17" = generic_inflators_1617, 
              stop("Precalculated inflators only available when projecting from ",
                   "2012-13, 2013-14, 2014-15, and 2015-16."))
   }

R/sysdata.rda

@@ -10,7 +10,7 @@
 #' If the SDMX connection fails, a message is emitted (not a warning) and
 #' the function contines as if \code{useABSConnection = FALSE}.
 #' 
-#' The internal data was updated on 2019-03-23 to 2018-Q4. 
+#' The internal data was updated on 2019-05-02 to 2018-Q4. 
 #' @param allow.projection If set to \code{TRUE} the \code{forecast} package is used to project forward, if required. 
 #' @param forecast.series Whether to use the forecast mean, or the upper or lower boundaries of the prediction intervals. A fourth option \code{custom} allows manual forecasts to be set.
 #' @param forecast.level The prediction interval to be used if \code{forecast.series} is \code{upper} or \code{lower}.