Merge pull request #100 from JuliaActuary/life_exp_fix2

Life exp fix2

Project.toml

@@ -1,7 +1,7 @@
 name = "MortalityTables"
 uuid = "4780e19d-04b9-53dc-86c2-9e9aa59b5a12"
 authors = ["Alec Loudenback <alecloudenback@gmail.com>"]
-version = "2.1.1"
+version = "2.1.2"
 
 [deps]
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"

src/life_expectancy.jl

@@ -3,13 +3,24 @@
     life_expectancy(table,age,DeathDistribution)
 
 Calcuate the remaining life expectancy. Assumes curtate life expectancy for tables if not Parametric or DeathDistribution given.
+
+The life_expectancy of the last age defined in the table is set to be `0.0`, even if the table does not end with a rate of `1.0`.
 """
 function life_expectancy(table,age)
-    sum(survival(table,age,age + dur) for dur in 1:lastindex(table) -age)
+    if age == lastindex(table)
+        return 0.
+    else
+        sum(survival(table,age,age + dur) for dur in 1:lastindex(table) -age)
+    end
 end
 
 function life_expectancy(table,age,dist)
-    QuadGK.quadgk(to -> survival(table,age,to+age,dist),0,lastindex(table)-age)[1]
+    if age == lastindex(table)
+        return 0.
+    else
+        QuadGK.quadgk(to -> survival(table,age,to+age,dist),0,lastindex(table)-age)[1]
+    end
+
 end
 
 function life_expectancy(table::ParametricMortality,age)

test/life_expectancy.jl

@@ -15,6 +15,7 @@
 
         # calculate sum of tpx in Excel
         @test life_expectancy(t.ultimate,55) ≈ 22.16469212 atol=1e-6
+        @test life_expectancy(t.ultimate,100) ≈ 0.0 atol=1e-6
 
         # relation of curtate to complete, ALMC 2.6.1
         @test life_expectancy(t.ultimate,55,MortalityTables.Uniform()) ≈ 22.16469212 + 0.5 atol=1e-3