Force conditioned to return a dict

Author: penelopeysm

src/contexts.jl

@@ -480,14 +480,14 @@ a merged version of the condition values.
 function conditioned(context::AbstractContext)
     return conditioned(NodeTrait(conditioned, context), context)
 end
-conditioned(::IsLeaf, context) = NamedTuple()
+conditioned(::IsLeaf, context) = Dict{VarName,Any}()
 conditioned(::IsParent, context) = conditioned(childcontext(context))
 function conditioned(context::ConditionContext)
     # Note the order of arguments to `merge`. The behavior of the rest of DPPL
     # is that the outermost `context` takes precendence, hence when resolving
     # the `conditioned` variables we need to ensure that `context.values` takes
     # precedence over decendants of `context`.
-    return _merge(context.values, conditioned(childcontext(context)))
+    return _merge(to_varname_dict(context.values), conditioned(childcontext(context)))
 end
 function conditioned(context::PrefixContext)
     return conditioned(collapse_prefix_stack(context))