From 098aa91ce4f2fc0e23b0b3a48bc4d7b67248795c Mon Sep 17 00:00:00 2001 From: konkam Date: Fri, 30 Oct 2020 16:10:49 +0100 Subject: [PATCH] mistake fixed by Dasha --- src/Pkn.jl | 6 +++++- test/test_Pkn.jl | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Pkn.jl b/src/Pkn.jl index a146e40..90a0279 100644 --- a/src/Pkn.jl +++ b/src/Pkn.jl @@ -109,7 +109,11 @@ log of the ratio p_{n+1,k+1}/p_{n+1,k} (Bystrova, 2020). ``` """ function logxk(n, k, β, σ) - return log(k*σ + βnk(β, n, k, σ)) + log(Cnk(n, k+1, σ)) - log(σ) - log(Cnk(n, k, σ)) + if n==1 + return log(k*σ ) + log(Cnk(n, k+1, σ)) - log(σ) - log(Cnk(n, k, σ)) + else + return log(k*σ + βnk(β, n-1, k, σ)) + log(Cnk(n, k+1, σ)) - log(σ) - log(Cnk(n, k, σ)) + end end diff --git a/test/test_Pkn.jl b/test/test_Pkn.jl index 38e9d20..0bb3c4d 100644 --- a/test/test_Pkn.jl +++ b/test/test_Pkn.jl @@ -1,7 +1,7 @@ @test_nowarn GibbsTypePriors.Pkn_NGG_arb(50, 100, 0.5, 0.2) @test_nowarn GibbsTypePriors.Pkn_NGG_robust_in(50, 100, 0.5, 0.2) @test GibbsTypePriors.log_βnk(1.3, 100, 25, 1.2) ≈ 2.1851379297320825 -@test Float64(GibbsTypePriors.logxk(10, 5, 1.3, 0.9)) ≈ 0.7300787963127003 +@test Float64(GibbsTypePriors.logxk(10, 5, 1.3, 0.9)) ≈ 0.6969596408073483 @test_nowarn GibbsTypePriors.Pkn_NGG_approx(90, 100, 1.2, 0.6) @test_nowarn GibbsTypePriors.Pkn_NGG_approx(100, 100, 1.2, 0.6) @test GibbsTypePriors.Pkn_NGG_approx(100, 100, 1.2, 0.6, 100, -1) == -1