From a8aa40185b8435694c3ac1d355ea42037c260b4c Mon Sep 17 00:00:00 2001 From: Penelope Yong Date: Mon, 1 Dec 2025 18:16:14 +0000 Subject: [PATCH 1/3] Standardise `:lp` -> `:logjoint` --- src/chains.jl | 4 ++-- test/chains.jl | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/chains.jl b/src/chains.jl index d01606c3d..8ce4979c6 100644 --- a/src/chains.jl +++ b/src/chains.jl @@ -57,7 +57,7 @@ function ParamsWithStats( ( logprior=DynamicPPL.getlogprior(varinfo), loglikelihood=DynamicPPL.getloglikelihood(varinfo), - lp=DynamicPPL.getlogjoint(varinfo), + logjoint=DynamicPPL.getlogjoint(varinfo), ), ) end @@ -158,7 +158,7 @@ function ParamsWithStats( ( logprior=DynamicPPL.getlogprior(vi), loglikelihood=DynamicPPL.getloglikelihood(vi), - lp=DynamicPPL.getlogjoint(vi), + logjoint=DynamicPPL.getlogjoint(vi), ), ) end diff --git a/test/chains.jl b/test/chains.jl index 12a9ece71..498e2e912 100644 --- a/test/chains.jl +++ b/test/chains.jl @@ -20,9 +20,9 @@ using Test @test length(ps.params) == 2 @test haskey(ps.stats, :logprior) @test haskey(ps.stats, :loglikelihood) - @test haskey(ps.stats, :lp) + @test haskey(ps.stats, :logjoint) @test length(ps.stats) == 3 - @test ps.stats.lp ≈ ps.stats.logprior + ps.stats.loglikelihood + @test ps.stats.logjoint ≈ ps.stats.logprior + ps.stats.loglikelihood @test ps.params[@varname(y)] ≈ ps.params[@varname(x)] + 1 @test ps.stats.logprior ≈ logpdf(Normal(), ps.params[@varname(x)]) @test ps.stats.loglikelihood ≈ logpdf(Normal(ps.params[@varname(y)]), z) @@ -34,9 +34,9 @@ using Test @test length(ps.params) == 1 @test haskey(ps.stats, :logprior) @test haskey(ps.stats, :loglikelihood) - @test haskey(ps.stats, :lp) + @test haskey(ps.stats, :logjoint) @test length(ps.stats) == 3 - @test ps.stats.lp ≈ ps.stats.logprior + ps.stats.loglikelihood + @test ps.stats.logjoint ≈ ps.stats.logprior + ps.stats.loglikelihood @test ps.stats.logprior ≈ logpdf(Normal(), ps.params[@varname(x)]) @test ps.stats.loglikelihood ≈ logpdf(Normal(ps.params[@varname(x)] + 1), z) end From 5d07c269796b807d17eec3f1e9f68f7184adfd36 Mon Sep 17 00:00:00 2001 From: Penelope Yong Date: Mon, 1 Dec 2025 18:17:45 +0000 Subject: [PATCH 2/3] changelog --- HISTORY.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index c15b4136a..48f2efb0e 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -65,6 +65,10 @@ Leaf contexts require no changes, apart from a removal of the `NodeTrait` functi `ConditionContext` and `PrefixContext` are no longer exported. You should not need to use these directly, please use `AbstractPPL.condition` and `DynamicPPL.prefix` instead. +#### ParamsWithStats + +In the 'stats' part of `DynamicPPL.ParamsWithStats`, the log-joint is now consistently represented with the key `logjoint` instead of `lp`. + #### Miscellaneous Removed the method `returned(::Model, values, keys)`; please use `returned(::Model, ::AbstractDict{<:VarName})` instead. From 574f0b4bd058fba793ccdab47a5137ccecaa1eff Mon Sep 17 00:00:00 2001 From: Penelope Yong Date: Mon, 1 Dec 2025 18:32:56 +0000 Subject: [PATCH 3/3] fix a test --- test/ext/DynamicPPLMCMCChainsExt.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ext/DynamicPPLMCMCChainsExt.jl b/test/ext/DynamicPPLMCMCChainsExt.jl index 6091492df..445270ef8 100644 --- a/test/ext/DynamicPPLMCMCChainsExt.jl +++ b/test/ext/DynamicPPLMCMCChainsExt.jl @@ -20,7 +20,7 @@ using DynamicPPL, Distributions, MCMCChains, Test, AbstractMCMC @test size(c, 1) == 50 @test size(c, 3) == 3 @test Set(c.name_map.parameters) == Set([:x, :y]) - @test Set(c.name_map.internals) == Set([:logprior, :loglikelihood, :lp]) + @test Set(c.name_map.internals) == Set([:logprior, :loglikelihood, :logjoint]) @test logpdf.(Normal(), c[:x]) ≈ c[:logprior] @test c.info.varname_to_symbol[@varname(x)] == :x @test c.info.varname_to_symbol[@varname(y)] == :y