Merge pull request #206 from HughParsonage/fys

Fys + newdata

Author: DaniWood

CRAN-RELEASE

@@ -2,7 +2,7 @@ Package: grattan
 Type: Package
 Title: Australian Tax Policy Analysis
 Version: 1.8.0.0
-Date: 2019-11-02
+Date: 2019-11-16
 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"),

DESCRIPTION

@@ -16,6 +16,11 @@
   #> Error: `x = "foo"` was not a valid financial year.
   ```
 
+### Data
+
+* Update wage and labour force data
+
+
 
 
 

NEWS.md

@@ -12,8 +12,8 @@
 #' @export 
 
 aus_pop_qtr_age <- function(date = NULL, age = NULL, tbl = FALSE, roll = TRUE, roll.beyond = FALSE) {
-  if (!is.null(date)){
-    stopifnot(all(inherits(date, "Date")))
+  if (!is.null(date)) {
+    date <- as.Date(date)
 
     if (length(date) > length(age)) {
       if (length(age) > 1L) {
@@ -31,28 +31,28 @@ aus_pop_qtr_age <- function(date = NULL, age = NULL, tbl = FALSE, roll = TRUE, r
     }
   }
 
-  if (!is.null(age)){
+  if (!is.null(age)) {
     stopifnot(is.numeric(age),
-              all(age >= 0), 
-              all(age <= 100))
+              min(age, na.rm = TRUE) >= 0L,
+              max(age, na.rm = TRUE) <= 100L)
   }
 
-  if (AND(NEITHER(identical(roll, FALSE),
+  if (AND(NEITHER(isFALSE(roll),
                   roll.beyond),
           NEITHER(is.null(date),
                   all(date %between% range(aust_pop_by_age_yearqtr[["Date"]]))))) {
     warning("Rolling join used beyond the limit of data.")
   }
   # CRAN note avoidance
   Date <- Age <- Value <- NULL
-  if (is.null(date)){
-    if (is.null(age)){
+  if (is.null(date)) {
+    if (is.null(age)) {
       out <- aust_pop_by_age_yearqtr
     } else {
       out <- aust_pop_by_age_yearqtr[Age %in% age]
     }
   } else {
-    if (is.null(age)){
+    if (is.null(age)) {
       input <-
         data.table(Date = date, 
                    Age = seq_len(100),
@@ -79,7 +79,7 @@ aus_pop_qtr_age <- function(date = NULL, age = NULL, tbl = FALSE, roll = TRUE, r
     out[, ordering := NULL]
   }
 
-  if (tbl){
+  if (tbl) {
     return(out[])
   } else {
     return(out[["Value"]])

R/aus_pop_qtr_age.R

@@ -42,11 +42,12 @@ fy.year <- function(yr_ending) {
   paste0(as.integer(yr_ending) - 1, "-", substr(yr_ending, 3, 4))
 }
 
-yr2fy <- fy::yr2fy
+yr2fy <- function(...) as.character(fy::yr2fy(...))
 fy2yr <- fy::fy2yr
 fy2date <- fy::fy2date
-date2fy <- fy::date2fy
-qtr2fy <- fy::qtr2fy
+date2fy <- function(...) as.character(fy::date2fy(...))
+qtr2fy <- function(...) as.character(fy::qtr2fy(...))
+
 
 max_fy2yr <- function(x) fy2yr(max(x))
 min_fy2yr <- function(x) fy2yr(min(x))

R/fy.year.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-10-29 to 2019-09-01.
+#' The internal data was updated on 2019-11-15 to 2019-10-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.
@@ -43,7 +43,9 @@
 #'                forecast.series = "custom", 
 #'                lf.series = data.table(fy_year = c("2018-19", "2019-20"),
 #'                                       r = c(0, 0.01)))
-#' @return The relative labour force between \code{to_date} and \code{for_date} or \code{to_fy} and \code{from_fy}, multiplied by \code{labour_force}.
+#' @return The relative labour force between \code{to_date} and \code{for_date} 
+#' or \code{to_fy} and \code{from_fy}, multiplied by \code{labour_force}.
+#' 
 #' @export lf_inflator lf_inflator_fy
 
 lf_inflator_fy <- function(labour_force = 1,

R/lf_inflator.R

@@ -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-10-29 to 2019-Q2. 
+#' The internal data was updated on 2019-11-15 to 2019-Q3. 
 #' @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}.
@@ -53,15 +53,15 @@ wage_inflator <- function(wage = 1,
   # CRAN
   obsTime <- obsValue <- to_index <- from_index <- NULL
 
-  if (is.null(from_fy) && is.null(to_fy)){
+  if (is.null(from_fy) && is.null(to_fy)) {
     to_fy <- date2fy(Sys.Date())
     from_fy <- prev_fy(to_fy)
     warning("`from_fy` and `to_fy` are missing, using previous and current financial years respectively")
   }
-  if (is.null(from_fy)){
+  if (is.null(from_fy)) {
     stop("`from_fy` is missing, with no default.")
   } 
-  if (is.null(to_fy)){
+  if (is.null(to_fy)) {
     stop("`to_fy` is missing, with no default.")
   }
 

R/sysdata.rda

@@ -1,13 +1,10 @@
-This is a package resubmission after archival.
-
-The vignettes have been protected from accessing taxstats packages; the packages
-will only be attempted to be installed if an environment variable is set.
+This is a package update
 
 ## Test results
 0 ERRORS | 0 WARNINGS | 1-2 NOTEs
 
 ### Test environments:
-* Local Windows CRAN 3.6.0
+* Local Windows CRAN 3.6.1
 * Travis-CI: Ubuntu 14.04. R 3.5, 3.6, and dev (r76539)
 * Appveyor: dev (r76446) and release.
 * winbuilder: dev (r76539) and release.

R/wage_inflator.R

@@ -124,9 +124,10 @@ obsTime	obsValue
 2017-Q2	110.9
 2017-Q3	111.3
 2017-Q4	112
-2018-Q1	112.7
+2018-Q1	112.6
 2018-Q2	113.2
 2018-Q3	113.5
 2018-Q4	114
 2019-Q1	114.1
 2019-Q2	115
+2019-Q3	115.4