Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/multivariate/mvlogitnormal.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ MvLogitNormal(d::AbstractMvNormal) = MvLogitNormal{typeof(d)}(d)
MvLogitNormal(args...) = MvLogitNormal(MvNormal(args...))

function Base.show(io::IO, d::MvLogitNormal; indent::String=" ")
print(io, distrname(d))
print_distrname(io, d)
println(io, "(")
normstr = strip(sprint(show, d.normal; context=IOContext(io)))
normstr = replace(normstr, "\n" => "\n$indent")
Expand Down
12 changes: 6 additions & 6 deletions src/multivariate/mvnormal.jl
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,13 @@ end

### Show

distrname(d::IsoNormal) = "IsoNormal" # Note: IsoNormal, etc are just alias names.
distrname(d::DiagNormal) = "DiagNormal"
distrname(d::FullNormal) = "FullNormal"
print_distrname(io::IO, ::IsoNormal) = print(io, "IsoNormal") # Note: IsoNormal, etc are just alias names.
print_distrname(io::IO, ::DiagNormal) = print(io, "DiagNormal")
print_distrname(io::IO, ::FullNormal) = print(io, "FullNormal")

distrname(d::ZeroMeanIsoNormal) = "ZeroMeanIsoNormal"
distrname(d::ZeroMeanDiagNormal) = "ZeroMeanDiagNormal"
distrname(d::ZeroMeanFullNormal) = "ZeroMeanFullNormal"
print_distrname(io::IO, ::ZeroMeanIsoNormal) = print(io, "ZeroMeanIsoNormal")
print_distrname(io::IO, ::ZeroMeanDiagNormal) = print(io, "ZeroMeanDiagNormal")
print_distrname(io::IO, ::ZeroMeanFullNormal) = print(io, "ZeroMeanFullNormal")

Base.show(io::IO, d::MvNormal) =
show_multline(io, d, [(:dim, length(d)), (:μ, mean(d)), (:Σ, cov(d))])
Expand Down
12 changes: 6 additions & 6 deletions src/multivariate/mvnormalcanon.jl
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ Base.@deprecate MvNormalCanon(d::Int, prec::Real) MvNormalCanon(LinearAlgebra.Di

### Show

distrname(d::IsoNormalCanon) = "IsoNormalCanon"
distrname(d::DiagNormalCanon) = "DiagNormalCanon"
distrname(d::FullNormalCanon) = "FullNormalCanon"
print_distrname(io::IO, ::IsoNormalCanon) = print(io, "IsoNormalCanon")
print_distrname(io::IO, ::DiagNormalCanon) = print(io, "DiagNormalCanon")
print_distrname(io::IO, ::FullNormalCanon) = print(io, "FullNormalCanon")

distrname(d::ZeroMeanIsoNormalCanon) = "ZeroMeanIsoNormalCanon"
distrname(d::ZeroMeanDiagNormalCanon) = "ZeroMeanDiagormalCanon"
distrname(d::ZeroMeanFullNormalCanon) = "ZeroMeanFullNormalCanon"
print_distrname(io::IO, ::ZeroMeanIsoNormalCanon) = print(io, "ZeroMeanIsoNormalCanon")
print_distrname(io::IO, ::ZeroMeanDiagNormalCanon) = print(io, "ZeroMeanDiagormalCanon")
print_distrname(io::IO, ::ZeroMeanFullNormalCanon) = print(io, "ZeroMeanFullNormalCanon")

### Conversion
function convert(::Type{MvNormalCanon{T}}, d::MvNormalCanon) where {T<:Real}
Expand Down
4 changes: 2 additions & 2 deletions src/namedtuple/productnamedtuple.jl
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ function Base.show(io::IO, d::ProductNamedTupleDistribution)
return show_multline(io, d, collect(pairs(d.dists)))
end

function distrname(::ProductNamedTupleDistribution{K}) where {K}
return "ProductNamedTupleDistribution{$K}"
function print_distrname(io::IO, ::ProductNamedTupleDistribution{K}) where {K}
return print(io, "ProductNamedTupleDistribution{", K, "}")
end

"""
Expand Down
6 changes: 3 additions & 3 deletions src/show.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# this function to provide a name that is easier to read,
# especially when the type is parametric.
#
distrname(d::Distribution) = string(typeof(d))
print_distrname(io::IO, d::Distribution) = print(io, typeof(d))

show(io::IO, d::Distribution) = show(io, d, fieldnames(typeof(d)))

Expand Down Expand Up @@ -52,7 +52,7 @@ function _use_multline_show(d::Distribution)
end

function show_oneline(io::IO, d::Distribution, namevals)
print(io, distrname(d))
print_distrname(io, d)
np = length(namevals)
print(io, '(')
for (i, nv) in enumerate(namevals)
Expand All @@ -68,7 +68,7 @@ function show_oneline(io::IO, d::Distribution, namevals)
end

function show_multline(io::IO, d::Distribution, namevals; newline=true)
print(io, distrname(d))
print_distrname(io, d)
println(io, "(")
for (p, pv) in namevals
print(io, p)
Expand Down
Loading