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

Added Histogram1D and Histogram2D structures; Implemented histogram preview

Browse Source
This commit is contained in:
Giorgio Calderone 2020-03-25 14:47:54 +01:00
parent d685f1a1f2
commit 559bcc4054
1 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Gnuplot.jl
View File

@ -147,6 +147,10 @@ function data2string(args...)
(typeof(d[1]) <: String) && (ok = true) (typeof(d[1]) <: String) && (ok = true)
(typeof(d[1]) <: Number) && (ok = true) (typeof(d[1]) <: Number) && (ok = true)
(typeof(d[1]) <: ColorTypes.RGB) && (ok = true) (typeof(d[1]) <: ColorTypes.RGB) && (ok = true)
elseif typeof(d) <: Histogram1D
ok = true
elseif typeof(d) <: Histogram2D
ok = true
end end
@assert ok "Invalid argument type at position $iarg" @assert ok "Invalid argument type at position $iarg"
end end
@ -715,6 +719,19 @@ function driver(args...; flag3d=false)
push!(dataset, d) push!(dataset, d)
end end
dataset_completed() dataset_completed()
elseif isa(arg, Histogram1D)
newcmd(gp, "set grid")
push!(dataset, arg.bins)
push!(dataset, arg.counts)
plotspec = "w histep notit lw 2 lc rgb 'black'"
dataset_completed()
elseif isa(arg, Histogram2D)
newcmd(gp, "set autoscale fix")
push!(dataset, arg.bins1)
push!(dataset, arg.bins2)
push!(dataset, arg.counts)
plotspec = "w image notit"
dataset_completed()
else else
# A dataset # A dataset
#@info "Dataset element" iarg typeof(arg) arg #@info "Dataset element" iarg typeof(arg) arg
@ -972,7 +989,7 @@ function exec(gp::GPSession, command::String)
for line in errmsg for line in errmsg
printstyled(color=:red, "GNUPLOT ERROR $(gp.sid) -> $line\n") printstyled(color=:red, "GNUPLOT ERROR $(gp.sid) -> $line\n")
end end
error("Gnuplot process raised an error") error("Gnuplot process raised an error: $errmsg")
end end
return join(answer, "\n") return join(answer, "\n")
@ -1076,8 +1093,25 @@ end
Example: Example:
v = randn(1000) v = randn(1000)
h = hist(v, bs=0.5) h = hist(v, bs=0.5)
@gp h # preview
@gp h.bins h.counts "w histep" h.bins h.counts "w l" @gp h.bins h.counts "w histep" h.bins h.counts "w l"
=# =#
mutable struct Histogram1D
bins::Vector{Float64}
counts::Vector{Float64}
binsize::Float64
end
mutable struct Histogram2D
bins1::Vector{Float64}
bins2::Vector{Float64}
counts::Matrix{Float64}
binsize1::Float64
binsize2::Float64
end
function hist(v::Vector{T}; range=[NaN,NaN], bs=NaN, nbins=0, pad=true) where T <: Number function hist(v::Vector{T}; range=[NaN,NaN], bs=NaN, nbins=0, pad=true) where T <: Number
i = findall(isfinite.(v)) i = findall(isfinite.(v))
isnan(range[1]) && (range[1] = minimum(v[i])) isnan(range[1]) && (range[1] = minimum(v[i]))
@ -1107,7 +1141,7 @@ function hist(v::Vector{T}; range=[NaN,NaN], bs=NaN, nbins=0, pad=true) where T
x = [x[1]-binsize, x..., x[end]+binsize] x = [x[1]-binsize, x..., x[end]+binsize]
h = [0, h..., 0] h = [0, h..., 0]
end end
return (bins=x, counts=h, bs=binsize) return Histogram1D(x, h, binsize)
end end
@ -1138,7 +1172,7 @@ function hist(v1::Vector{T1}, v2::Vector{T2};
binsize1 = x1[2] - x1[1] binsize1 = x1[2] - x1[1]
binsize2 = x2[2] - x2[1] binsize2 = x2[2] - x2[1]
return (bins1=x1, bins2=x2, counts=hh.weights, bs1=binsize1, bs2=binsize2) return Histogram2D(x1, x2, hh.weights, binsize1, binsize2)
end end