Skip to content
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

Fix inference failures #1722

Merged
merged 3 commits into from
May 17, 2023
Merged

Fix inference failures #1722

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
85c86e4
Fix test failures
devmotion May 17, 2023
f0cdcef
Add tests
devmotion May 17, 2023
7b32924
Bump version
devmotion May 17, 2023
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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Distributions"
uuid = "31c24e10-a181-5473-b8eb-7969acd0382f"
authors = ["JuliaStats"]
version = "0.25.92"
version = "0.25.93"

[deps]
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
Expand Down
14 changes: 7 additions & 7 deletions src/truncated/normal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ TruncatedNormal

### statistics

function mode(d::Truncated{<:Normal{<:Real},Continuous})
function mode(d::Truncated{<:Normal{<:Real},Continuous,T}) where {T<:Real}
μ = mean(d.untruncated)
return clamp(μ, extrema(d)...)
return T(clamp(μ, extrema(d)...))
end

modes(d::Truncated{<:Normal{<:Real},Continuous}) = [mode(d)]
Expand Down Expand Up @@ -89,7 +89,7 @@ function _tnvar(a::Real, b::Real)
end
end

function mean(d::Truncated{<:Normal{<:Real},Continuous})
function mean(d::Truncated{<:Normal{<:Real},Continuous,T}) where {T<:Real}
d0 = d.untruncated
μ = mean(d0)
σ = std(d0)
Expand All @@ -99,21 +99,21 @@ function mean(d::Truncated{<:Normal{<:Real},Continuous})
lower, upper = extrema(d)
a = (lower - μ) / σ
b = (upper - μ) / σ
return μ + _tnmom1(a, b) * σ
return T(μ + _tnmom1(a, b) * σ)
end
end

function var(d::Truncated{<:Normal{<:Real},Continuous})
function var(d::Truncated{<:Normal{<:Real},Continuous,T}) where {T<:Real}
d0 = d.untruncated
μ = mean(d0)
σ = std(d0)
if iszero(σ)
return σ
return T(σ)
else
lower, upper = extrema(d)
a = (lower - μ) / σ
b = (upper - μ) / σ
return _tnvar(a, b) * σ^2
return T(_tnvar(a, b) * σ^2)
end
end

Expand Down
2 changes: 2 additions & 0 deletions test/truncated/normal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ rng = MersenneTwister(123)
# Type stability
for T in (Float32, Float64)
t = truncated(Normal(T(1.5), T(4.1)), 0, 1)
m = @inferred mode(t)
μ = @inferred mean(t)
σ = @inferred std(t)
@test m === T(1)
@test μ ≈ 0.50494725270783081889610661619986770485973643194141
@test μ isa T
@test σ ≈ 0.28836356398830993140576947440881738258157196701554
Expand Down