@@ -212,13 +212,25 @@ usually it is sufficient to implement `logpdf`.
212212See also: [`logpdf`](@ref).
213213"""
214214@inline function pdf (
215- d:: Distribution{ArrayLikeVariate{N}} , x:: AbstractArray{<:Real,N}
216- ) where {N}
217- @boundscheck begin
218- size (x) == size (d) ||
219- throw (DimensionMismatch (" inconsistent array dimensions"
215+ d:: Distribution{ArrayLikeVariate{N}} , x:: AbstractArray{<:Real,M}
216+ ) where {N,M}
217+ if M == N
218+ @boundscheck begin
219+ size (x) == size (d) ||
220+ throw (DimensionMismatch (" inconsistent array dimensions"
221+ end
222+ return _pdf (d, x)
223+ else
224+ @boundscheck begin
225+ M > N ||
226+ throw (DimensionMismatch (
227+ " number of dimensions of the variates ($M ) must be greater than or equal to the dimension of the distribution ($N )"
228+ ))
229+ ntuple (i -> size (x, i), Val (N)) == size (d) ||
230+ throw (DimensionMismatch (" inconsistent array dimensions"
231+ end
232+ return @inbounds map (Base. Fix1 (pdf, d), eachvariate (x, variate_form (typeof (d))))
220233 end
221- return _pdf (d, x)
222234end
223235
224236function _pdf (d:: Distribution{ArrayLikeVariate{N}} , x:: AbstractArray{<:Real,N} ) where {N}
@@ -241,13 +253,25 @@ size of `x`.
241253See also: [`pdf`](@ref).
242254"""
243255@inline function logpdf (
244- d:: Distribution{ArrayLikeVariate{N}} , x:: AbstractArray{<:Real,N}
245- ) where {N}
246- @boundscheck begin
247- size (x) == size (d) ||
248- throw (DimensionMismatch (" inconsistent array dimensions"
256+ d:: Distribution{ArrayLikeVariate{N}} , x:: AbstractArray{<:Real,M}
257+ ) where {N,M}
258+ if M == N
259+ @boundscheck begin
260+ size (x) == size (d) ||
261+ throw (DimensionMismatch (" inconsistent array dimensions"
262+ end
263+ return _logpdf (d, x)
264+ else
265+ @boundscheck begin
266+ M > N ||
267+ throw (DimensionMismatch (
268+ " number of dimensions of the variates ($M ) must be greater than or equal to the dimension of the distribution ($N )"
269+ ))
270+ ntuple (i -> size (x, i), Val (N)) == size (d) ||
271+ throw (DimensionMismatch (" inconsistent array dimensions"
272+ end
273+ return @inbounds map (Base. Fix1 (logpdf, d), eachvariate (x, variate_form (typeof (d))))
249274 end
250- return _logpdf (d, x)
251275end
252276
253277# `_logpdf` should be implemented and has no default definition
@@ -272,20 +296,6 @@ Base.@propagate_inbounds function pdf(
272296 return map (Base. Fix1 (pdf, d), x)
273297end
274298
275- @inline function pdf (
276- d:: Distribution{ArrayLikeVariate{N}} , x:: AbstractArray{<:Real,M} ,
277- ) where {N,M}
278- @boundscheck begin
279- M > N ||
280- throw (DimensionMismatch (
281- " number of dimensions of `x` ($M ) must be greater than number of dimensions of `d` ($N )"
282- ))
283- ntuple (i -> size (x, i), Val (N)) == size (d) ||
284- throw (DimensionMismatch (" inconsistent array dimensions"
285- end
286- return @inbounds map (Base. Fix1 (pdf, d), eachvariate (x, variate_form (typeof (d))))
287- end
288-
289299"""
290300 logpdf(d::Distribution{ArrayLikeVariate{N}}, x) where {N}
291301
@@ -305,20 +315,6 @@ Base.@propagate_inbounds function logpdf(
305315 return map (Base. Fix1 (logpdf, d), x)
306316end
307317
308- @inline function logpdf (
309- d:: Distribution{ArrayLikeVariate{N}} , x:: AbstractArray{<:Real,M} ,
310- ) where {N,M}
311- @boundscheck begin
312- M > N ||
313- throw (DimensionMismatch (
314- " number of dimensions of `x` ($M ) must be greater than number of dimensions of `d` ($N )"
315- ))
316- ntuple (i -> size (x, i), Val (N)) == size (d) ||
317- throw (DimensionMismatch (" inconsistent array dimensions"
318- end
319- return @inbounds map (Base. Fix1 (logpdf, d), eachvariate (x, variate_form (typeof (d))))
320- end
321-
322318"""
323319 pdf!(out, d::Distribution{ArrayLikeVariate{N}}, x) where {N}
324320
365361 @boundscheck begin
366362 M > N ||
367363 throw (DimensionMismatch (
368- " number of dimensions of `x` ($M ) must be greater than number of dimensions of `d` ($N )"
364+ " number of dimensions of the variates ($M ) must be greater than the dimension of the distribution ($N )"
369365 ))
370366 ntuple (i -> size (x, i), Val (N)) == size (d) ||
371367 throw (DimensionMismatch (" inconsistent array dimensions"
@@ -414,7 +410,7 @@ See also: [`pdf!`](@ref).
414410 @boundscheck begin
415411 M > N ||
416412 throw (DimensionMismatch (
417- " number of dimensions of `x` ($M ) must be greater than number of dimensions of `d` ($N )"
413+ " number of dimensions of the variates ($M ) must be greater than the dimension of the distribution ($N )"
418414 ))
419415 ntuple (i -> size (x, i), Val (N)) == size (d) ||
420416 throw (DimensionMismatch (" inconsistent array dimensions"
445441- an array of dimension `N + 1` with `size(x)[1:N] == size(d)`, or
446442- an array of arrays `xi` of dimension `N` with `size(xi) == size(d)`.
447443"""
448- Base. @propagate_inbounds function loglikelihood (
449- d:: Distribution{ArrayLikeVariate{N}} , x:: AbstractArray{<:Real,N} ,
450- ) where {N}
451- return logpdf (d, x)
452- end
453- @inline function loglikelihood (
444+ Base. @propagate_inbounds @inline function loglikelihood (
454445 d:: Distribution{ArrayLikeVariate{N}} , x:: AbstractArray{<:Real,M} ,
455446) where {N,M}
456- @boundscheck begin
457- M > N ||
458- throw (DimensionMismatch (
459- " number of dimensions of `x` ($M ) must be greater than number of dimensions of `d` ($N )"
460- ))
461- ntuple (i -> size (x, i), Val (N)) == size (d) ||
462- throw (DimensionMismatch (" inconsistent array dimensions"
447+ if M == N
448+ return logpdf (d, x)
449+ else
450+ @boundscheck begin
451+ M > N ||
452+ throw (DimensionMismatch (
453+ " number of dimensions of the variates ($M ) must be greater than or equal to the dimension of the distribution ($N )"
454+ ))
455+ ntuple (i -> size (x, i), Val (N)) == size (d) ||
456+ throw (DimensionMismatch (" inconsistent array dimensions"
457+ end
458+ return @inbounds sum (Base. Fix1 (logpdf, d), eachvariate (x, ArrayLikeVariate{N}))
463459 end
464- return @inbounds sum (Base. Fix1 (logpdf, d), eachvariate (x, ArrayLikeVariate{N}))
465460end
466461Base. @propagate_inbounds function loglikelihood (
467462 d:: Distribution{ArrayLikeVariate{N}} , x:: AbstractArray{<:AbstractArray{<:Real,N}} ,
0 commit comments