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

add kw support

Browse Source
This commit is contained in:
Pietro Vertechi 2017-09-04 11:49:18 +01:00
parent 0f28b59c5f
commit dee24e6f08
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/series.jl
View File

@ -516,8 +516,9 @@ splittable_kw(key, val::Tuple, lengthGroup) = all(splittable_kw.(key, val, lengt
split_kw(key, val::AbstractArray, indices) = val[indices, fill(Colon(), ndims(val)-1)...] split_kw(key, val::AbstractArray, indices) = val[indices, fill(Colon(), ndims(val)-1)...]
split_kw(key, val::Tuple, indices) = Tuple(split_kw(key, v, indices) for v in val) split_kw(key, val::Tuple, indices) = Tuple(split_kw(key, v, indices) for v in val)
function build_arg_mat(x_ind, x, y, groupby) function groupedvec2mat(x_ind, x, y::AbstractArray, groupby, def_val = y[1])
y_mat = fill(NaN, length(keys(x_ind)), length(groupby.groupLabels)) y_mat = Array{promote_type(eltype(y), typeof(def_val))}(length(keys(x_ind)), length(groupby.groupLabels))
fill!(y_mat, def_val)
for i in 1:length(groupby.groupLabels) for i in 1:length(groupby.groupLabels)
xi = x[groupby.groupIds[i]] xi = x[groupby.groupIds[i]]
yi = y[groupby.groupIds[i]] yi = y[groupby.groupIds[i]]
@ -526,6 +527,8 @@ function build_arg_mat(x_ind, x, y, groupby)
return y_mat return y_mat
end end
groupedvec2mat(x_ind, x, y::Tuple, groupby) = Tuple(groupedvec2mat(x_ind, x, v, groupby) for v in y)
group_as_matrix(t) = false group_as_matrix(t) = false
# split the group into 1 series per group, and set the label and idxfilter for each # split the group into 1 series per group, and set the label and idxfilter for each
@ -558,7 +561,12 @@ group_as_matrix(t) = false
end end
x_u = unique(x) x_u = unique(x)
x_ind = Dict(zip(x_u, 1:length(x_u))) x_ind = Dict(zip(x_u, 1:length(x_u)))
for (key,val) in d
if splittable_kw(key, val, lengthGroup)
:($key) := groupedvec2mat(x_ind, x, val, groupby)
end
end
label --> reshape(groupby.groupLabels, 1, :) label --> reshape(groupby.groupLabels, 1, :)
typeof(g)((x_u, (build_arg_mat(x_ind, x, arg, groupby) for arg in last_args)...)) typeof(g)((x_u, (groupedvec2mat(x_ind, x, arg, groupby, NaN) for arg in last_args)...))
end end
end end