fix more varinfo tests

Author: penelopeysm

src/contexts/init.jl

@@ -94,25 +94,11 @@ struct ParamsInit{P,S<:AbstractInitStrategy} <: AbstractInitStrategy
     end
 end
 function init(rng::Random.AbstractRNG, vn::VarName, dist::Distribution, p::ParamsInit)
-    # TODO(penelopeysm): Fix this. If anything in p.params _subsumes_ vn,
-    # we don't know how to handle it. This is just another corollary of
-    # https://github.com/TuringLang/DynamicPPL.jl/issues/814
-    # This used to be handled by nested_setindex_maybe, which I'd really like
-    # to get rid of.
-    if p.params isa AbstractDict{<:VarName}
-        strictly_subsumed = filter(
-            vn_in_params -> vn_in_params != vn && subsumes(vn, vn_in_params), keys(p.params)
-        )
-        if !isempty(strictly_subsumed)
-            throw(
-                ArgumentError(
-                    "The given dictionary of parameters contain the following sub-variables of $(vn): $(strictly_subsumed). ParamsInit doesn't know how to deal with this.",
-                ),
-            )
-        end
-    end
-    return if hasvalue(p.params, vn)
-        x = getvalue(p.params, vn)
+    # TODO(penelopeysm): We should really do a quick check to make sure that all of the
+    # parameters in `p.params` were actually used, and either warn or error if
+    # they aren't.
+    return if hasvalue(p.params, vn, dist)
+        x = getvalue(p.params, vn, dist)
         if x === missing
             init(rng, vn, dist, p.default)
         else

src/simple_varinfo.jl

@@ -259,13 +259,8 @@ function SimpleVarInfo{T}(vi::NTVarInfo, ::Type{D}) where {T<:Real,D}
 end
 
 function untyped_simple_varinfo(model::Model)
-<<<<<<< HEAD
     varinfo = SimpleVarInfo(OrderedDict{VarName,Any}())
-    return last(evaluate_and_sample!!(model, varinfo))
-=======
-    varinfo = SimpleVarInfo(OrderedDict())
     return last(init!!(model, varinfo))
->>>>>>> bc16e09 (WIP: InitContext)
 end
 
 function typed_simple_varinfo(model::Model)

test/runtests.jl

@@ -60,12 +60,12 @@ include("test_util.jl")
         # include("utils.jl")
         # include("accumulators.jl")
         # include("compiler.jl")
-        include("varnamedvector.jl")
-        include("varinfo.jl")
-        # include("simple_varinfo.jl")
-        # include("model.jl")
-        # include("sampler.jl")
-        # include("distribution_wrappers.jl")
+        # include("varnamedvector.jl")
+        # include("varinfo.jl")
+        include("simple_varinfo.jl")
+        include("model.jl")
+        include("sampler.jl")
+        include("distribution_wrappers.jl")
         # include("logdensityfunction.jl")
         # include("linking.jl")
         # include("serialization.jl")