Merge branch 'master' into compathelper/new_version/2020-11-06-00-16-…

…14-397-3849147150
JuliaMath · Nov 22, 2020 · c4f6a03 · c4f6a03
2 parents 2114797 + 45646e1
commit c4f6a03
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Project.toml b/Project.toml
@@ -17,6 +17,7 @@ StatsFuns = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
 
 [compat]
 Bijectors = "0.8"
+MLStyle = "0.4"
 julia = "1.3"
 
 [extras]

diff --git a/src/combinators/power.jl b/src/combinators/power.jl
@@ -59,3 +59,8 @@ function Base.rand(d::PowerMeasure)
 end    
 
 basemeasure(μ::PowerMeasure) = basemeasure(μ.μ)^μ.size
+
+function PowerMeasure(μ::ScaledMeasure, n::NTuple{N,Int}) where {N}
+    k = prod(n) * μ.logscale 
+    return ScaledMeasure(k, μ.base^n)
+end
diff --git a/src/combinators/scale.jl b/src/combinators/scale.jl
@@ -30,8 +30,8 @@ function logdensity(sm::ScaledMeasure{R,M}, x::X) where {X, R, M <: AbstractMeas
     logdensity(sm.base, x) + sm.logscale
 end
 
-function Base.:*(k::Number, m::AbstractMeasure)
-    if iszero(k)
+function Base.:*(k::T, m::AbstractMeasure) where {T <: Number}
+    if hasmethod(iszero, (T,)) && iszero(k)
         return TrivialMeasure
     else
         return ScaledMeasure{typeof(k), typeof(m)}(log(k),m)