Commit 6f5317b6 authored by Victor's avatar Victor
Browse files

Some changes in plot recipes to accommodate changes in get_x

parent 9a0dcc5f
...@@ -35,11 +35,11 @@ It should correspond to an integer, as it indexes the column to plot ...@@ -35,11 +35,11 @@ It should correspond to an integer, as it indexes the column to plot
if "x" in what if "x" in what
d_i = [] d_i = []
for i in 1:size(world,2) for i in 1:size(world,2)
x = get_x.(clean_world(world[:,i]),tend,trait) x = get_x(clean_world(world[:,i]),p["tspan"][i],trait)[:]
append!(d_i,pdf(kde(x),x)) append!(d_i,pdf(kde(x),x))
end end
@series begin @series begin
xarray = get_xarray(world_sm,tend,trait) xarray = get_x.(world_sm,tspan_ar[:],trait)
seriestype := :scatter seriestype := :scatter
markercolor := eth_grad_small[d_i ./ maximum(d_i)] markercolor := eth_grad_small[d_i ./ maximum(d_i)]
# markercolor := :blue # markercolor := :blue
...@@ -103,7 +103,7 @@ It should correspond to an integer, as it indexes the column to plot ...@@ -103,7 +103,7 @@ It should correspond to an integer, as it indexes the column to plot
end end
if "3d" in what if "3d" in what
@series begin @series begin
xarray = get_xarray(world_sm,1) xarray = get_x(world_sm,1)
yarray = get_x(world_sm,2) yarray = get_x(world_sm,2)
seriestype := :scatter3d seriestype := :scatter3d
markercolor := "blue" markercolor := "blue"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment