Rename the package to MortalityTables

Also rename the classes to mortalityTable.*

DESCRIPTION

-Package: ValuationTables
+Package: MortalityTables
 Type: Package
 Version: 1.0
 Date: 2016-05-01
-Title: A framework for various types of life tables
+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]
 Maintainer: Reinhold Kainhofer <reinhold@kainhofer.com>
-URL: https://gitlab.open-tools.net/R/r-valuation-tables
+URL: https://gitlab.open-tools.net/R/r-mortality-tables
 Depends:
     ggplot2,
     methods,
@@ -24,31 +24,31 @@ Description: This package provides classes to implement cohort life tables
 License: GPL (>= 2)
 RoxygenNote: 5.0.1
 Collate:
-    'valuationTable.R'
-    'valuationTable.period.R'
-    'valuationTable.ageShift.R'
+    'mortalityTable.R'
+    'mortalityTable.period.R'
+    'mortalityTable.ageShift.R'
     'ageShift.R'
-    'valuationTable.observed.R'
-    'valuationTable.joined.R'
-    'valuationTable.mixed.R'
+    'mortalityTable.observed.R'
+    'mortalityTable.joined.R'
+    'mortalityTable.mixed.R'
     'ages.R'
     'baseTable.R'
     'baseYear.R'
-    'valuationTable.improvementFactors.R'
-    'valuationTable.trendProjection.R'
+    'mortalityTable.improvementFactors.R'
+    'mortalityTable.trendProjection.R'
     'deathProbabilities.R'
     'getCohortTable.R'
     'getOmega.R'
     'getPeriodTable.R'
     'lifeTable.R'
     'makeQxDataFrame.R'
+    'mortalityTables.list.R'
+    'mortalityTables.load.R'
     'periodDeathProbabilities.R'
-    'plot.valuationTable.R'
-    'plotValuationTableComparisons.R'
-    'plotValuationTables.R'
+    'plot.mortalityTable.R'
+    'plotMortalityTableComparisons.R'
+    'plotMortalityTables.R'
     'setLoading.R'
     'setModification.R'
     'undampenTrend.R'
-    'valuationTables.list.R'
-    'valuationTables.load.R'
 VignetteBuilder: knitr

NAMESPACE

 # Generated by roxygen2: do not edit by hand
 
-S3method(plot,valuationTable)
+S3method(plot,mortalityTable)
 export(makeQxDataFrame)
-export(plotValuationTableComparisons)
-export(plotValuationTables)
-export(valuationTable)
-export(valuationTable.ageShift)
-export(valuationTable.improvementFactors)
-export(valuationTable.joined)
-export(valuationTable.mixed)
-export(valuationTable.observed)
-export(valuationTable.period)
-export(valuationTable.trendProjection)
-export(valuationTables.list)
-export(valuationTables.load)
-exportClasses(valuationTable)
-exportClasses(valuationTable.ageShift)
-exportClasses(valuationTable.improvementFactors)
-exportClasses(valuationTable.joined)
-exportClasses(valuationTable.mixed)
-exportClasses(valuationTable.observed)
-exportClasses(valuationTable.period)
-exportClasses(valuationTable.trendProjection)
+export(mortalityTable)
+export(mortalityTable.ageShift)
+export(mortalityTable.improvementFactors)
+export(mortalityTable.joined)
+export(mortalityTable.mixed)
+export(mortalityTable.observed)
+export(mortalityTable.period)
+export(mortalityTable.trendProjection)
+export(mortalityTables.list)
+export(mortalityTables.load)
+export(plotMortalityTableComparisons)
+export(plotMortalityTables)
+exportClasses(mortalityTable)
+exportClasses(mortalityTable.ageShift)
+exportClasses(mortalityTable.improvementFactors)
+exportClasses(mortalityTable.joined)
+exportClasses(mortalityTable.mixed)
+exportClasses(mortalityTable.observed)
+exportClasses(mortalityTable.period)
+exportClasses(mortalityTable.trendProjection)
 exportMethods(ageShift)
 exportMethods(ages)
 exportMethods(baseTable)

R/ageShift.R

-#' @include valuationTable.ageShift.R
+#' @include mortalityTable.ageShift.R
 NULL
 
 #' Return the age shift of the age-shifted life table given the birth year
 #'
