Skip to content

Commit 1aac709

Browse files
committed
Fix merge
1 parent e8c5a70 commit 1aac709

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

src/abstract_varinfo.jl

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -361,17 +361,6 @@ function acclogprior!!(vi::AbstractVarInfo, logp)
361361
return map_accumulator!!(acc -> acclogp(acc, logp), vi, Val(:LogPrior))
362362
end
363363

364-
"""
365-
acclogjac!!(vi::AbstractVarInfo, logJ)
366-
367-
Add `logJ` to the value of the log Jacobian in `vi`.
368-
369-
See also: [`getlogjac`](@ref), [`setlogjac!!`](@ref).
370-
"""
371-
function acclogjac!!(vi::AbstractVarInfo, logJ)
372-
return map_accumulator!!(acc -> acclogp(acc, logJ), vi, Val(:LogJacobian))
373-
end
374-
375364
"""
376365
acclogjac!!(vi::AbstractVarInfo, logjac)
377366
@@ -380,9 +369,7 @@ Add `logjac` to the value of the log Jacobian in `vi`.
380369
See also: [`getlogjac`](@ref), [`setlogjac!!`](@ref).
381370
"""
382371
function acclogjac!!(vi::AbstractVarInfo, logjac)
383-
return map_accumulator!!(
384-
acc -> acc + LogJacobianAccumulator(logjac), vi, Val(:LogJacobian)
385-
)
372+
return map_accumulator!!(acc -> acclogp(acc, logjac), vi, Val(:LogJacobian))
386373
end
387374

388375
"""

src/default_accumulators.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Create a new `LogProbAccumulator` accumulator with the log prior initialized to
3131
Base.copy(acc::LogProbAccumulator) = acc
3232

3333
function Base.show(io::IO, acc::LogProbAccumulator)
34-
return print(io, "$(repr(accumulator_name(acc)))($(repr(logp(acc)))))")
34+
return print(io, "$(string(basetypeof(acc)))($(repr(logp(acc))))")
3535
end
3636

3737
# Note that == and isequal are different, and equality under the latter should imply

0 commit comments

Comments
 (0)