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

Accept AbstractArrays which can be converted to actual arrays

Browse Source
This commit is contained in:
Giorgio Calderone 2021-01-02 00:15:39 +01:00
parent b7a15290d3
commit bc74aa0db4
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Gnuplot.jl
View File

@ -1114,6 +1114,9 @@ function parseArguments(_args...)
elseif isa(arg, AbstractArray) && # ==> a dataset column elseif isa(arg, AbstractArray) && # ==> a dataset column
((valtype(arg) <: Real) || ((valtype(arg) <: Real) ||
(valtype(arg) <: AbstractString)) ; (valtype(arg) <: AbstractString)) ;
elseif isa(arg, AbstractArray) && # ==> a dataset column (to be `convert`ed)
((typeof(arg[1]) <: Real) ||
(typeof(arg[1]) <: AbstractString))
elseif isa(arg, Real) # ==> a dataset column with only one row elseif isa(arg, Real) # ==> a dataset column with only one row
args[pos] = [arg] args[pos] = [arg]
elseif isa(arg, Dataset) ; # ==> a Dataset object elseif isa(arg, Dataset) ; # ==> a Dataset object
@ -1139,6 +1142,21 @@ function parseArguments(_args...)
pos = 1 pos = 1
while pos <= length(args) while pos <= length(args)
arg = args[pos] arg = args[pos]
if isa(arg, AbstractArray) &&
!(valtype(arg) <: Real) &&
!(valtype(arg) <: AbstractString)
# Try with `convert`
if typeof(arg[1]) <: Integer
arg = convert(Array{Int}, arg)
elseif typeof(arg[1]) <: Real
arg = convert(Array{Float64}, arg)
elseif typeof(arg[1]) <: AbstractString
arg = convert(Array{String}, arg)
end
end
if isa(arg, AbstractArray) && # ==> beginning of a dataset if isa(arg, AbstractArray) && # ==> beginning of a dataset
((valtype(arg) <: Real) || ((valtype(arg) <: Real) ||
(valtype(arg) <: AbstractString)) (valtype(arg) <: AbstractString))