Fix Umlaut issues in Windows

.gitignore

@@ -5,3 +5,4 @@
 R/Companies/
 Formulas_Reference/2013*.xls*
 inst/doc
+desktop.ini

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'

inst/extdata/Austria_Population_Forecast.csv

 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

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")

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:

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)}

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)

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)}

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}

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, ...,

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)}

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}