version 2.1.2

- update web source for Australian Human Mortality Database;

Author: mpascariu

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: MortalityLaws
 Type: Package
 Title: Parametric Mortality Models, Life Tables and HMD
-Version: 2.1.1
+Version: 2.1.2
 Authors@R: c(
   person("Marius D.", "Pascariu", role = c("aut", "cre", "cph"), email = "mpascariu@outlook.com", comment = c(ORCID = "0000-0002-2568-6489")),
   person("Vladimir", "Canudas-Romo", role = "ctb"))

NEWS

@@ -1,5 +1,8 @@
+version 2.1.2
+- update web source for Australian Human Mortality Database;
+
 version 2.1.1
-- privide anchors to all documented external \links{};
+- provide anchors to all documented external \links{};
 
 version 2.1.0
 - replace several stop errors with messages so the failure to connect to databases (for whatever reason) results in a gracefull ending of the process and to avoid triggering CRAN random error;

R/availableLaws.R

@@ -1,7 +1,8 @@
-# --------------------------------------------------- #
-# Author: Marius D. PASCARIU
-# Last update: Fri Feb 04 11:39:09 2022
-# --------------------------------------------------- #
+# ------------------------------------------------- #
+# Author: Marius D. Pascariu
+# Last update: Wed Apr  2 11:07:37 2025
+# ------------------------------------------------- #
+
 
 #' Check Available Mortality Laws
 #'
@@ -47,10 +48,9 @@
 #' \item{Harper, F. S. (1936). An actuarial study of infant mortality.
 #' Scandinavian Actuarial Journal 1936 (3-4), 234-270.
 #' \doi{10.1080/03461238.1936.10405113}}
-#' \item{Weibull, W. (1951).
-#' \href{http://web.cecs.pdx.edu/~cgshirl/Documents/Weibull-ASME-Paper-1951.pdf}{
-#' A statistical distribution function of wide applicability.}
-#' Journal of applied mechanics 103, 293-297.}
+#' \item{Weibull, W. (1951). A statistical distribution function of wide applicability.
+#' Journal of applied mechanics 103, 293-297.
+#'  \doi{10.1115/1.4010337}}
 #' \item{Beard, R. E. (1971).
 #' \href{http://longevity-science.org/Beard-1971.pdf}{
 #' Some aspects of theories of mortality, cause of

R/readAHMD.R

@@ -1,14 +1,13 @@
-# -------------------------------------------------------------- #
-# Author: Marius D. PASCARIU
-# Last Update: Mon Jan 15 17:56:54 2024
-# -------------------------------------------------------------- #
+# ------------------------------------------------- #
+# Author: Marius D. Pascariu
+# Last update: Wed Apr  2 11:03:28 2025
+# ------------------------------------------------- #
 
 #' Download the Australian Human Mortality Database (AHMD)
 #'
 #' Download detailed mortality and population data for different
 #' provinces and territories in Australia, in a single object from the
-#' \href{https://demography.cass.anu.edu.au/research/australian-human-mortality-database}{
-#' Australian Human Mortality Database}.
+#' \href{https://aushd.org/}{Australian Human Mortality Database}.
 #'
 #' @details
 #' (Description taken from the AHMD website).
@@ -110,7 +109,7 @@ ReadAHMD <- function(what,
                                interval = interval,
                                username = NULL,
                                password = NULL,
-                               link = "https://demography.cass.anu.edu.au/sites/default/ahmd/"))
+                               link = "https://aushd.org/assets/txtFiles/humanMortality/"))
   }
 
   if(length(D) != 0) {
@@ -153,7 +152,7 @@ check_input_ReadAHMD <- function(x) {
          "Try one of these options:\n", paste(data_format(), collapse = ", "),
          call. = FALSE)
   }
-
+  
   if (!(x$what %in% HMDindices())) {
     stop(x$what, " does not exist in AHMD. Try one of these options:\n",
          paste(HMDindices(), collapse = ", "), call. = FALSE)
@@ -177,7 +176,7 @@ check_input_ReadAHMD <- function(x) {
 print.ReadAHMD <- function(x, ...){
   what <- x$input$what
   cat("Australian Human Mortality Database\n")
-  cat("Web Address   : https://demography.cass.anu.edu.au/research/australian-human-mortality-database\n")
+  cat("Web Address   : https://aushd.org\n")
   cat("Download Date :", x$download.date, "\n")
   cat("Type of data  :", what, "\n")
   cat(paste("Interval      :", x$input$interval, "\n"))

man/ReadAHMD.Rd

@@ -1,12 +1,14 @@
-# -------------------------------------------------------------- #
-# Author: Marius D. PASCARIU
-# Last Update: Mon Jan 15 16:57:56 2024
-# -------------------------------------------------------------- #
+# ------------------------------------------------- #
+# Author: Marius D. Pascariu
+# Last update: Wed Apr  2 11:42:35 2025
+# ------------------------------------------------- #
+
 remove(list = ls())
 
 # Wrong index
 expect_error(ReadAHMD(what = "DxDD"))
-# Wrong country
+
+# Wrong region
 expect_error(ReadAHMD(what    = "Dx",
                       regions = "ACTT"))
 
@@ -15,15 +17,15 @@ expect_error(ReadAHMD(what     = "Dx",
                       regions  = "ACT",
                       interval = "1x50"))
 
-# Wrong country for the index
-expect_message(
+# Wrong region for the index
+expect_error(
   ReadAHMD(what     = "LT_fc",
            regions  = "TAS",
            interval = "1x1",
            show     = FALSE))
 
 # Wrong interval for the index
-expect_message(
+expect_error(
   ReadAHMD(what     = "e0",
            regions  = "TAS",
            interval = "5x1",