Try to condense implementation

Author: devmotion

src/threadsafe.jl

@@ -15,7 +15,7 @@ ThreadSafeVarInfo(vi::ThreadSafeVarInfo) = vi
 
 # Instead of updating the log probability of the underlying variables we
 # just update the array of log probabilities.
-function acclogp!(vi::ThreadSafeVarInfo, logp::Real)
+function acclogp!(vi::ThreadSafeVarInfo, logp)
     vi.logps[Threads.threadid()] += logp
     return getlogp(vi)
 end
@@ -27,37 +27,21 @@ getlogp(vi::ThreadSafeVarInfo) = getlogp(vi.varinfo) + sum(vi.logps)
 # TODO: Make remaining methods thread-safe.
 
 function resetlogp!(vi::ThreadSafeVarInfo)
-    resetlogp!(vi.varinfo)
-    z = zero(getlogp(vi))
-    fill!(vi.logps, z)
-    z
+    fill!(vi.logps, zero(getlogp(vi)))
+    return resetlogp!(vi.varinfo)
 end
-function setlogp!(vi::ThreadSafeVarInfo, logp::Real)
-    if length(vi.logp) == 0
-        push!(vi.logp, logp)
-    else
-        vi.logp[1] = logp
-    end
-    vi.lastidx[] = 1
-    return logp
+function setlogp!(vi::ThreadSafeVarInfo, logp)
+    fill!(vi.logps, zero(logp))
+    return setlogp!(vi.varinfo, logp)
 end
 
 get_num_produce(vi::ThreadSafeVarInfo) = get_num_produce(vi.varinfo)
 increment_num_produce!(vi::ThreadSafeVarInfo) = increment_num_produce!(vi.varinfo)
 reset_num_produce!(vi::ThreadSafeVarInfo) = reset_num_produce!(vi.varinfo)
 set_num_produce!(vi::ThreadSafeVarInfo, n::Int) = set_num_produce!(vi.varinfo, n)
 
-getall(vi::ThreadSafeVarInfo) = getall(vi.varinfo)
-setall!(vi::ThreadSafeVarInfo, val) = setall!(vi.varinfo, val)
-
 syms(vi::ThreadSafeVarInfo) = syms(vi.varinfo)
 
-getmetadata(vi::ThreadSafeVarInfo, vn::VarName) = getmetadata(vi.varinfo, vn)
-getidx(vi::ThreadSafeVarInfo, vn::VarName) = getidx(vi.varinfo, vn)
-getrange(vi::ThreadSafeVarInfo, vn::VarName) = getrange(vi.varinfo, vn)
-getdist(vi::ThreadSafeVarInfo, vn::VarName) = getdist(vi.varinfo, vn)
-getval(vi::ThreadSafeVarInfo, vn::VarName) = getval(vi.varinfo, vn)
-
 function setgid!(vi::ThreadSafeVarInfo, gid::Selector, vn::VarName)
     setgid!(vi.varinfo, gid, vn)
 end
@@ -66,18 +50,25 @@ setval!(vi::ThreadSafeVarInfo, val, vn::VarName) = setval!(vi.varinfo, val, vn)
 keys(vi::ThreadSafeVarInfo) = keys(vi.varinfo)
 haskey(vi::ThreadSafeVarInfo, vn::VarName) = haskey(vi.varinfo, vn)
 
-_getranges(vi::ThreadSafeVarInfo, idcs::NamedTuple) = _getranges(vi.varinfo, idcs)
-_getidcs(vi::ThreadSafeVarInfo, spl::SampleFromPrior) = _getidcs(vi.varinfo, spl)
-_getidcs(vi::ThreadSafeVarInfo, s::Selector, space) = _getidcs(vi.varinfo, s, space)
-_getvns(vi::ThreadSafeVarInfo, spl::SampleFromPrior) = _getvns(vi.varinfo, spl)
-_getvns(vi::ThreadSafeVarInfo, s::Selector, space) = _getvns(vi.varinfo, s, space)
-
 link!(vi::ThreadSafeVarInfo, spl::AbstractSampler) = link!(vi.varinfo, spl)
 invlink!(vi::ThreadSafeVarInfo, spl::AbstractSampler) = invlink!(vi.varinfo, spl)
 islinked(vi::ThreadSafeVarInfo, spl::AbstractSampler) = islinked(vi.varinfo, spl)
 
