diff --git a/DESCRIPTION b/DESCRIPTION index d37725b07e6f375217f81d09255b797d3fd86944..6d7e72bdd8b887b24be557aa20375f0c99bfd955 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: MortalityTables Type: Package Version: 1.0 -Date: 2016-09-01 +Date: 2018-03-30 Title: A Framework for Various Types of Mortality / Life Tables Authors@R: c(person("Reinhold", "Kainhofer", role=c("aut", "cre"), email="reinhold@kainhofer.com")) Author: Reinhold Kainhofer [aut, cre] diff --git a/MortalityTables.Rproj b/MortalityTables.Rproj index 00967dac31803e2e761755075982f21758f7543a..ff48a22d8b3400f834086d82e4f6e85f7b0d36ea 100644 --- a/MortalityTables.Rproj +++ b/MortalityTables.Rproj @@ -1,8 +1,8 @@ Version: 1.0 -RestoreWorkspace: Default -SaveWorkspace: Default -AlwaysSaveHistory: Default +RestoreWorkspace: Yes +SaveWorkspace: Yes +AlwaysSaveHistory: Yes EnableCodeIndexing: Yes UseSpacesForTab: Yes diff --git a/R/mortalityTable.Weibull.R b/R/mortalityTable.Weibull.R index 44fd06579fef0bf283dbcf9270a2e3cfe6ee62a6..03615d3565bd56cedef6e0f911f56a92b5e1210e 100644 --- a/R/mortalityTable.Weibull.R +++ b/R/mortalityTable.Weibull.R @@ -4,7 +4,7 @@ NULL #' Class mortalityTable.Weibull - Mortality table with Weibull's law #' #' A period life table following Weibulls's law of a mortality rate -#' \eqn{\mu} increasing as a power of \eqn{t}: \deqn{\mu_{x+t} = k * (x+t)^n$} +#' \eqn{\mu} increasing as a power of \eqn{t}: \deqn{\mu_{x+t} = k * (x+t)^n} #' The only required slots are the parameters \eqn{k>0} and \eqn{n>0}, all probabilities #' are calculated from them, for technical reasons a maximum age of 150 is #' technically assumed. Optionally, a name and loading can be passed diff --git a/man/mortalityTable.Weibull-class.Rd b/man/mortalityTable.Weibull-class.Rd index af6953b089c87d28c029b4bb4b970317b0ae7fb4..679b9e74f220adff8bc5350b3913ab07f7355b9d 100644 --- a/man/mortalityTable.Weibull-class.Rd +++ b/man/mortalityTable.Weibull-class.Rd @@ -7,7 +7,7 @@ \title{Class mortalityTable.Weibull - Mortality table with Weibull's law} \description{ A period life table following Weibulls's law of a mortality rate -\eqn{\mu} increasing as a power of \eqn{t}: \deqn{\mu_{x+t} = k * (x+t)^n$} +\eqn{\mu} increasing as a power of \eqn{t}: \deqn{\mu_{x+t} = k * (x+t)^n} The only required slots are the parameters \eqn{k>0} and \eqn{n>0}, all probabilities are calculated from them, for technical reasons a maximum age of 150 is technically assumed. Optionally, a name and loading can be passed