fixes

Author: cscherrer

src/combinators/power.jl

@@ -42,15 +42,14 @@ function Base.:^(μ::M, dims::NTuple{N,I}) where {M<:AbstractMeasure,N,I<:Intege
 end
 
 # Same as PowerMeasure
-function Base.show(io::IO, d::ProductMeasure{F,S,<:Fill}) where {F,S}
+function Base.show(io::IO, d::ProductMeasure{Returns{T},I,C}) where {T,I,C<:CartesianIndices}
     io = IOContext(io, :compact => true)
-    print(io, d.f(first(d.pars)), " ^ ", size(d.pars))
+    print(io, d.f.f.value, " ^ ", size(d.pars))
 end
 
-# Same as PowerMeasure{F,T,1} where {F,T}
-function Base.show(io::IO, d::ProductMeasure{F,S,Fill{T,1,A}}) where {F,S,T,A}
+function Base.show(io::IO, d::ProductMeasure{R,I,V}) where {R<:Returns,I,V<:AbstractVector}
     io = IOContext(io, :compact => true)
-    print(io, d.f(first(d.pars)), " ^ ", size(d.pars)[1])
+    print(io, d.f.f.value, " ^ ", length(d.pars))
 end
 
 # sampletype(d::PowerMeasure{M,N}) where {M,N} = @inbounds Array{sampletype(first(marginals(d))), N}

src/combinators/smart-constructors.jl

@@ -55,7 +55,11 @@ end
 # PowerMeaure
 
 function powermeasure(μ::M, dims::NTuple{N,I}) where {M<:AbstractMeasure,N,I<:Integer}
-    productmeasure(identity, Fill(μ, dims))
+    productmeasure(Returns(μ), identity, CartesianIndices(dims))
+end
+
+function powermeasure(μ::M, dims::Tuple{I}) where {M<:AbstractMeasure,N,I<:Integer}
+    productmeasure(Returns(μ), identity, 1:first(dims))
 end
 
 function powermeasure(μ::WeightedMeasure, dims::NTuple{N,I}) where {N,I<:Integer}
@@ -68,14 +72,14 @@ end
 
 productmeasure(f, ops, pars) = ProductMeasure(kernel(f, ops), pars)
 
+productmeasure(f, pars) = productmeasure(f, identity, pars)
+
 productmeasure(μs::Tuple) = TupleProductMeasure(μs)
 
 productmeasure(f::Returns, ::typeof(identity), pars) = ProductMeasure(kernel(f, identity), pars)
 
 productmeasure(k::Kernel, pars) = productmeasure(k.f, k.ops, pars)
 
-productmeasure(f::Function, pars) = productmeasure(f, identity, pars)
-
 productmeasure(nt::NamedTuple) = productmeasure(identity, nt)
 
 

src/kernel.jl

@@ -68,7 +68,7 @@ function basekernel end
 
 
 # TODO: Find a way to do better than this
-basekernel(f::Function) = basemeasure ∘ f
+basekernel(f) = basemeasure ∘ f
 
 basekernel(k::Kernel) = kernel(basekernel(k.f), k.ops)
 basekernel(f::Returns) = f

test/runtests.jl

@@ -238,12 +238,12 @@ end
 #     end
 # end
 
-# @testset "Show methods" begin
-#     @testset "PowerMeasure" begin
-#         @test repr(Lebesgue(ℝ) ^ 5) == "Lebesgue(ℝ) ^ 5"
-#         @test repr(Lebesgue(ℝ) ^ (3, 2)) == "Lebesgue(ℝ) ^ (3, 2)"
-#     end
-# end
+@testset "Show methods" begin
+    @testset "PowerMeasure" begin
+        @test repr(Lebesgue(ℝ) ^ 5) == "Lebesgue(ℝ) ^ 5"
+        @test repr(Lebesgue(ℝ) ^ (3, 2)) == "Lebesgue(ℝ) ^ (3, 2)"
+    end
+end
 
 # @testset "Density measures and Radon-Nikodym" begin
 #     x = randn()