-getindex(vi::ThreadSafeVarInfo, spl::Sampler) = getindex(vi.varinfo, spl)
-setindex!(vi::ThreadSafeVarInfo, val, spl::Sampler) = setindex!(vi.varinfo, val, spl)
+getindex(vi::ThreadSafeVarInfo, spl::AbstractSampler) = getindex(vi.varinfo, spl)
+getindex(vi::ThreadSafeVarInfo, spl::SampleFromPrior) = getindex(vi.varinfo, spl)
+getindex(vi::ThreadSafeVarInfo, spl::SampleFromUniform) = getindex(vi.varinfo, spl)
+getindex(vi::ThreadSafeVarInfo, vn::VarName) = getindex(vi.varinfo, vn)
+getindex(vi::ThreadSafeVarInfo, vns::Vector{<:VarName}) = getindex(vi.varinfo, vns)
+
+function setindex!(vi::ThreadSafeVarInfo, val, spl::AbstractSampler)
+    setindex!(vi.varinfo, val, spl)
+end
+function setindex!(vi::ThreadSafeVarInfo, val, spl::SampleFromPrior)
+    setindex!(vi.varinfo, val, spl)
+end
+function setindex!(vi::ThreadSafeVarInfo, val, spl::SampleFromUniform)
+    setindex!(vi.varinfo, val, spl)
+end
 
 function set_retained_vns_del_by_spl!(vi::ThreadSafeVarInfo, spl::Sampler)
     return set_retained_vns_del_by_spl!(vi.varinfo, spl)
@@ -99,9 +90,6 @@ function push!(
 )
     push!(vi.varinfo, vn, r, dist, gidset)
 end
-function push_assert(vi::ThreadSafeVarInfo, vn::VarName, dist, gidset)
-    return push_assert(vi.varinfo, vn, dist, gidset)
-end
 
 function unset_flag!(vi::ThreadSafeVarInfo, vn::VarName, flag::String)
     return unset_flag!(vi.varinfo, vn, flag)

src/varinfo.jl

@@ -597,23 +597,23 @@ Return the log of the joint probability of the observed data and parameters samp
 getlogp(vi::AbstractVarInfo) = vi.logp[]
 
 """
-    setlogp!(vi::VarInfo, logp::Real)
+    setlogp!(vi::VarInfo, logp)
 
 Set the log of the joint probability of the observed data and parameters sampled in
 `vi` to `logp`.
 """
-setlogp!(vi::AbstractVarInfo, logp::Real) = vi.logp[] = logp
+setlogp!(vi::VarInfo, logp) = vi.logp[] = logp
 
 """
-    acclogp!(vi::VarInfo, logp::Real)
+    acclogp!(vi::VarInfo, logp)
 
 Add `logp` to the value of the log of the joint probability of the observed data and
 parameters sampled in `vi`.
 """
-acclogp!(vi::AbstractVarInfo, logp::Real) = vi.logp[] += logp
+acclogp!(vi::VarInfo, logp) = vi.logp[] += logp
 
 """
-    resetlogp!(vi::VarInfo)
+    resetlogp!(vi::AbstractVarInfo)
 
 Reset the value of the log of the joint probability of the observed data and parameters
 sampled in `vi` to 0.
@@ -625,24 +625,24 @@ resetlogp!(vi::AbstractVarInfo) = setlogp!(vi, zero(getlogp(vi)))
 
 Return the `num_produce` of `vi`.
 """
-get_num_produce(vi::AbstractVarInfo) = vi.num_produce[]
+get_num_produce(vi::VarInfo) = vi.num_produce[]
 
 """
     set_num_produce!(vi::VarInfo, n::Int)
 
 Set the `num_produce` field of `vi` to `n`.
 """
-set_num_produce!(vi::AbstractVarInfo, n::Int) = vi.num_produce[] = n
+set_num_produce!(vi::VarInfo, n::Int) = vi.num_produce[] = n
 
 """
     increment_num_produce!(vi::VarInfo)
 
 Add 1 to `num_produce` in `vi`.
 """
-increment_num_produce!(vi::AbstractVarInfo) = vi.num_produce[] += 1
+increment_num_produce!(vi::VarInfo) = vi.num_produce[] += 1
 
 """
-    reset_num_produce!(vi::VarInfo)
+    reset_num_produce!(vi::AbstractVarInfo)
 
 Reset the value of `num_produce` the log of the joint probability of the observed data
 and parameters sampled in `vi` to 0.