From 1b389dc4d642e44d1cddcd39f30ec20fdd90cbc1 Mon Sep 17 00:00:00 2001
From: Kainhofer Reinhold <reinhold@kainhofer.com>
Date: Wed, 20 Feb 2019 10:53:16 +0100
Subject: [PATCH] Fix Umlaut issues in Windows
---
.gitignore | 1 +
DESCRIPTION | 5 ++---
inst/extdata/Austria_Population_Forecast.csv | 2 +-
.../MortalityTables_Austria_PopulationForecast.R | 10 +++++-----
man/MortalityTables-package.Rd | 6 +++++-
man/calculateImprovements.Rd | 5 +++--
man/deathProbabilities.Rd | 12 ++++++------
man/mortalityImprovement.Rd | 4 ++--
man/mortalityTable.once.Rd | 4 ++--
man/periodDeathProbabilities.Rd | 8 +++++---
man/periodTransitionProbabilities.Rd | 7 ++++---
man/plotMortalityTables.Rd | 8 ++++----
12 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/.gitignore b/.gitignore
index f6f8618..21fb14d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
R/Companies/
Formulas_Reference/2013*.xls*
inst/doc
+desktop.ini
diff --git a/DESCRIPTION b/DESCRIPTION
index 13ce5c8..1c62220 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -23,9 +23,8 @@ Description: Classes to implement and plot cohort life tables
as well as period life table, cohort life tables using an age shift, and
merged life tables.
License: GPL (>= 2)
-RoxygenNote: 6.0.1
-Collate:
- 'mortalityTable.R'
+RoxygenNote: 6.1.0.9000
+Collate: 'mortalityTable.R'
'mortalityTable.period.R'
'mortalityTable.ageShift.R'
'ageShift.R'
diff --git a/inst/extdata/Austria_Population_Forecast.csv b/inst/extdata/Austria_Population_Forecast.csv
index c29c5de..3847a0f 100644
--- a/inst/extdata/Austria_Population_Forecast.csv
+++ b/inst/extdata/Austria_Population_Forecast.csv
@@ -1,6 +1,6 @@
Statistik Austria: Bevölkerungsprognose 2014-2080 – Basistafel und jährlicher Trend,,,,
,,,,
-,q Männer 2014,Männer,q Frauen 2014,Frauen
+,q M 2014,M,q F 2014,F
0,0.00329510385037614,-0.0443394515333271,0.00281572638727908,-0.0461691934651078
1,0.000255226677421527,-0.0428143357006832,0.000162851795562211,-0.0444917353582905
2,0.000173567998795988,-0.0421435262403271,0.000132130160011204,-0.0431499486749107
diff --git a/inst/extdata/MortalityTables_Austria_PopulationForecast.R b/inst/extdata/MortalityTables_Austria_PopulationForecast.R
index f595333..e592689 100644
--- a/inst/extdata/MortalityTables_Austria_PopulationForecast.R
+++ b/inst/extdata/MortalityTables_Austria_PopulationForecast.R
@@ -7,13 +7,13 @@ stopifnot(require(methods), require(utils), require(MortalityTables)) # Mortalit
###############################################################################
-AT.pop.fc = utils::read.csv(system.file("extdata", "Austria_Population_Forecast.csv", package = "MortalityTables"), skip = 2);
+AT.pop.fc = utils::read.csv(system.file("extdata", "Austria_Population_Forecast.csv", package = "MortalityTables"), skip = 2, encoding = "UTF-8");
mort.AT.forecast.male = mortalityTable.trendProjection(
name = "Österreich Männer (mittl. Sz.)",
baseYear = 2014,
- deathProbs = AT.pop.fc$q.Männer.2014,
- trend = -AT.pop.fc$Männer,
+ deathProbs = AT.pop.fc$q.M.2014,
+ trend = -AT.pop.fc$M,
ages = AT.pop.fc$X,
data = list(
dim = list(sex = "m", collar = "Gesamtbevölkerung", type = "Bevölkerungsprognose", data = "official", year = "2014-2080")
@@ -22,8 +22,8 @@ mort.AT.forecast.male = mortalityTable.trendProjection(
mort.AT.forecast.female = mortalityTable.trendProjection(
name = "Österreich Frauen (mittl. Sz.)",
baseYear = 2014,
- deathProbs = AT.pop.fc$q.Frauen.2014,
- trend = -AT.pop.fc$Frauen,
+ deathProbs = AT.pop.fc$q.F.2014,
+ trend = -AT.pop.fc$F,
ages = AT.pop.fc$X,
data = list(
dim = list(sex = "w", collar = "Gesamtbevölkerung", type = "Bevölkerungsprognose", data = "official", year = "2014-2080")
diff --git a/man/MortalityTables-package.Rd b/man/MortalityTables-package.Rd
index d2e5589..84fbefb 100644
--- a/man/MortalityTables-package.Rd
+++ b/man/MortalityTables-package.Rd
@@ -6,7 +6,11 @@
\alias{MortalityTables-package}
\title{Provide life table classes for life insurance purposes}
\description{
-Provide life table classes for life insurance purposes
+Classes to implement and plot cohort life tables
+ for actuarial calculations. In particular, birth-year dependent mortality
+ tables using a yearly trend to extrapolate from a base year are implemented,
+ as well as period life table, cohort life tables using an age shift, and
+ merged life tables.
}
\seealso{
Useful links:
diff --git a/man/calculateImprovements.Rd b/man/calculateImprovements.Rd
index 0d35ef6..c6737a5 100644
--- a/man/calculateImprovements.Rd
+++ b/man/calculateImprovements.Rd
@@ -9,8 +9,9 @@
\usage{
calculateImprovements(object, ...)
-\S4method{calculateImprovements}{mortalityTable.improvementFactors}(object, ...,
- Period = NULL, YOB = 1982)
+
+ \S4method{calculateImprovements}{mortalityTable.improvementFactors}(object,
+ ..., Period = NULL, YOB = 1982)
}
\arguments{
\item{object}{A pension table object (instance of a \code{\linkS4class{mortalityTable.improvementFactors}} class)}
diff --git a/man/deathProbabilities.Rd b/man/deathProbabilities.Rd
index d5c7025..3969727 100644
--- a/man/deathProbabilities.Rd
+++ b/man/deathProbabilities.Rd
@@ -14,8 +14,8 @@
\usage{
deathProbabilities(object, ..., ages = NULL, YOB = 1975)
-\S4method{deathProbabilities}{mortalityTable.period}(object, ..., ages = NULL,
- YOB = 1975)
+\S4method{deathProbabilities}{mortalityTable.period}(object, ...,
+ ages = NULL, YOB = 1975)
\S4method{deathProbabilities}{mortalityTable.ageShift}(object, ...,
ages = NULL, YOB = 1975)
@@ -23,11 +23,11 @@ deathProbabilities(object, ..., ages = NULL, YOB = 1975)
\S4method{deathProbabilities}{mortalityTable.trendProjection}(object, ...,
ages = NULL, YOB = 1975)
-\S4method{deathProbabilities}{mortalityTable.improvementFactors}(object, ...,
- ages = NULL, YOB = 1975)
+\S4method{deathProbabilities}{mortalityTable.improvementFactors}(object,
+ ..., ages = NULL, YOB = 1975)
-\S4method{deathProbabilities}{mortalityTable.mixed}(object, ..., ages = NULL,
- YOB = 1975)
+\S4method{deathProbabilities}{mortalityTable.mixed}(object, ...,
+ ages = NULL, YOB = 1975)
\S4method{deathProbabilities}{mortalityTable.jointLives}(object, ...,
ageDifferences = c(), ages = NULL, YOB = 1975)
diff --git a/man/mortalityImprovement.Rd b/man/mortalityImprovement.Rd
index 315a26d..1d6983e 100644
--- a/man/mortalityImprovement.Rd
+++ b/man/mortalityImprovement.Rd
@@ -8,8 +8,8 @@
\usage{
mortalityImprovement(object, ..., Period = NULL, YOB = 1975)
-\S4method{mortalityImprovement}{mortalityTable}(object, ..., Period = NULL,
- YOB = 1975)
+\S4method{mortalityImprovement}{mortalityTable}(object, ...,
+ Period = NULL, YOB = 1975)
}
\arguments{
\item{object}{The life table object (class inherited from mortalityTable)}
diff --git a/man/mortalityTable.once.Rd b/man/mortalityTable.once.Rd
index e5f0afd..e821373 100644
--- a/man/mortalityTable.once.Rd
+++ b/man/mortalityTable.once.Rd
@@ -4,8 +4,8 @@
\alias{mortalityTable.once}
\title{Generate a (deterministic) mortality table with only one probability set to 1 (for the given age)}
\usage{
-mortalityTable.once(transitionAge, name = "Deterministic mortality table",
- ages = 0:99)
+mortalityTable.once(transitionAge,
+ name = "Deterministic mortality table", ages = 0:99)
}
\arguments{
\item{transitionAge}{The age where the deterministic transition occurs}
diff --git a/man/periodDeathProbabilities.Rd b/man/periodDeathProbabilities.Rd
index 5b3f674..bad8d2a 100644
--- a/man/periodDeathProbabilities.Rd
+++ b/man/periodDeathProbabilities.Rd
@@ -21,10 +21,12 @@ periodDeathProbabilities(object, ..., ages = NULL, Period = 1975)
\S4method{periodDeathProbabilities}{mortalityTable.ageShift}(object, ...,
ages = NULL, Period = 1975)
-\S4method{periodDeathProbabilities}{mortalityTable.trendProjection}(object, ...,
- ages = NULL, Period = 1975)
-\S4method{periodDeathProbabilities}{mortalityTable.improvementFactors}(object,
+ \S4method{periodDeathProbabilities}{mortalityTable.trendProjection}(object,
+ ..., ages = NULL, Period = 1975)
+
+
+ \S4method{periodDeathProbabilities}{mortalityTable.improvementFactors}(object,
..., ages = NULL, Period = 1975)
\S4method{periodDeathProbabilities}{mortalityTable.mixed}(object, ...,
diff --git a/man/periodTransitionProbabilities.Rd b/man/periodTransitionProbabilities.Rd
index e61a038..d50a399 100644
--- a/man/periodTransitionProbabilities.Rd
+++ b/man/periodTransitionProbabilities.Rd
@@ -8,9 +8,10 @@
\usage{
periodTransitionProbabilities(object, ...)
-\S4method{periodTransitionProbabilities}{pensionTable}(object, Period = 2017,
- ..., ages = NULL, OverallMortality = FALSE, retirement = NULL,
- invalids.retire = object@invalids.retire, as.data.frame = TRUE)
+\S4method{periodTransitionProbabilities}{pensionTable}(object,
+ Period = 2017, ..., ages = NULL, OverallMortality = FALSE,
+ retirement = NULL, invalids.retire = object@invalids.retire,
+ as.data.frame = TRUE)
}
\arguments{
\item{object}{A pension table object (instance of a \code{\linkS4class{pensionTable}} class)}
diff --git a/man/plotMortalityTables.Rd b/man/plotMortalityTables.Rd
index 1ab331a..892ef6a 100644
--- a/man/plotMortalityTables.Rd
+++ b/man/plotMortalityTables.Rd
@@ -5,10 +5,10 @@
\title{Plot multiple mortality tables (life tables) in one plot}
\usage{
plotMortalityTables(data, ..., aes = NULL, ages = NULL,
- legend.title = "Sterbetafel", xlim = NULL, ylim = NULL, xlab = NULL,
- ylab = NULL, title = "", legend.position = c(0.9, 0.1),
- legend.justification = c(1, 0), legend.key.width = unit(25, "mm"),
- log = TRUE)
+ legend.title = "Sterbetafel", xlim = NULL, ylim = NULL,
+ xlab = NULL, ylab = NULL, title = "", legend.position = c(0.9,
+ 0.1), legend.justification = c(1, 0), legend.key.width = unit(25,
+ "mm"), log = TRUE)
}
\arguments{
\item{data}{First life table to be plotted. Either a \code{data.frame} generated by \code{makeQxDataFrame} or a \code{mortalityTable} object}
--
GitLab