Introduce default_accumulators()

Author: mhauru

src/default_accumulators.jl

@@ -142,3 +142,11 @@ end
 function convert_eltype(::Type{T}, acc::LogLikelihoodAccumulator) where {T}
     return LogLikelihoodAccumulator(convert(T, acc.logp))
 end
+
+function default_accumulators()
+    return AccumulatorTuple(
+        LogPriorAccumulator{LogProbType}(),
+        LogLikelihoodAccumulator{LogProbType}(),
+        NumProduceAccumulator{Int}(),
+    )
+end

src/simple_varinfo.jl

@@ -125,15 +125,15 @@ Evaluation in transformed space of course also works:
 
 ```jldoctest simplevarinfo-general
 julia> vi = DynamicPPL.settrans!!(SimpleVarInfo((x = -1.0,)), true)
-Transformed SimpleVarInfo((x = -1.0,), (LogLikelihood = LogLikelihoodAccumulator(0.0), LogPrior = LogPriorAccumulator(0.0)))
+Transformed SimpleVarInfo((x = -1.0,), (LogPrior = LogPriorAccumulator(0.0), LogLikelihood = LogLikelihoodAccumulator(0.0), NumProduce = NumProduceAccumulator(0)))
 
 julia> # (✓) Positive probability mass on negative numbers!
        getlogjoint(last(DynamicPPL.evaluate!!(m, vi, DynamicPPL.DefaultContext())))
 -1.3678794411714423
 
 julia> # While if we forget to indicate that it's transformed:
        vi = DynamicPPL.settrans!!(SimpleVarInfo((x = -1.0,)), false)
-SimpleVarInfo((x = -1.0,), (LogLikelihood = LogLikelihoodAccumulator(0.0), LogPrior = LogPriorAccumulator(0.0)))
+SimpleVarInfo((x = -1.0,), (LogPrior = LogPriorAccumulator(0.0), LogLikelihood = LogLikelihoodAccumulator(0.0), NumProduce = NumProduceAccumulator(0)))
 
 julia> # (✓) No probability mass on negative numbers!
        getlogjoint(last(DynamicPPL.evaluate!!(m, vi, DynamicPPL.DefaultContext())))
@@ -204,9 +204,7 @@ function SimpleVarInfo(values, accs)
     return SimpleVarInfo(values, accs, NoTransformation())
 end
 function SimpleVarInfo{T}(values) where {T<:Real}
-    return SimpleVarInfo(
-        values, AccumulatorTuple(LogLikelihoodAccumulator{T}(), LogPriorAccumulator{T}())
-    )
+    return SimpleVarInfo(values, default_accumulators())
 end
 function SimpleVarInfo(values)
     return SimpleVarInfo{LogProbType}(values)

src/varinfo.jl

@@ -102,14 +102,7 @@ struct VarInfo{Tmeta,Accs<:AccumulatorTuple} <: AbstractVarInfo
     accs::Accs
 end
 function VarInfo(meta=Metadata())
-    return VarInfo(
-        meta,
-        AccumulatorTuple(
-            LogPriorAccumulator{LogProbType}(),
-            LogLikelihoodAccumulator{LogProbType}(),
-            NumProduceAccumulator{Int}(),
-        ),
-    )
+    return VarInfo(meta, default_accumulators())
 end
 
 """