Update data

.Rbuildignore

@@ -57,3 +57,5 @@
 ^codecov\.yml$
 ^README_files/figure-markdown_github$
 ^README_files//figure-markdown_github/compare-30-37-42-thresholds-1\.svg$
+^README\.Rmd$
+^grattan.Rproj$

CRAN-RELEASE

@@ -1,2 +1,2 @@
-This package was submitted to CRAN on 2020-07-13.
-Once it is accepted, delete this file and tag the release (commit e6eb0d313d).
+This package was submitted to CRAN on 2021-01-29.
+Once it is accepted, delete this file and tag the release (commit 79cb5378b).

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: grattan
 Type: Package
 Title: Australian Tax Policy Analysis
-Version: 1.9.0.0
-Date: 2020-07-02
+Version: 1.9.0.4
+Date: 2021-01-29
 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"),
@@ -30,6 +30,7 @@ Imports:
     fastmatch,
     forecast,
     fy (>= 0.2.0),
+    hutilscpp,
     assertthat (>= 0.1),
     magrittr (>= 1.5),
     Rcpp (>= 0.12.3),
@@ -47,7 +48,6 @@ Suggests:
     future.apply,
     ggplot2,
     ggrepel,
-    hutilscpp,
     knitr,
     lattice,
     mgcv,

NEWS.md

@@ -1,3 +1,11 @@
+## 1.9.0.3
+
+* Maintenance release to avoid svg issues on new Apple OS.
+
+## 1.9.0.2
+
+* Maintenance release with some new data updates.
+
 ## 1.9.0.0
 
 ### New features

R/age_pension.R

@@ -148,7 +148,7 @@ age_pension <- function(fortnightly_income = 0,
 
   deeming_rate_above <- deemed_income <- FinancialAssets <- NULL
 
-  # http://guides.dss.gov.au/guide-social-security-law/4/4/1/10
+  # https://guides.dss.gov.au/guide-social-security-law/4/4/1/10
   deeming <- 
     Age_pension_deeming_rates_by_Date %>%
     # temp

R/age_pension_age.R

@@ -8,7 +8,7 @@
 #' age_pension_age()  # Current age of eligiblity
 #' age_pension_age("1995-12-31")
 #' age_pension_age("2013-14")
-#' @source \url{http://guides.dss.gov.au/guide-social-security-law/3/4/1/10}
+#' @source \url{https://guides.dss.gov.au/guide-social-security-law/3/4/1/10}
 #' @export
 
 age_pension_age <- function(when = Sys.Date(),
@@ -99,7 +99,7 @@ age_pension_age <- function(when = Sys.Date(),
                  })
     }
 
-    # http://guides.dss.gov.au/guide-social-security-law/3/4/1/10
+    # https://guides.dss.gov.au/guide-social-security-law/3/4/1/10
     age_pension_dates_female <-
       list(Date = as.Date(c("1995-06-30", paste0(seq(1995, 2013, by = 2), "-07-01"))), 
            Age = seq(60, 65, by = 0.5))

R/carer_payment.R

@@ -10,8 +10,8 @@
 #' @param carer_assets_value Total value of carer's household assets.
 #' @param carer_is_home_owner (logical, default: \code{FALSE}) Does the carer own their own home? 
 #' @param carer_illness_separated_couple Is the couple separated by illness? (Affects the assets test.)
-#' @param dclad_eligible Is the person receiving care a DCLAD (Disability Care Load Assessment) qualifying child as defined in http://guides.dss.gov.au/guide-social-security-law/1/1/q/17 ?
-#' @param high_adat Does the person receiving care have a high ADAT (Adult Disability Assessment Tool) score as defined in http://guides.dss.gov.au/guide-social-security-law/1/1/a/78 ?
+#' @param dclad_eligible Is the person receiving care a DCLAD (Disability Care Load Assessment) qualifying child as defined in https://guides.dss.gov.au/guide-social-security-law/1/1/q/17 ?
+#' @param high_adat Does the person receiving care have a high ADAT (Adult Disability Assessment Tool) score as defined in https://guides.dss.gov.au/guide-social-security-law/1/1/a/78 ?
 #' @param living_at_home Does the person receiving care live at home with their parents?
 #' @param care_receiver_fortnightly_income Care receiver's fortnightly income
 #' @param care_receiver_annual_income Care receiver's annual income
@@ -99,7 +99,7 @@ carer_payment <- function(Date = NULL,
                       is_home_owner = carer_is_home_owner,
                       illness_separated_couple = carer_illness_separated_couple)
 
