Skip to content

Commit 48a6048

Browse files
committed
logJ -> logjac
1 parent a19bf2f commit 48a6048

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

src/abstract_varinfo.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ Jacobian here is taken with respect to the forward (link) transform.
204204
205205
See also: [`setlogjac!!`](@ref).
206206
"""
207-
getlogjac(vi::AbstractVarInfo) = getacc(vi, Val(:LogJacobian)).logJ
207+
getlogjac(vi::AbstractVarInfo) = getacc(vi, Val(:LogJacobian)).logjac
208208

209209
"""
210210
getloglikelihood(vi::AbstractVarInfo)
@@ -239,14 +239,14 @@ See also: [`setloglikelihood!!`](@ref), [`setlogp!!`](@ref), [`getlogprior`](@re
239239
setlogprior!!(vi::AbstractVarInfo, logp) = setacc!!(vi, LogPriorAccumulator(logp))
240240

241241
"""
242-
setlogjac!!(vi::AbstractVarInfo, logJ)
242+
setlogjac!!(vi::AbstractVarInfo, logjac)
243243
244244
Set the accumulated log-Jacobian term for any linked parameters in `vi`. The
245245
Jacobian here is taken with respect to the forward (link) transform.
246246
247247
See also: [`getlogjac`](@ref), [`acclogjac!!`](@ref).
248248
"""
249-
setlogjac!!(vi::AbstractVarInfo, logJ) = setacc!!(vi, LogJacobianAccumulator(logJ))
249+
setlogjac!!(vi::AbstractVarInfo, logjac) = setacc!!(vi, LogJacobianAccumulator(logjac))
250250

251251
"""
252252
setloglikelihood!!(vi::AbstractVarInfo, logp)
@@ -362,15 +362,15 @@ function acclogprior!!(vi::AbstractVarInfo, logp)
362362
end
363363

364364
"""
365-
acclogjac!!(vi::AbstractVarInfo, logJ)
365+
acclogjac!!(vi::AbstractVarInfo, logjac)
366366
367-
Add `logJ` to the value of the log Jacobian in `vi`.
367+
Add `logjac` to the value of the log Jacobian in `vi`.
368368
369369
See also: [`getlogjac`](@ref), [`setlogjac!!`](@ref).
370370
"""
371-
function acclogjac!!(vi::AbstractVarInfo, logJ)
371+
function acclogjac!!(vi::AbstractVarInfo, logjac)
372372
return map_accumulator!!(
373-
acc -> acc + LogJacobianAccumulator(logJ), vi, Val(:LogJacobian)
373+
acc -> acc + LogJacobianAccumulator(logjac), vi, Val(:LogJacobian)
374374
)
375375
end
376376

src/default_accumulators.jl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ $(TYPEDFIELDS)
5555
"""
5656
struct LogJacobianAccumulator{T<:Real} <: AbstractAccumulator
5757
"the logabsdet of the link transform Jacobian"
58-
logJ::T
58+
logjac::T
5959
end
6060

6161
"""
@@ -128,7 +128,7 @@ function Base.show(io::IO, acc::LogPriorAccumulator)
128128
return print(io, "LogPriorAccumulator($(repr(acc.logp)))")
129129
end
130130
function Base.show(io::IO, acc::LogJacobianAccumulator)
131-
return print(io, "LogJacobianAccumulator($(repr(acc.logJ)))")
131+
return print(io, "LogJacobianAccumulator($(repr(acc.logjac)))")
132132
end
133133
function Base.show(io::IO, acc::LogLikelihoodAccumulator)
134134
return print(io, "LogLikelihoodAccumulator($(repr(acc.logp)))")
@@ -144,7 +144,7 @@ end
144144
# implementation for structs.
145145
Base.:(==)(acc1::LogPriorAccumulator, acc2::LogPriorAccumulator) = acc1.logp == acc2.logp
146146
function Base.:(==)(acc1::LogJacobianAccumulator, acc2::LogJacobianAccumulator)
147-
return acc1.logJ == acc2.logJ
147+
return acc1.logjac == acc2.logjac
148148
end
149149
function Base.:(==)(acc1::LogLikelihoodAccumulator, acc2::LogLikelihoodAccumulator)
150150
return acc1.logp == acc2.logp
@@ -157,7 +157,7 @@ function Base.isequal(acc1::LogPriorAccumulator, acc2::LogPriorAccumulator)
157157
return isequal(acc1.logp, acc2.logp)
158158
end
159159
function Base.isequal(acc1::LogJacobianAccumulator, acc2::LogJacobianAccumulator)
160-
return isequal(acc1.logJ, acc2.logJ)
160+
return isequal(acc1.logjac, acc2.logjac)
161161
end
162162
function Base.isequal(acc1::LogLikelihoodAccumulator, acc2::LogLikelihoodAccumulator)
163163
return isequal(acc1.logp, acc2.logp)
@@ -168,7 +168,7 @@ end
168168

169169
Base.hash(acc::LogPriorAccumulator, h::UInt) = hash((LogPriorAccumulator, acc.logp), h)
170170
function Base.hash(acc::LogJacobianAccumulator, h::UInt)
171-
return hash((LogJacobianAccumulator, acc.logJ), h)
171+
return hash((LogJacobianAccumulator, acc.logjac), h)
172172
end
173173
function Base.hash(acc::LogLikelihoodAccumulator, h::UInt)
174174
return hash((LogLikelihoodAccumulator, acc.logp), h)
@@ -191,7 +191,7 @@ function combine(acc::LogPriorAccumulator, acc2::LogPriorAccumulator)
191191
return LogPriorAccumulator(acc.logp + acc2.logp)
192192
end
193193
function combine(acc::LogJacobianAccumulator, acc2::LogJacobianAccumulator)
194-
return LogJacobianAccumulator(acc.logJ + acc2.logJ)
194+
return LogJacobianAccumulator(acc.logjac + acc2.logjac)
195195
end
196196
function combine(acc::LogLikelihoodAccumulator, acc2::LogLikelihoodAccumulator)
197197
return LogLikelihoodAccumulator(acc.logp + acc2.logp)
@@ -208,7 +208,7 @@ function Base.:+(acc1::LogPriorAccumulator, acc2::LogPriorAccumulator)
208208
return LogPriorAccumulator(acc1.logp + acc2.logp)
209209
end
210210
function Base.:+(acc1::LogJacobianAccumulator, acc2::LogJacobianAccumulator)
211-
return LogJacobianAccumulator(acc1.logJ + acc2.logJ)
211+
return LogJacobianAccumulator(acc1.logjac + acc2.logjac)
212212
end
213213
function Base.:+(acc1::LogLikelihoodAccumulator, acc2::LogLikelihoodAccumulator)
214214
return LogLikelihoodAccumulator(acc1.logp + acc2.logp)
@@ -218,7 +218,7 @@ function increment(acc::VariableOrderAccumulator)
218218
end
219219

220220
Base.zero(acc::LogPriorAccumulator) = LogPriorAccumulator(zero(acc.logp))
221-
Base.zero(acc::LogJacobianAccumulator) = LogJacobianAccumulator(zero(acc.logJ))
221+
Base.zero(acc::LogJacobianAccumulator) = LogJacobianAccumulator(zero(acc.logjac))
222222
Base.zero(acc::LogLikelihoodAccumulator) = LogLikelihoodAccumulator(zero(acc.logp))
223223

224224
function accumulate_assume!!(acc::LogPriorAccumulator, val, logjac, vn, right)
@@ -251,7 +251,7 @@ end
251251
function Base.convert(
252252
::Type{LogJacobianAccumulator{T}}, acc::LogJacobianAccumulator
253253
) where {T}
254-
return LogJacobianAccumulator(convert(T, acc.logJ))
254+
return LogJacobianAccumulator(convert(T, acc.logjac))
255255
end
256256
function Base.convert(
257257
::Type{LogLikelihoodAccumulator{T}}, acc::LogLikelihoodAccumulator
@@ -277,7 +277,7 @@ function convert_eltype(::Type{T}, acc::LogPriorAccumulator) where {T}
277277
return LogPriorAccumulator(convert(T, acc.logp))
278278
end
279279
function convert_eltype(::Type{T}, acc::LogJacobianAccumulator) where {T}
280-
return LogJacobianAccumulator(convert(T, acc.logJ))
280+
return LogJacobianAccumulator(convert(T, acc.logjac))
281281
end
282282
function convert_eltype(::Type{T}, acc::LogLikelihoodAccumulator) where {T}
283283
return LogLikelihoodAccumulator(convert(T, acc.logp))

0 commit comments

Comments
 (0)