Skip to content

Commit

Permalink
Revert "Change show for SurveyDesign"
Browse files Browse the repository at this point in the history
This reverts commit ae0cb2a.
  • Loading branch information
iuliadmtru committed Jan 11, 2023
1 parent aaeebb1 commit 15e34ec
Showing 1 changed file with 16 additions and 33 deletions.
49 changes: 16 additions & 33 deletions src/show.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,16 @@ function makeshort(x)
x = round.(x, sigdigits=3)
end
# print short vectors or single values as they are, compress otherwise
if length(x) > 1
return "[" * (length(x) < 3 ? join(x, ", ") : join(x[1:3], ", ") * "" * string(last(x))) * "]"
end

return x
x = length(x) < 3 ? join(x, ", ") : join(x[1:3], ", ") * ", ..., " * string(last(x))
end

"""
Print information in the form:
**name:** content[\n]
"""
function printinfo(io::IO, name::String, content, args...; newline::Bool=true)
function printinfo(io::IO, name::String, content::String; newline::Bool=true)
printstyled(io, name, ": "; bold=true)
newline ? println(io, content, args...) : print(io, content, args...)
newline ? println(io, content) : print(io, content)
end

"Print information about a survey design."
Expand All @@ -37,37 +33,24 @@ function Base.show(io::IO, ::MIME"text/plain", design::AbstractSurveyDesign)
printinfo(io, "ignorefpc", string(design.ignorefpc); newline=false)
end

"Print information about a survey design."
Base.show(io::IO, ::MIME"text/plain", design::SurveyDesign) =
surveyshow(IOContext(io, :compact=>true, :limit=>true, :displaysize=>(50, 50)), design)

function surveyshow(io::IO, design::SurveyDesign)
# structure name
"Print information about a survey design."
function Base.show(io::IO, ::MIME"text/plain", design::SurveyDesign)
type = typeof(design)
printstyled(io, "$type:\n"; bold=true)
# data info
printinfo(io, "data", summary(design.data))
# strata info
strata_content =
design.strata == :false_strata ?
"none" :
(string(design.strata), "\n ", makeshort(design.data[!, design.strata]))
printinfo(io, "strata", strata_content...)
# cluster(s) info
cluster_content =
design.cluster == :false_cluster ?
"none" :
(string(design.cluster), "\n ", makeshort(design.data[!, design.cluster]))
printinfo(io, "cluster", cluster_content...)
# popsize and sampsize info
printinfo(io, "popsize", "\n ", makeshort(design.data[!, design.popsize]))
printinfo(io, "sampsize", "\n ", makeshort(design.data[!, design.sampsize]))
# weights and probs info
printinfo(io, "weights", "\n ", makeshort(design.data[!, :weights]))
printinfo(io, "probs", "\n ", makeshort(design.data[!, :probs]); newline=false)
printstyled(io, "data: "; bold=true)
println(io, size(design.data, 1), "x", size(design.data, 2), " DataFrame")
printinfo(io, "cluster", string(design.cluster); newline=true)
printinfo(io, "design.data[!,design.cluster]", makeshort(design.data[!,design.cluster]))
printinfo(io, "popsize", string(design.popsize); newline=true)
printinfo(io, "design.data[!,design.popsize]", makeshort(design.data[!,design.popsize]))
printinfo(io, "sampsize", string(design.sampsize); newline=true)
printinfo(io, "design.data[!,design.sampsize]", makeshort(design.data[!,design.sampsize]))
printinfo(io, "design.data[!,:probs]", makeshort(design.data.probs))
printinfo(io, "design.data[!,:allprobs]", makeshort(design.data.allprobs))
end

"Print information about a replicate design."
"Print information about a repliocate design."
function Base.show(io::IO, ::MIME"text/plain", design::ReplicateDesign)
type = typeof(design)
printstyled(io, "$type:\n"; bold=true)
Expand Down

0 comments on commit 15e34ec

Please sign in to comment.