mantao/Gnuplot.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #49 from wentasah/hist-bounds

Browse Source 
Fix BoundsErrors in hist()
This commit is contained in:
gcalderone 2022-01-03 12:40:40 +01:00 committed by GitHub
commit 443ef0edf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Gnuplot.jl
View File

@ -1846,16 +1846,20 @@ function hist(v::Vector{T}; range=[NaN,NaN], bs=NaN, nbins=0, pad=true) where T
if sum(hh.weights) < length(i) if sum(hh.weights) < length(i)
j = findall(v[i] .== range[2]) j = findall(v[i] .== range[2])
@assert length(j) == (length(i) - sum(hh.weights)) @assert length(j) == (length(i) - sum(hh.weights))
hh.weights[end] += length(j) if length(hh.weights) > 0
hh.weights[end] += length(j)
else
push!(hh.weights, length(j))
end
end end
else else
hh = fit(Histogram, v[i], closed=:left) hh = fit(Histogram, v[i], closed=:left)
end end
@assert sum(hh.weights) == length(i) @assert sum(hh.weights) == length(i)
x = collect(hh.edges[1]) x = collect(hh.edges[1])
x = (x[1:end-1] .+ x[2:end]) ./ 2 binsize = isfinite(bs) ? bs : x[2] - x[1]
length(x) > 1 && (x = (x[1:end-1] .+ x[2:end]) ./ 2)
h = hh.weights h = hh.weights
binsize = x[2] - x[1]
if pad if pad
x = [x[1]-binsize, x..., x[end]+binsize] x = [x[1]-binsize, x..., x[end]+binsize]
h = [0, h..., 0] h = [0, h..., 0]

4
test/runtests.jl
View File

@ -286,4 +286,8 @@ Gnuplot.quit(:default)
Gnuplot.options.dry = true Gnuplot.options.dry = true
@gp hist(randn(1000)) @gp hist(randn(1000))
# Various hist() corner cases
@gp hist([1,2,3], bs=2)
@gp hist([1,1,1], bs=1)
Gnuplot.quitall() Gnuplot.quitall()