Add tests, fix import order

Author: penelopeysm

src/DynamicPPL.jl

@@ -194,14 +194,14 @@ include("logdensityfunction.jl")
 include("model_utils.jl")
 include("extract_priors.jl")
 include("values_as_in_model.jl")
+include("experimental.jl")
 include("chains.jl")
 include("bijector.jl")
 
 include("debug_utils.jl")
 using .DebugUtils
 include("test_utils.jl")
 
-include("experimental.jl")
 include("deprecated.jl")
 
 if isdefined(Base.Experimental, :register_error_hint)

src/chains.jl

@@ -109,7 +109,7 @@ function ParamsWithStats(
     else
         (DynamicPPL.ValuesAsInModelAccumulator(include_colon_eq),)
     end
-    return _, varinfo = DynamicPPL.Experimental.fast_evaluate!!(
+    _, varinfo = DynamicPPL.Experimental.fast_evaluate!!(
         ldf.model, ctx, AccumulatorTuple(accs)
     )
     params = DynamicPPL.getacc(varinfo, Val(:ValuesAsInModel)).values

test/chains.jl

@@ -4,7 +4,7 @@ using DynamicPPL
 using Distributions
 using Test
 
-@testset "ParamsWithStats" begin
+@testset "ParamsWithStats, from VarInfo" begin
     @model function f(z)
         x ~ Normal()
         y := x + 1
@@ -66,4 +66,31 @@ using Test
     end
 end
 
+@testset "ParamsWithStats from FastLDF" begin
+    @testset "$(m.f)" for m in DynamicPPL.TestUtils.DEMO_MODELS
+        unlinked_vi = VarInfo(m)
+        @testset "$islinked" for islinked in (false, true)
+            vi = if islinked
+                DynamicPPL.link!!(unlinked_vi, m)
+            else
+                unlinked_vi
+            end
+            nt_ranges, dict_ranges = DynamicPPL.Experimental.get_ranges_and_linked(vi)
+            params = map(identity, vi[:])
+
+            # Get the ParamsWithStats using FastLDF
+            fldf = DynamicPPL.Experimental.FastLDF(m, getlogjoint, vi)
+            ps = ParamsWithStats(params, fldf)
+
+            # Check that length of parameters is as expected
+            @test length(ps.params) == length(keys(vi))
+
+            # Iterate over all variables to check that their values match
+            for vn in keys(vi)
+                @test ps.params[vn] == vi[vn]
+            end
+        end
+    end
+end
+
 end # module