diff --git a/Project.toml b/Project.toml index 2f56ebf..b773769 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "RateTables" uuid = "d40fb65e-c2ee-4113-9e14-cb96ca0acb32" authors = ["Oskar Laverny and contributors"] -version = "0.2.0" +version = "0.2.1" [deps] CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" diff --git a/src/RateTable.jl b/src/RateTable.jl index 8a9cd1f..64dd54b 100644 --- a/src/RateTable.jl +++ b/src/RateTable.jl @@ -102,7 +102,7 @@ Base.getindex(rt::RateTable, args...) = rt.map[args] Base.getindex(rt::RateTable; kwargs...) = getindex(rt, collect(kwargs[n] for n in keys(rt.axes))...) # Helper function. -dty(t,minval,maxval) = min(Int(trunc(t*RT_YEARS_IN_DAY))-minval+1,maxval-minval+1) +dty(t,minval,maxval) = clamp(Int(trunc(t*RT_YEARS_IN_DAY))-minval+1, 1, maxval-minval+1) """ daily_hazard(rt::BasicRateTable, age, date) diff --git a/test/runtests.jl b/test/runtests.jl index 833a323..9438710 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -67,6 +67,10 @@ using RData @test e+a <= 120*365.241 end end + + @testset "Dont go out of bound" begin + daily_hazard(survexp_fr[:male], 20*365.241, (survexp_fr[:male].extrema_year[1]-1)*365.241+12) + end end