more test updates

Author: cscherrer

Project.toml

@@ -8,6 +8,7 @@ ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
 ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
 KeywordCalls = "4d827475-d3e4-43d6-abe3-9688362ede9f"
+LogExpFunctions = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
 MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
 MappedArrays = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -18,6 +19,7 @@ ConcreteStructs = "0.2"
 ConstructionBase = "1.3"
 FillArrays = "0.12"
 KeywordCalls = "0.2"
+LogExpFunctions = "0.3"
 MLStyle = "0.4"
 MappedArrays = "0.4"
 Tricks = "0.1"

src/MeasureBase.jl

@@ -20,6 +20,8 @@ sampletype(μ::AbstractMeasure) = typeof(testvalue(μ))
 export logdensity
 export basemeasure
 
+using LogExpFunctions: logsumexp
+
 """
     logdensity(μ::AbstractMeasure{X}, x::X)
 

src/combinators/superpose.jl

@@ -18,6 +18,8 @@ struct SuperpositionMeasure{NT} <: AbstractMeasure
     components :: NT   
 end
 
+testvalue(μ::SuperpositionMeasure) = testvalue(first(μ.components))
+
 # SuperpositionMeasure(ms :: AbstractMeasure...) = SuperpositionMeasure{X,length(ms)}(ms)
 
 # SuperpositionMeasure(m::NTuple{N, Measure{X}}) where {N,X} = SuperpositionMeasure(m...)

test/runtests.jl

@@ -36,49 +36,45 @@ end
 #     return (x,y)
 # end
 
-# function test_measure(μ)
-#     logdensity(μ, testvalue(μ)) isa AbstractFloat
-# end
+function test_testvalue(μ)
+    logdensity(μ, testvalue(μ)) isa AbstractFloat
+end
 
-# test_measures = [
-#     # Chain(x -> Normal(μ=x), Normal(μ=0.0))
-#     For(3) do j Normal(σ=j) end
-#     For(2,3) do i,j Normal(i,j) end
-#     Lebesgue(ℝ) ^ 3
-#     Lebesgue(ℝ) ^ (2,3)
-#     3 * Lebesgue(ℝ)
-#     Dirac(π)
-#     Lebesgue(ℝ)
-#     # Normal() ⊙ Cauchy()
-# ]
-
-# testbroken_measures = [
-#     Pushforward(as𝕀, Normal())
-#     SpikeMixture(Normal(), 2)
-#     # InverseGamma(2) # Not defined yet
-#     # MvNormal(I(3)) # Entirely broken for now
-#     CountingMeasure(Float64)
-#     Likelihood
-#     Dirac(0.0) + Lebesgue(ℝ)
-
-#     TrivialMeasure()
-# ]
-
-# @testset "testvalue" begin
-#     for μ in test_measures
-#         @test test_measure(μ)
-#     end
+test_measures = [
+    # Chain(x -> Normal(μ=x), Normal(μ=0.0))
+    For(3) do j Dirac(j) end
+    For(2,3) do i,j Dirac(i) + Dirac(j) end
+    Lebesgue(ℝ) ^ 3
+    Lebesgue(ℝ) ^ (2,3)
+    3 * Lebesgue(ℝ)
+    Dirac(π)
+    Lebesgue(ℝ)
+    Dirac(0.0) + Lebesgue(ℝ)
+    # Normal() ⊙ Cauchy()
+]
+
+testbroken_measures = [
+    SpikeMixture(Lebesgue(ℝ), 2)
+    # InverseGamma(2) # Not defined yet
+    # MvNormal(I(3)) # Entirely broken for now
+    CountingMeasure(Float64)
+    Likelihood
+
+    TrivialMeasure()
+]
+
+@testset "testvalue" begin
+    for μ in test_measures
+        @info "testing $μ"
+        @test test_testvalue(μ)
+    end
 
-#     for μ in testbroken_measures
-#         @test_broken test_measure(μ)
-#     end
+    for μ in testbroken_measures
+        @info "testing $μ"
+        @test_broken test_testvalue(μ)
+    end
 
-#     @testset "testvalue(::Chain)" begin
-#         mc =  Chain(x -> Normal(μ=x), Normal(μ=0.0))
-#         r = testvalue(mc)
-#         @test logdensity(mc, Iterators.take(r, 10)) isa AbstractFloat
-#     end
-# end
+end
 
 
 # @testset "Kernel" begin