Skip to content

AbstractProductMeasure #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

AbstractProductMeasure #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fb2554
reparameterize
cscherrer Oct 25, 2022
d38ba97
avoid empty summations
cscherrer Oct 25, 2022
e41eff4
change some Productmeasure methods to AbstractProductMeasure
cscherrer Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions src/combinators/power.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@ using FillArrays: Fill

export PowerMeasure

struct PowerMeasure{M,A} <: AbstractProductMeasure
struct PowerMeasure{M,N,A} <: AbstractProductMeasure{Fill{M,N,A}}
parent::M
axes::A

function PowerMeasure(parent::M, axes::A) where {M,A}
N = length(axes)
new{M,N,A}(parent, axes)
end
end

function Pretty.tile(μ::PowerMeasure)
Expand Down Expand Up @@ -42,8 +47,7 @@ end

@inline function powermeasure(x::T, sz::Tuple{Vararg{<:Any,N}}) where {T,N}
a = axes(Fill{T,N}(x, sz))
A = typeof(a)
PowerMeasure{T,A}(x, a)
PowerMeasure(x, a)
end

marginals(d::PowerMeasure) = Fill(d.parent, d.axes)
Expand Down Expand Up @@ -76,7 +80,14 @@ end
end

@inline function logdensity_def(
d::PowerMeasure{M,Tuple{Base.OneTo{StaticInt{N}}}},
d::PowerMeasure{M,1,Tuple{Base.OneTo{StaticInt{0}}}},
x,
) where {M}
static(0.0)
end

@inline function logdensity_def(
d::PowerMeasure{M,1,Tuple{Base.OneTo{StaticInt{N}}}},
x,
) where {M,N}
parent = d.parent
Expand All @@ -86,7 +97,7 @@ end
end

@inline function logdensity_def(
d::PowerMeasure{M,NTuple{N,Base.OneTo{StaticInt{0}}}},
d::PowerMeasure{M,N,NTuple{N,Base.OneTo{StaticInt{0}}}},
x,
) where {M,N}
static(0.0)
Expand All @@ -108,7 +119,8 @@ end
end
end

@inline getdof(μ::PowerMeasure) = getdof(μ.parent) * prod(map(length, μ.axes))
# `prod` isn't static-friendly
@inline getdof(μ::PowerMeasure) = getdof(μ.parent) * (*(map(length, μ.axes)...))

@inline function getdof(::PowerMeasure{<:Any,NTuple{N,Base.OneTo{StaticInt{0}}}}) where {N}
static(0)
Expand Down
4 changes: 2 additions & 2 deletions src/combinators/product.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ using FillArrays

export AbstractProductMeasure

abstract type AbstractProductMeasure <: AbstractMeasure end
abstract type AbstractProductMeasure{M} <: AbstractMeasure end

function Pretty.tile(μ::AbstractProductMeasure)
result = Pretty.literal("ProductMeasure(")
Expand Down Expand Up @@ -76,7 +76,7 @@ end
mapreduce(logdensity_def, +, marginals(d), x)
end

struct ProductMeasure{M} <: AbstractProductMeasure
struct ProductMeasure{M} <: AbstractProductMeasure{M}
marginals::M
end

Expand Down
16 changes: 8 additions & 8 deletions src/standard/stdmeasure.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ function transport_def(ν::PowerMeasure{<:StdMeasure}, μ::StdMeasure, x)
end

function transport_def(
ν::PowerMeasure{<:StdMeasure,<:NTuple{1,Base.OneTo}},
μ::PowerMeasure{<:StdMeasure,<:NTuple{1,Base.OneTo}},
ν::PowerMeasure{<:StdMeasure,1,<:NTuple{1,Base.OneTo}},
μ::PowerMeasure{<:StdMeasure,1,<:NTuple{1,Base.OneTo}},
x,
)
return transport_to(ν.parent, μ.parent).(x)
end

function transport_def(
ν::PowerMeasure{<:StdMeasure,<:NTuple{N,Base.OneTo}},
μ::PowerMeasure{<:StdMeasure,<:NTuple{M,Base.OneTo}},
ν::PowerMeasure{<:StdMeasure,N,<:NTuple{N,Base.OneTo}},
μ::PowerMeasure{<:StdMeasure,M,<:NTuple{M,Base.OneTo}},
x,
) where {N,M}
return reshape(transport_to(ν.parent, μ.parent).(x), map(length, ν.axes)...)
Expand Down Expand Up @@ -72,15 +72,15 @@ end

function transport_def(
ν::PowerMeasure{NU},
μ::ProductMeasure{<:Tuple},
μ::AbstractProductMeasure{<:Tuple},
x,
) where {NU<:StdMeasure}
_tuple_transport_def(ν, marginals(μ), x)
end

function transport_def(
ν::PowerMeasure{NU},
μ::ProductMeasure{<:NamedTuple{names}},
μ::AbstractProductMeasure{<:NamedTuple{names}},
x,
) where {NU<:StdMeasure,names}
_tuple_transport_def(ν, values(marginals(μ)), values(x))
Expand All @@ -107,15 +107,15 @@ function _tuple_transport_def(
end

function transport_def(
ν::ProductMeasure{<:Tuple},
ν::AbstractProductMeasure{<:Tuple},
μ::PowerMeasure{MU},
x,
) where {MU<:StdMeasure}
_tuple_transport_def(marginals(ν), μ, x)
end

function transport_def(
ν::ProductMeasure{<:NamedTuple{names}},
ν::AbstractProductMeasure{<:NamedTuple{names}},
μ::PowerMeasure{MU},
x,
) where {MU<:StdMeasure,names}
Expand Down