diff --git a/DESCRIPTION b/DESCRIPTION index 8997a28..c17a46b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: MortalityLaws Type: Package Title: Parametric Mortality Models, Life Tables and HMD -Version: 2.0.2 +Version: 2.0.4 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")) diff --git a/NEWS b/NEWS index c607c77..1b3d13d 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -version 2.0.2 +version 2.0.3 - Change interaction with external resources and update documentation; version 1.9.9 diff --git a/R/MortalityLaw_S3.R b/R/MortalityLaw_S3.R index 404a782..7a9b7dc 100644 --- a/R/MortalityLaw_S3.R +++ b/R/MortalityLaw_S3.R @@ -1,6 +1,6 @@ # -------------------------------------------------------------- # # Author: Marius D. PASCARIU -# Last Update: Thu Jul 20 21:46:38 2023 +# Last Update: Mon Aug 7 21:52:24 2023 # -------------------------------------------------------------- # @@ -20,7 +20,7 @@ print.MortalityLaw <- function(x, ...) { #' Summary MortalityLaw -#' @param x an object of class \code{"MortalityLaw"} +#' @param object an object of class \code{"MortalityLaw"} #' @param digits number of digits to display. #' @param ... additional arguments affecting the summary produced. #' @return A list of model diagnosis diff --git a/R/MortalityLaws-package.R b/R/MortalityLaws-package.R index 098e530..42b57ce 100644 --- a/R/MortalityLaws-package.R +++ b/R/MortalityLaws-package.R @@ -1,6 +1,6 @@ # -------------------------------------------------------------- # # Author: Marius D. PASCARIU -# Last Update: Wed Jul 19 14:27:59 2023 +# Last Update: Mon Aug 7 21:48:58 2023 # -------------------------------------------------------------- # # MortalityLaws Package @@ -19,6 +19,5 @@ #' @importFrom pbapply startpb closepb setpb #' @import rvest httr #' @name MortalityLaws -#' @aliases NULL #' @docType package "_PACKAGE" diff --git a/man/MortalityLaws.Rd b/man/MortalityLaws.Rd index 0fd6d00..41fca40 100644 --- a/man/MortalityLaws.Rd +++ b/man/MortalityLaws.Rd @@ -2,6 +2,8 @@ % Please edit documentation in R/MortalityLaws-package.R \docType{package} \name{MortalityLaws} +\alias{MortalityLaws} +\alias{MortalityLaws-package} \title{MortalityLaws: Parametric Mortality Models, Life Tables and HMD} \description{ Fit the most popular human mortality 'laws', and construct full and abridge life tables given various input indices. A mortality law is a parametric function that describes the dying-out process of individuals in a population during a significant portion of their life spans. For a comprehensive review of the most important mortality laws see Tabeau (2001) \doi{10.1007/0-306-47562-6_1}. Practical functions for downloading data from various human mortality databases are provided as well. diff --git a/man/summary.MortalityLaw.Rd b/man/summary.MortalityLaw.Rd index dfb64c1..d012b65 100644 --- a/man/summary.MortalityLaw.Rd +++ b/man/summary.MortalityLaw.Rd @@ -7,11 +7,11 @@ \method{summary}{MortalityLaw}(object, ..., digits = max(3L, getOption("digits") - 3L)) } \arguments{ +\item{object}{an object of class \code{"MortalityLaw"}} + \item{...}{additional arguments affecting the summary produced.} \item{digits}{number of digits to display.} - -\item{x}{an object of class \code{"MortalityLaw"}} } \value{ A list of model diagnosis diff --git a/tests/testthat/test_ReadJMD.R b/tests/testthat/test_ReadJMD.R index 35ebc66..708a827 100644 --- a/tests/testthat/test_ReadJMD.R +++ b/tests/testthat/test_ReadJMD.R @@ -1,7 +1,8 @@ -# --------------------------------------------------- # +# -------------------------------------------------------------- # +# Title: # Author: Marius D. PASCARIU -# Last update: Sun May 02 17:37:09 2021 -# --------------------------------------------------- # +# Last Update: Tue Jan 2 10:37:14 2024 +# -------------------------------------------------------------- # remove(list = ls()) # Wrong index @@ -25,9 +26,10 @@ expect_error(ReadJMD(what = "e0", regions = "Japan", interval = "5x1")) -expect_error(ReadJMD(what = "LT_f", - regions = "Kyoto", - interval = "1x1")) +# remove test since the case is now valid and available in the database. +# expect_error(ReadJMD(what = "LT_f", +# regions = "Kyoto", +# interval = "1x1")) expect_output( print(JMD_sample)