fix splatting problem (#218)

* fix splatting problem

* bump version

* add test

Author: cscherrer

Project.toml

@@ -1,7 +1,7 @@
 name = "MeasureTheory"
 uuid = "eadaa1a4-d27c-401d-8699-e962e1bbc33b"
 authors = ["Chad Scherrer <[email protected]> and contributors"]
-version = "0.16.5"
+version = "0.16.6"
 
 [deps]
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"

src/combinators/for.jl

@@ -70,7 +70,9 @@ as(d::For) = as(Array, as(first(marginals(d))), size(first(d.inds))...)
 end
 
 function logdensity_def(d::For, x::AbstractVector)
-    get_i(j) = tuple((getindex(ind, j) for ind in d.inds)...)
+    get_i(j) = map(Base.Fix2(getindex, j), d.inds)
+    # get_i(j) =  (getindex(ind, j) for ind in d.inds)
+    # get_i(j) =  tuple((getindex(ind, j) for ind in d.inds)...)
     sum(eachindex(x)) do j
         i = get_i(j)
         @inbounds logdensity_def(d.f(i...), x[j])
@@ -117,9 +119,8 @@ end
     ::False,
 ) where {T,F,I,N,B}
     dim = size(first(d.inds))
-    base = For(d.inds) do j
-        basemeasure(d.f(j)).base
-    end
+    f(args...) = basemeasure(d.f(args...)).base
+    base = For(f, d.inds...)
     weightedmeasure(static(N) * prod(dim), base)
 end
 

test/runtests.jl

@@ -635,3 +635,13 @@ end
         a ≈ b
     end
 end
+
+@testset "https://github.com/cscherrer/MeasureTheory.jl/issues/217" begin
+    d = For(rand(3), rand(3)) do x, y
+        Normal(x, y)
+    end
+
+    x = rand(d)
+    
+    @test logdensityof(d, x) isa Real
+end