Skip to content

Commit 1bb0f93

Browse files
Fix error in tests and add a test for violinplot
1 parent cf89757 commit 1bb0f93

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

src/plot.jl

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const supportedplots = push!(collect(keys(translationdict)), :mixeddensity, :cor
3434
barbounds = (-Inf, Inf),
3535
maxlag = nothing,
3636
append_chains = false,
37-
sections = chains.name_map[:parameters],
37+
par_sections = chains.name_map[:parameters],
3838
combined = true
3939
)
4040
st = get(plotattributes, :seriestype, :traceplot)
@@ -69,28 +69,22 @@ const supportedplots = push!(collect(keys(translationdict)), :mixeddensity, :cor
6969
ac_mat = convert(Array, ac)
7070
val = colordim == :parameter ? ac_mat[:, :, i]' : ac_mat[i, :, :]
7171
_AutocorPlot(lags, val)
72-
elseif st supportedplots
73-
translationdict[st](c, val)
74-
else
75-
range(c), val
76-
end
7772

78-
total_chains = i
79-
if st == :violinplot
73+
elseif st == :violinplot
8074
n_iter, n_par, n_chains = size(chains)
8175
if combined
8276
colordim := :chain
83-
par = string.(reshape(repeat(sections, inner = n_iter), n_iter, n_par))[:,i]
77+
par = string.(reshape(repeat(par_sections, inner = n_iter), n_iter, n_par))[:,i]
8478
val = Array(chains)[:,i]
8579
_ViolinPlot(par, val)
8680
elseif combined == false
8781
if colordim == :chain
88-
par_names = ["$(sections[i]).Chain $j" for i in 1:n_par, j in 1:n_chains]
82+
par_names = ["$(par_sections[i]).Chain $j" for i in 1:n_par, j in 1:n_chains]
8983
pars = string.(reshape(repeat(vec(par_names), inner = n_iter), (n_iter, n_par, n_chains)))
9084
val = chains.value[:,i,:]
9185
par = pars[:,i,:]
9286
elseif colordim == :parameter
93-
par_vec = repeat(sections, inner = n_iter)
87+
par_vec = repeat(par_sections, inner = n_iter)
9488
pars = string.(reshape(repeat(par_vec, n_chains, 1), (n_iter, n_par, n_chains)))
9589
val = chains.value[:,:,i]
9690
par = pars[:,:,i]

test/plot_test.jl

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,37 +24,40 @@ Logging.disable_logging(Logging.Warn)
2424
println("traceplot")
2525
display(traceplot(chn, 1))
2626
println()
27-
27+
2828
println("meanplot")
2929
display(meanplot(chn, 1))
3030
println()
31-
31+
3232
println("density")
3333
display(density(chn, 1))
3434
display(density(chn, 1, append_chains=true))
3535
println()
36-
36+
3737
println("autocorplot")
3838
display(autocorplot(chn, 1))
3939
println()
40-
40+
4141
#ps_contour = plot(chn, :contour)
4242

4343
println("histogram")
4444
display(histogram(chn, 1))
4545
println()
46-
46+
4747
println("\nmixeddensity")
4848
display(mixeddensity(chn, 1))
49-
49+
50+
println("violinplot")
51+
display(violinplot(chn))
52+
println()
5053
# plotting combinations
5154
display(plot(chn))
5255
display(plot(chn, append_chains=true))
5356
display(plot(chn, seriestype = (:mixeddensity, :autocorplot)))
5457

5558
# Test plotting using colordim keyword
5659
display(plot(chn, colordim = :parameter))
57-
60+
5861
# Test if plotting a sub-set work.s
5962
display(plot(chn, 2))
6063
display(plot(chn, 2, colordim = :parameter))

0 commit comments

Comments
 (0)