diff --git a/R/deathProbabilities.R b/R/deathProbabilities.R index 496875408bc160672333d9bc9807ddec7279962e..820adccdac6e31d839cc626abc2b833717e164eb 100644 --- a/R/deathProbabilities.R +++ b/R/deathProbabilities.R @@ -68,9 +68,9 @@ setMethod("deathProbabilities","mortalityTable.improvementFactors", #' life table given the birth year (if needed) setMethod("deathProbabilities","mortalityTable.mixed", function (object, ..., YOB = 1975) { - qx1 = deathProbabilities(object@table1, ..., YOB) * (1 + object@loading); - qx2 = deathProbabilities(object@table2, ..., YOB) * (1 + object@loading); - mixedqx = (object@weight1 * qx1 + object@weight2 * qx2)/(object@weight1 + object@weight2); + qx1 = deathProbabilities(object@table1, ..., YOB); + qx2 = deathProbabilities(object@table2, ..., YOB); + mixedqx = (object@weight1 * qx1 + object@weight2 * qx2)/(object@weight1 + object@weight2) * (1 + object@loading); object@modification(mixedqx) }) diff --git a/R/periodDeathProbabilities.R b/R/periodDeathProbabilities.R index cbe2220ff3172773204d11e4916fc0bf9f4b15ee..3423faa8eac977e94a6e33f606e535aff4efae33 100644 --- a/R/periodDeathProbabilities.R +++ b/R/periodDeathProbabilities.R @@ -62,9 +62,9 @@ setMethod("periodDeathProbabilities", "mortalityTable.improvementFactors", #' of the life table for a given observation year setMethod("periodDeathProbabilities", "mortalityTable.mixed", function (object, ..., Period = 1975) { - qx1 = periodDeathProbabilities(object@table1, ..., Period = Period) * (1 + object@loading); - qx2 = periodDeathProbabilities(object@table2, ..., Period = Period) * (1 + object@loading); - mixedqx = (object@weight1 * qx1 + object@weight2 * qx2) / (object@weight1 + object@weight2); + qx1 = periodDeathProbabilities(object@table1, ..., Period = Period); + qx2 = periodDeathProbabilities(object@table2, ..., Period = Period); + mixedqx = (object@weight1 * qx1 + object@weight2 * qx2) / (object@weight1 + object@weight2) * (1 + object@loading); object@modification(mixedqx) })