Skip to content

Add shorter non-display printing of VarInfo #66

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

Merged
merged 4 commits into from
Apr 14, 2020
Merged

Add shorter non-display printing of VarInfo #66

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f29732
Add shorter non-display printing
phipsgabler Apr 10, 2020
add79c9
More useful information
phipsgabler Apr 13, 2020
683803e
Intelligent short printing of varnames
phipsgabler Apr 14, 2020
6903e3e
Fix pluralization
phipsgabler Apr 14, 2020
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
30 changes: 28 additions & 2 deletions src/varinfo.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ function haskey(vi::TypedVarInfo, vn::VarName)
return getsym(vn) in fieldnames(Tmeta) && haskey(getmetadata(vi, vn).idcs, vn)
end

function show(io::IO, vi::UntypedVarInfo)
function Base.show(io::IO, ::MIME"text/plain", vi::UntypedVarInfo)
vi_str = """
/=======================================================================
| VarInfo
Expand All @@ -942,7 +942,33 @@ function show(io::IO, vi::UntypedVarInfo)
print(io, vi_str)
end

# Add a new entry to VarInfo

const _MAX_VARS_SHOWN = 4

function _show_varnames(io::IO, vi)
md = vi.metadata
vns = md.vns

groups = Dict{Symbol, Vector{VarName}}()
for vn in vns
group = get!(() -> Vector{VarName}(), groups, getsym(vn))
push!(group, vn)
end

print(io, length(groups), length(groups) == 1 ? " variable " : " variables ", "(")
join(io, Iterators.take(keys(groups), _MAX_VARS_SHOWN), ", ")
length(groups) > _MAX_VARS_SHOWN && print(io, ", ...")
print(io, "), dimension ", sum(prod(size(md.vals[md.ranges[md.idcs[vn]]])) for vn in vns))
end

function Base.show(io::IO, vi::UntypedVarInfo)
print(io, "VarInfo (")
_show_varnames(io, vi)
print(io, "; logp: ", round(getlogp(vi), digits=3))
print(io, ")")
end


"""
push!(vi::VarInfo, vn::VarName, r, dist::Distribution)

Expand Down