-#' @param object The life table object (class inherited from valuationTable)
+#' @param object The life table object (class inherited from mortalityTable)
 #' @param ... Other parameters (currently unused)
 #' @param YOB The birth year for which the age shift should be determined.
 #'
@@ -13,7 +13,7 @@ setGeneric("ageShift", function(object, YOB=1975, ...) standardGeneric("ageShift
 #' @describeIn ageShift Return the age shift of the age-shifted life table
 #'                      given the birth year
 setMethod("ageShift",
-          "valuationTable.ageShift",
+          "mortalityTable.ageShift",
           function(object, YOB, ...) {
               shift = object@ageShifts[toString(YOB),];
               if (is.na(shift)) {

R/ages.R

-#' @include valuationTable.period.R valuationTable.mixed.R valuationTable.joined.R valuationTable.observed.R
+#' @include mortalityTable.period.R mortalityTable.mixed.R mortalityTable.joined.R mortalityTable.observed.R
 NULL
 
 #' Return the defined ages of the life table
 #'
-#' @param object A life table object (instance of a \code{\linkS4class{valuationTable}} class)
+#' @param object A life table object (instance of a \code{\linkS4class{mortalityTable}} class)
 #' @param ... Currently unused
 #'
 #' @exportMethod ages
 setGeneric("ages", function(object, ...) standardGeneric("ages"));
 
 #' @describeIn ages Return the defined ages of the period life table
-setMethod("ages", "valuationTable.period",
+setMethod("ages", "mortalityTable.period",
           function (object, ...) {
               object@ages;
           })
 
 #' @describeIn ages Return the defined ages of the mixed life table
-setMethod("ages", "valuationTable.mixed",
+setMethod("ages", "mortalityTable.mixed",
           function (object, ...) {
               ages(object@table1);
           })
 
 #' @describeIn ages Return the defined ages of the joined life table
-setMethod("ages", "valuationTable.joined",
+setMethod("ages", "mortalityTable.joined",
           function (object, ...) {
               ages(object@table1);
           })
 
 #' @describeIn ages Return the defined ages of the observed life table
-setMethod("ages", "valuationTable.observed",
+setMethod("ages", "mortalityTable.observed",
           function (object, ...) {
               object@ages;
           })

R/baseTable.R

-#' @include valuationTable.R valuationTable.period.R
+#' @include mortalityTable.R mortalityTable.period.R
 NULL
 
 #' Return the base table of the life table
 #'
-#' @param object The life table object (class inherited from valuationTable)
+#' @param object The life table object (class inherited from mortalityTable)
 #' @param ... Other parameters (currently unused)
 #'
 #' @exportMethod baseTable
 setGeneric("baseTable", function(object, ...) standardGeneric("baseTable"));
 
 #' @describeIn baseTable Return the base table of the life table
-setMethod("baseTable", "valuationTable",
+setMethod("baseTable", "mortalityTable",
           function (object,  ...) {
               c()
           })
 
 #' @describeIn baseTable Return the base table of the life table
-setMethod("baseTable", "valuationTable.period",
+setMethod("baseTable", "mortalityTable.period",
           function (object,  ...) {
               object@deathProbs
           })

R/baseYear.R

-#' @include valuationTable.R valuationTable.mixed.R
+#' @include mortalityTable.R mortalityTable.mixed.R
 NULL
 
 #' Return the base year of the life table
 #'
-#' @param object The life table object (class inherited from valuationTable)
+#' @param object The life table object (class inherited from mortalityTable)
 #' @param ... Other parameters (currently unused)
 #'
 #' @exportMethod baseYear
 setGeneric("baseYear", function(object, ...) standardGeneric("baseYear"));
 
 #' @describeIn baseYear Return the base year of the life table
-setMethod("baseYear", "valuationTable",
+setMethod("baseYear", "mortalityTable",
           function (object,  ...) {
               object@baseYear
           })
 
 #' @describeIn baseYear Return the base year of the life table
-setMethod("baseYear", "valuationTable.mixed",
+setMethod("baseYear", "mortalityTable.mixed",
           function (object,  ...) {
               baseYear(object@table1)
           })

R/deathProbabilities.R

-#' @include valuationTable.R valuationTable.period.R valuationTable.ageShift.R valuationTable.trendProjection.R valuationTable.improvementFactors.R valuationTable.mixed.R
+#' @include mortalityTable.R mortalityTable.period.R mortalityTable.ageShift.R mortalityTable.trendProjection.R mortalityTable.improvementFactors.R mortalityTable.mixed.R
 NULL
 
 #' Return the (cohort) death probabilities of the life table given the birth year (if needed)
 #'
-#' @param object The life table object (class inherited from valuationTable)
+#' @param object The life table object (class inherited from mortalityTable)
 #' @param ... Other parameters (currently unused)
 #' @param YOB The birth year for which the death probabilities should be calculated
 #'
@@ -12,14 +12,14 @@ setGeneric("deathProbabilities", function(object, ..., YOB = 1975) standardGener
 
 #' @describeIn deathProbabilities Return the (cohort) death probabilities of the
 #'                                life table given the birth year (if needed)
-setMethod("deathProbabilities", "valuationTable.period",
+setMethod("deathProbabilities", "mortalityTable.period",
           function(object, ..., YOB = 1975) {
               object@modification(object@deathProbs * (1 + object@loading));
           })
 
 #' @describeIn deathProbabilities Return the (cohort) death probabilities of the
 #'                                life table given the birth year (if needed)
-setMethod("deathProbabilities","valuationTable.ageShift",
+setMethod("deathProbabilities","mortalityTable.ageShift",
           function (object,  ..., YOB = 1975) {
               qx=object@deathProbs * (1 + object@loading);
               shift = ageShift(object, YOB);
@@ -33,7 +33,7 @@ setMethod("deathProbabilities","valuationTable.ageShift",
 
 #' @describeIn deathProbabilities Return the (cohort) death probabilities of the
 #'                                life table given the birth year (if needed)
-setMethod("deathProbabilities","valuationTable.trendProjection",
+setMethod("deathProbabilities","mortalityTable.trendProjection",
           function (object,  ..., YOB = 1975) {
               qx=object@deathProbs * (1 + object@loading);
               if (is.null(object@trend2) || length(object@trend2) <= 1) {
@@ -57,7 +57,7 @@ setMethod("deathProbabilities","valuationTable.trendProjection",
 
 #' @describeIn deathProbabilities Return the (cohort) death probabilities of the
 #'                                life table given the birth year (if needed)
-setMethod("deathProbabilities","valuationTable.improvementFactors",
+setMethod("deathProbabilities","mortalityTable.improvementFactors",
           function (object,  ..., YOB = 1975) {
               qx = object@deathProbs * (1 + object@loading);
               finalqx = (1 - object@improvement)^(YOB + 0:(length(qx) - 1) - object@baseYear) * qx;
@@ -66,7 +66,7 @@ setMethod("deathProbabilities","valuationTable.improvementFactors",
 
 #' @describeIn deathProbabilities Return the (cohort) death probabilities of the
 #'                                life table given the birth year (if needed)
-setMethod("deathProbabilities","valuationTable.mixed",
+setMethod("deathProbabilities","mortalityTable.mixed",
           function (object,  ..., YOB = 1975) {
               qx1 = deathProbabilities(object@table1, ..., YOB) * (1 + object@loading);
               qx2 = deathProbabilities(object@table2, ..., YOB) * (1 + object@loading);

R/getCohortTable.R

-#' @include valuationTable.R
+#' @include mortalityTable.R
 NULL
 
-#' Return the cohort life table as a \code{valuationTable.period} object
+#' Return the cohort life table as a \code{mortalityTable.period} object
 #'
-#' @param object The life table object (class inherited from valuationTable)
+#' @param object The life table object (class inherited from mortalityTable)
 #' @param YOB The birth year for which the life table should be calculated
 #' @param ... Other parameters (currently unused)
 #'
@@ -11,10 +11,10 @@ NULL
 setGeneric("getCohortTable", function(object, YOB, ...) standardGeneric("getCohortTable"));
 
 #' @describeIn getCohortTable Return the cohort life table as a
-#'             \code{valuationTable.period} object
-setMethod("getCohortTable","valuationTable",
+#'             \code{mortalityTable.period} object
+setMethod("getCohortTable","mortalityTable",
           function (object, YOB, ...) {
-              valuationTable.period(
+              mortalityTable.period(
                   name = paste(object@name, ", YOB ", YOB),
                   baseYear = YOB,
                   ages = ages(object),

R/getOmega.R

-#' @include valuationTable.R valuationTable.period.R valuationTable.mixed.R valuationTable.joined.R valuationTable.observed.R
+#' @include mortalityTable.R mortalityTable.period.R mortalityTable.mixed.R mortalityTable.joined.R mortalityTable.observed.R
 NULL
 
 #' Return the maximum age of the life table
 #'
-#' @param object A life table object (instance of a \code{valuationTable} class)
+#' @param object A life table object (instance of a \code{mortalityTable} class)
 #'
 #' @exportMethod getOmega
 setGeneric("getOmega", function(object) standardGeneric("getOmega"));
 
 #' @describeIn getOmega Return the maximum age of the period life table
-setMethod("getOmega", "valuationTable.period",
+setMethod("getOmega", "mortalityTable.period",
           function (object) {
               max(object@ages, na.rm = TRUE);
           })
 
 #' @describeIn getOmega Return the maximum age of the mixed life table
-setMethod("getOmega", "valuationTable.mixed",
+setMethod("getOmega", "mortalityTable.mixed",
           function (object) {
               getOmega(object@table1);
           })
 
 #' @describeIn getOmega Return the maximum age of the joined life table
-setMethod("getOmega", "valuationTable.joined",
+setMethod("getOmega", "mortalityTable.joined",
           function (object) {
               getOmega(object@table1);
           })
 
 #' @describeIn getOmega Return the maximum age of the joined life table
-setMethod("getOmega", "valuationTable.observed",
+setMethod("getOmega", "mortalityTable.observed",
           function (object) {
               max(object@ages, na.rm = TRUE);
           })

R/getPeriodTable.R

-#' @include valuationTable.R
+#' @include mortalityTable.R
 NULL
 
-#' Return the period life table as a \code{valuationTable.period} object
+#' Return the period life table as a \code{mortalityTable.period} object
 #'
-#' @param object The life table object (class inherited from valuationTable)
+#' @param object The life table object (class inherited from mortalityTable)
 #' @param Period The observation year, for which the death probabilities should
 #'        be determined
 #' @param ... Other parameters (currently unused)
@@ -15,10 +15,10 @@ setGeneric("getPeriodTable",
 );
 
 #' @describeIn getPeriodTable Return the period life table as a
-#'             \code{valuationTable.period} object
-setMethod("getPeriodTable","valuationTable",
+#'             \code{mortalityTable.period} object
+setMethod("getPeriodTable","mortalityTable",
           function (object, Period, ...) {
-              valuationTable.period(
+              mortalityTable.period(
                   name = paste(object@name, ", Period ", Period),
                   baseYear = Period,
                   ages = ages(object),

R/lifeTable.R

-#' @include valuationTable.R
+#' @include mortalityTable.R
 NULL
 
 #' Return the lifetable object (package lifecontingencies) for the cohort life table
 #'
-#' @param object The life table object (class inherited from valuationTable)
+#' @param object The life table object (class inherited from mortalityTable)
 #' @param ... Parameters to be passed to the \code{deathProbabilities} method
 #'            of the life table
 #'
@@ -12,7 +12,7 @@ setGeneric("lifeTable", function(object, ...) standardGeneric("lifeTable"));
 
 #' @describeIn lifeTable Return the lifetable object (package lifecontingencies)
 #'             for the cohort life table
-setMethod("lifeTable","valuationTable",
+setMethod("lifeTable","mortalityTable",
           function (object,  ...) {
               qx = deathProbabilities(object, ...);
               if (qx[[length(qx)]] != 1) {

R/makeQxDataFrame.R

-#' Converts one or multiple life table objects to a data frame that can be
-#' plotted by \code{plotValuationTables} or \code{plotValuationTableComparisons}
+#' Converts one or multiple mortality table objects to a data frame that can be
+#' plotted by \code{plotMortalityTables} or \code{plotMortalityTableComparisons}
 #'
-#' It is not required to call this function manually, \code{plotValuationTables}
-#' will automatically do it if object derived from class \code{valuationTable}
+#' It is not required to call this function manually, \code{plotMortalityTables}
+#' will automatically do it if object derived from class \code{mortalityTable}
 #' are passed.
 #'
-#' @param ... Life tables (objects of classes derived from \code{valuationTable})
+#' @param ... Life tables (objects of classes derived from \code{mortalityTable})
 #' @param YOB desired year of birth to be plotted as cohort life table (default: 1972)
 #' @param Period desired observation year to be plotted (default: NA). If both
 #'        \code{YOB} and \code{Period} are given, a period comparison is generated.

R/valuationTable.R → R/mortalityTable.R

@@ -6,24 +6,24 @@
 "_PACKAGE"
 
 
-#' Class valuationTable
+#' Class mortalityTable
 #'
-#' Class \code{valuationTable} is the (virtual) base class for all valuation
+#' Class \code{mortalityTable} is the (virtual) base class for all mortality
 #' tables. It contains the name and some general values applying to all
 #' types of tables, but does not contain any data itself. Use a child class
-#' to create actual valuation tables.
+#' to create actual mortality tables.
 #'
-#' @slot name     The human-readable name of the valuation table
-#' @slot baseYear The base year of the valuation table (e.g. for tables with trend projection)
+#' @slot name     The human-readable name of the mortality table
+#' @slot baseYear The base year of the mortality table (e.g. for tables with trend projection)
 #' @slot modification A function that will be called with the final death probabilities
 #'        to give the user a way to modify the final probabilities
 #' @slot loading  Additional security loading on the resulting table (single numeric
 #'        value, e.g. 0.05 adds 5\% security margin to the probabilities)
 #'
-#' @export valuationTable
-#' @exportClass valuationTable
-valuationTable=setClass(
-    "valuationTable",
+#' @export mortalityTable
+#' @exportClass mortalityTable
+mortalityTable=setClass(
+    "mortalityTable",
     slots = list(
         name = "character",
         baseYear = "numeric",
@@ -31,7 +31,7 @@ valuationTable=setClass(
         modification = "function"
     ),
     prototype = list(
-        name = "Actuarial Valuation Table",
+        name = "Actuarial Mortality Table",
         baseYear = 2000,
         loading = 0,
         modification = identity

R/valuationTable.ageShift.R → R/mortalityTable.ageShift.R

-#' @include valuationTable.R valuationTable.period.R
+#' @include mortalityTable.R mortalityTable.period.R
 NULL
 
-#' Class valuationTable.ageShift - Cohort life tables generated by age-shift
+#' Class mortalityTable.ageShift - Cohort life tables generated by age-shift
 #'
 #' A cohort life table, obtained by age-shifting from a given base table (death probabilities
 # for a base birth year)
 #'
 #' @slot ageShifts  A \code{data.frame} with columns \code{YOB} and \code{shifts} giving the age shifts for each birth year
 #'
-#' @export valuationTable.ageShift
-#' @exportClass valuationTable.ageShift
-valuationTable.ageShift = setClass(
-    "valuationTable.ageShift",
+#' @export mortalityTable.ageShift
+#' @exportClass mortalityTable.ageShift
+mortalityTable.ageShift = setClass(
+    "mortalityTable.ageShift",
     slots = list(
         ageShifts = "data.frame"
     ),
     prototype = list(
         ageShifts = data.frame(YOB = c(), shifts = c())
     ),
-    contains = "valuationTable.period"
+    contains = "mortalityTable.period"
 )

R/valuationTable.improvementFactors.R → R/mortalityTable.improvementFactors.R

-#' @include valuationTable.R valuationTable.period.R
+#' @include mortalityTable.R mortalityTable.period.R
 NULL
 
-#' Class valuationTable.improvementFactors - Cohort life table with improvement
+#' Class mortalityTable.improvementFactors - Cohort life table with improvement
 #' factors
 #'
 #' A cohort life table, obtained by an improvment factor projection
@@ -11,10 +11,10 @@ NULL
 #'                   describes the death probabilities in this year)
 #' @slot improvement Yearly improvement factors per age
 #'
-#' @export valuationTable.improvementFactors
-#' @exportClass valuationTable.improvementFactors
-valuationTable.improvementFactors = setClass(
-    "valuationTable.improvementFactors",
+#' @export mortalityTable.improvementFactors
+#' @exportClass mortalityTable.improvementFactors
+mortalityTable.improvementFactors = setClass(
+    "mortalityTable.improvementFactors",
     slots = list(
         baseYear = "numeric",
         improvement = "numeric"
@@ -23,5 +23,5 @@ valuationTable.improvementFactors = setClass(
         baseYear = 2012,
         improvement = rep(0,120)
     ),
-    contains = "valuationTable.period"
+    contains = "mortalityTable.period"
 )

R/valuationTable.joined.R → R/mortalityTable.joined.R

-#' @include valuationTable.R
+#' @include mortalityTable.R
 NULL
 
-#' Class valuationTable.joined - Life table created by joining two life tables
+#' Class mortalityTable.joined - Life table created by joining two life tables
 #'
 #' A cohort life table obtained by joining two cohort life tables, each of which
 #' applies only to certain observation years (e.g. for the past use the observed
 #' PoDs, and project them to the future with the trend projection)
 #'
-#' @slot table1 The first \code{valuationTable}, valid for years given in \code{yearRange1}
+#' @slot table1 The first \code{mortalityTable}, valid for years given in \code{yearRange1}
 #' @slot yearRange1 The years, for which \code{table1} describes the death probabilities
-#' @slot table2 The second \code{valuationTable}, valid for years given in \code{yearRange2}
+#' @slot table2 The second \code{mortalityTable}, valid for years given in \code{yearRange2}
 #' @slot yearRange2 The years, for which \code{table2} describes the death probabilities
 #'
-#' @export valuationTable.joined
-#' @exportClass valuationTable.joined
-valuationTable.joined = setClass(
-    "valuationTable.joined",
+#' @export mortalityTable.joined
+#' @exportClass mortalityTable.joined
+mortalityTable.joined = setClass(
+    "mortalityTable.joined",
     slots=list(
-        table1 = "valuationTable",
+        table1 = "mortalityTable",
         yearRange1 = "numeric",
-        table2 = "valuationTable",
+        table2 = "mortalityTable",
         yearRange2 = "numeric"
     ),
-    contains = "valuationTable"
+    contains = "mortalityTable"
 )

R/valuationTable.mixed.R → R/mortalityTable.mixed.R

-#' @include valuationTable.R
+#' @include mortalityTable.R
 NULL
 
-#' Class valuationTable.mixed - Life table as a mix of two life tables
+#' Class mortalityTable.mixed - Life table as a mix of two life tables
 #'
 #' A cohort life table obtained by mixing two life tables with the given weights
 #'
-#' @slot table1 The first \code{valuationTable}
-#' @slot table2 The second \code{valuationTable}
-#' @slot weight1 The weight of the first valuation table
-#' @slot weight2 The weight of the second valuation table
+#' @slot table1 The first \code{mortalityTable}
+#' @slot table2 The second \code{mortalityTable}
+#' @slot weight1 The weight of the first mortality table
+#' @slot weight2 The weight of the second mortality table
 #' @slot loading Additional security loading
 #'
-#' @export valuationTable.mixed
-#' @exportClass valuationTable.mixed
-valuationTable.mixed = setClass(
-    "valuationTable.mixed",
+#' @export mortalityTable.mixed
+#' @exportClass mortalityTable.mixed
+mortalityTable.mixed = setClass(
+    "mortalityTable.mixed",
     slots = c(
-        table1 = "valuationTable",
-        table2 = "valuationTable",
+        table1 = "mortalityTable",
+        table2 = "mortalityTable",
         weight1 = "numeric",
         weight2 = "numeric",
         loading = "numeric"
@@ -27,5 +27,5 @@ valuationTable.mixed = setClass(
         weight2 = 1/2,
         loading = 0
     ),
-    contains = "valuationTable"
+    contains = "mortalityTable"
 )

R/valuationTable.observed.R → R/mortalityTable.observed.R

-#' @include valuationTable.R
+#' @include mortalityTable.R
 NULL
 
-#' Class valuationTable.observed - Life table from actual observations
+#' Class mortalityTable.observed - Life table from actual observations
 #'
 #' A cohort life table described by actual observations (data frame of PODs
 #' per year and age)
@@ -10,10 +10,10 @@ NULL
 #' @slot years   The observation years
 #' @slot ages    The observation ages
 #'
-#' @export valuationTable.observed
-#' @exportClass valuationTable.observed
-valuationTable.observed = setClass(
-    "valuationTable.observed",
+#' @export mortalityTable.observed
+#' @exportClass mortalityTable.observed
+mortalityTable.observed = setClass(
+    "mortalityTable.observed",
     slots = list(
         data = "data.frame",
         years = "numeric",
@@ -24,5 +24,5 @@ valuationTable.observed = setClass(
         years = c(),
         ages = c()
     ),
-    contains = "valuationTable"
+    contains = "mortalityTable"
 )