-  #http://guides.dss.gov.au/guide-social-security-law/4/2/5
+  #https://guides.dss.gov.au/guide-social-security-law/4/2/5
   #https://www.humanservices.gov.au/sites/default/files/co029-1603en.pdf
 
   care_receiver_income_test <- input[ ,if_else(high_adat,
@@ -117,7 +117,7 @@ carer_payment <- function(Date = NULL,
   assets_eligible <- input[ ,or(high_adat & receiving_other_payment, 
                                 care_receiver_asset_test < 671250)]
 
-  #NOTE: there is discretion to still approve payment even if failed the care receiver asset test. Described in section 'Discretion to decide that the care receivers assets test does not disqualify a person from CP' http://guides.dss.gov.au/guide-social-security-law/4/2/5
+  #NOTE: there is discretion to still approve payment even if failed the care receiver asset test. Described in section 'Discretion to decide that the care receivers assets test does not disqualify a person from CP' https://guides.dss.gov.au/guide-social-security-law/4/2/5
 
   #OUTPUT
   input[ ,if_else(income_eligible & assets_eligible,

R/child_care_subsidy.R

@@ -4,10 +4,10 @@
 #' @param activity_level (numeric) The total number of activity hours of the 
 #' parent. Note that if there are two parents the one with the lower activity 
 #' level will be applied. Common activities include work, leave, and study. A 
-#' full list can be viewed at \url{http://guides.dss.gov.au/family-assistance-guide/3/5/2/10}.
+#' full list can be viewed at \url{https://guides.dss.gov.au/family-assistance-guide/3/5/2/10}.
 #' @param activity_exemption (logical) Whether the parent is exempt from the 
 #' activity test. Note that in a two parent family both parents must be exempt. 
-#' A list of exemptions is available at \url{http://guides.dss.gov.au/family-assistance-guide/3/5/2/10}.
+#' A list of exemptions is available at \url{https://guides.dss.gov.au/family-assistance-guide/3/5/2/10}.
 #' @param child_age (numeric) The age of the child in child care.
 #' @param type_of_day_care (character) The type of child care. Acceptable inputs
 #'  are: \code{"cbdc"} Centre Based Day Care, "oshc" Outside School Hours Care,
@@ -34,7 +34,7 @@
 #'  step increase in `activity_test_1_brackets`.
 #' 
 #' @param income_test_bracket_1,income_test_bracket_2,income_test_bracket_3,income_test_bracket_4,income_test_bracket_5 (numeric) The steps at which income test 1 changes rates.
-#'  Note the strange structure \url{https://www.humanservices.gov.au/individuals/services/centrelink/child-care-subsidy/payments/how-your-income-affects-it}.
+#'  Note the strange structure \code{https://www.servicesaustralia.gov.au/individuals/services/centrelink/child-care-subsidy/how-much-you-can-get/your-income-can-affect-it}.
 #' @param taper_1,taper_2,taper_3 (numeric) The proportion of the hourly cap 
 #' retained. Note that the rate only decreases between each odd bracket.
 #' 

R/disability_pension.R

@@ -78,7 +78,7 @@ disability_pension <- function(fortnightly_income = 0,
                         n_dependants = n_dependants,
                         per = "fortnight",
                         ...),
-            # http://guides.dss.gov.au/guide-social-security-law/5/2/2/40
+            # https://guides.dss.gov.au/guide-social-security-law/5/2/2/40
             # possibly more; see
             # https://www.humanservices.gov.au/individuals/services/centrelink/disability-support-pension/payments/payment-rates
             if_else(age >= 18L,

R/energy_supplement.R

@@ -29,7 +29,7 @@
 #' @source 
 #' \emph{Social Security Guide} by the Department of Social Services. 
 #' Chapter 5, \sQuote{Payment rates}, s. 5.1.10.20 \dQuote{Clean Energy Household Assistance: current rates}.
-#' \url{http://guides.dss.gov.au/guide-social-security-law/5/1/10/20}
+#' \url{https://guides.dss.gov.au/guide-social-security-law/5/1/10/20}
 #' 
 
 energy_supplement <- function(qualifying_payment, 

R/family_tax_benefit.R

@@ -53,8 +53,8 @@ family_tax_benefit <- function(.data = NULL,
                                per = 'year', 
                                copy = TRUE) {
   # https://www.humanservices.gov.au/sites/default/files/co029-1603en.pdf
-  # https://web.archive.org/web/20160420184949/http://guides.dss.gov.au/family-assistance-guide/3/1/1/20
-  # historical rates: http://guides.dss.gov.au/family-assistance-guide/3/6/
+  # https://web.archive.org/web/20160420184949/https://guides.dss.gov.au/family-assistance-guide/3/1/1/20
+  # historical rates: https://guides.dss.gov.au/family-assistance-guide/3/6/
   if (is.null(.data)) {
     check_null <- function(x, ...) {
       if (is.null(x)) {
@@ -289,7 +289,7 @@ family_tax_benefit <- function(.data = NULL,
                                       taper_ftbA_2 * (family_income - income_test_ftbA_2_bound))]
 
     # Note: before 2015 income_test_ftbA_2_bound
-    # increased based upon number of ftb children http://guides.dss.gov.au/family-assistance-guide/3/6/1 note 2G
+    # increased based upon number of ftb children https://guides.dss.gov.au/family-assistance-guide/3/6/1 note 2G
 
   # Income test ftbB
   ftbB_eligible <- NULL

R/lf_inflator.R

@@ -31,7 +31,7 @@
 #' dramatically. Can be set to \code{Inf} to disable acceleration.
 #' 
 #'   
-#' @source ABS Cat 6202.0 \url{http://www.abs.gov.au/ausstats/abs@.nsf/mf/6202.0?OpenDocument}.
+#' @source ABS Cat 6202.0 
 #' @details \code{lf_inflator} is used on dates. The underlying data series is available every month. 
 #' @examples
 #' lf_inflator_fy(labour_force = 1, from_fy = "2012-13", to_fy = "2013-14")

R/model_child_care_subsidy.R

@@ -7,7 +7,7 @@
 #' @param Annual_cap_income (numeric) The minimum family income for which the `Annual_cap_subsidy` applies from.
 #' @param Annual_cap_subsidy (numeric) Amount at which annual subsidies are capped for those who earn more than `Annual_cap_income`. 
 #' 
-#' @param Income_test_bracket_1,Income_test_bracket_2,Income_test_bracket_3,Income_test_bracket_4,Income_test_bracket_5 (numeric) The steps at which income test 1 changes rates. Note the strange structure \url{https://www.humanservices.gov.au/individuals/services/centrelink/child-care-subsidy/payments/how-your-income-affects-it}.
+#' @param Income_test_bracket_1,Income_test_bracket_2,Income_test_bracket_3,Income_test_bracket_4,Income_test_bracket_5 (numeric) The steps at which income test 1 changes rates. Note the strange structure \code{https://www.humanservices.gov.au/individuals/services/centrelink/child-care-subsidy/payments/how-your-income-affects-it}.
 #' @param Taper_1,Taper_2,Taper_3 (numeric) The proportion of the hourly cap retained. Note that the rate only decreases between each odd bracket.
 #' 
 #' @param Activity_test_1_brackets (numeric vector) The activity levels at which the activity test increases.

R/newstart_allowance.R

@@ -10,13 +10,13 @@
 #' receiving payments for over 9 continuous months?
 #' @param isjspceoalfofcoahodeoc Is the recipient a single job seeker principal carer, either of large family or foster child/ren, or who is a home or distance educator of child/ren?
 #' @param principal_carer Is the individual the parent with most of the day-to-day
-#'  care of child. Defined in \url{https://www.humanservices.gov.au/individuals/enablers/principal-carer-rules-parenting-payment/41456}.
+#'  care of child. Defined in \code{https://www.servicesaustralia.gov.au/individuals/services/centrelink/parenting-payment/who-can-get-it/principal-carer-rules/}.
 #' @param fortnightly_partner_income Partner's 'Ordinary income' received fortnightly. 
 #' @param annual_partner_income Partner's Ordinary income' received annually.
 #' @param age The individual's age.
 #' @param fy.year Financial year. Default is "2015-16".
 #' @param assets_value Total value of household assets. Details can be found at
-#' \url{https://www.humanservices.gov.au/individuals/enablers/assets/30621}. 
+#' \code{https://www.servicesaustralia.gov.au/individuals/topics/asset-types/30621}. 
 #' @param homeowner Is the individual a homeowner?
 #' @param taper_lower The amount at which the payment is reduced for each dollar
 #'  earned between the lower and upper bounds for non-principal carers.
@@ -34,8 +34,8 @@
 #' @source \url{http://classic.austlii.edu.au/au/legis/cth/consol_act/ssa1991186/s1068.html}
 #' @export newstart_allowance
 
-#historical rates single: http://guides.dss.gov.au/guide-social-security-law/5/2/1/20
-  #married: http://guides.dss.gov.au/guide-social-security-law/5/2/1/30
+#historical rates single: https://guides.dss.gov.au/guide-social-security-law/5/2/1/20
+  #married: https://guides.dss.gov.au/guide-social-security-law/5/2/1/30
 #better copy of rates and reductions: https://www.humanservices.gov.au/sites/default/files/co029-1603en.pdf
 newstart_allowance <- function(fortnightly_income = 0,
                                annual_income = 0,
@@ -197,7 +197,7 @@ newstart_allowance <- function(fortnightly_income = 0,
                                              assets_value < 348500))]
 
   # Partner income reduction
-  # https://web.archive.org/web/20160812171654/http://guides.dss.gov.au/guide-social-security-law/5/5/3/30
+  # https://web.archive.org/web/20160812171654/https://guides.dss.gov.au/guide-social-security-law/5/5/3/30
   partner_income_reduction <- NULL
   input %>%
     .[, partner_income_reduction := 

R/rent_assistance.R

@@ -3,7 +3,7 @@
 #' @param fortnightly_rent The fortnightly rent paid by each individual. By 
 #' default, infinity, so the maximum rent assistance is returned by default, 
 #' since rent assistance is capped at a maximum rate. Note the criteria for board
-#'  and lodging which can be found at \url{http://guides.dss.gov.au/guide-social-security-law/3/8/1/70}
+#'  and lodging which can be found at \url{https://guides.dss.gov.au/guide-social-security-law/3/8/1/70}
 #' @param per Specifies the timeframe in which payments will be made. Can either
 #'  take value "fortnight" or "annual".
 #' @param fy.year (character) The financial year over which rent assistance is 
@@ -22,7 +22,7 @@
 #' @param max_rate If not \code{NULL}, a numeric vector indicating for each individual the maximum rent assistance payable.
 #' @param min_rent If not \code{NULL}, a numeric vector indicating for each individual the minimum fortnightly rent above which rent assistance is payable. \code{max_rate} and \code{min_rent} must not be used when \code{fy.year} is set.
 #' 
-#' @param sharers_provision_applies (logical, default: FALSE) Does the sharers provision apply to the parent payment? The list of functions can be found in table 2 column 4 \url{http://guides.dss.gov.au/guide-social-security-law/3/8/1/10}
+#' @param sharers_provision_applies (logical, default: FALSE) Does the sharers provision apply to the parent payment? The list of functions can be found in table 2 column 4 \url{https://guides.dss.gov.au/guide-social-security-law/3/8/1/10}
 #' @param is_homeowner (logical, default: \code{FALSE}) Does the individual own 
 #' their own home?
 #' @param lives_in_sharehouse (logical, default: \code{FALSE}) Does the individual

R/residential_property_prices.R

@@ -7,6 +7,6 @@
 #' \item{City}{Capital city (or \code{Australia (weighted average)})}
 #' \item{Residential_property_price_index}{An index (100 = 2011-12-01) measuring the price change in all residential dwellings.}
 #' }
-#' @source ABS Cat 6416.0. \url{http://www.abs.gov.au/ausstats/abs@.nsf/mf/6416.0}.
+#' @source ABS Cat 6416.0. \code{https://www.abs.gov.au/statistics/economy/price-indexes-and-inflation/residential-property-price-indexes-eight-capital-cities/latest-release}
 
 "residential_property_prices"

R/student_repayment.R

@@ -11,8 +11,8 @@
 #' @param fy.year The financial year \code{repayment_income} was earned.
 #' @param debt The amount of student debt held.
 #' @return The repayment amount.
-#' @source \url{https://www.ato.gov.au/Rates/HELP,-TSL-and-SFSS-repayment-thresholds-and-rates/?page=2#HELP_repayment_thresholds_and_rates_2013_14}m
-#' \url{https://docs.education.gov.au/system/files/doc/other/ed17-0138_-_he_-_glossy_budget_report_acc.pdf}
+#' @source \code{https://www.ato.gov.au/Rates/HELP,-TSL-and-SFSS-repayment-thresholds-and-rates/?page=2#HELP_repayment_thresholds_and_rates_2013_14},
+#' \code{https://docs.education.gov.au/system/files/doc/other/ed17-0138_-_he_-_glossy_budget_report_acc.pdf}
 #' @details The student repayments for \code{fy.year = '2018-19'} assume the measures in Budget 2017 will pass.
 #' @author Ittima Cherastidtham and Hugh Parsonage
 #' @examples