Skip to content

Commit

Permalink
Added corner histogram of x-y difference stat_cornerhist()
Browse files Browse the repository at this point in the history 
Improved speed on large datasets with many non-unique x values
  • Loading branch information
@piermorel
piermorel committed Jul 5, 2016
1 parent 65b8ed8 commit 1328702
Show file tree
Hide file tree
Showing 39 changed files with 449 additions and 406 deletions.
8 changes: 8 additions & 0 deletions @gramm/private/dodge_comp.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
%Here we need to implement a loose 'unique' because of
%potential numerical errors
uni_x(diff(uni_x)<1e-10)=[];

%Fallback if there are too many unique x values (dodging only makes
%sense for discrete x values)... 4000 x unique values is already a lot
%but quick enough to compute below
if numel(uni_x)>4000
fallback=true;
uni_x=1;
end
end

N=length(uni_x)*length(uni_color)*length(uni_lightness);
Expand Down
191 changes: 191 additions & 0 deletions @gramm/private/my_histplot.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
function [results] = my_histplot(obj,draw_data,params,setylim)

%Presets for dodge parameter
if isempty(params.dodge)
if strcmp(params.geom,'bar') && draw_data.n_colors>1 %With 'bar' do we dodge by default if there are several colors
params.dodge=0.8;
else
params.dodge=0; %With all others we put don't dodge
end
end

%Presets for width parameter
if isempty(params.width)
if params.dodge>0
params.width=params.dodge; %If there is a dodge we modify the width accordingly
else
params.width=1; %Otherwise we use the full with (histogram).
end
end


%Set up default fill options for the different geoms
if isempty(params.fill)
switch params.geom
case 'bar'
params.fill='face';
case 'line'
params.fill='edge';
case 'overlaid_bar'
params.fill='transparent';
case 'stacked_bar'
params.fill='face';
case 'stairs'
params.fill='edge';
case 'point'
params.fill='edge';
end
end

%Compute bins
if obj.x_factor %For categorical Xs (placed at integer values), we override and make the bins 0.5 1.5 2.5 ...
binranges=(0:length(obj.x_ticks))+0.5;
bincenters=1:length(obj.x_ticks);
else
if obj.polar.is_polar %For polar coordinates we make bin around 0:2pi
%Make data modulo 2pi
draw_data.x=mod(comb(draw_data.x),2*pi);
if isempty(params.edges)
binranges=linspace(0,2*pi,params.nbins+1);
else
if max(params.edges)>2*pi || min(params.edges)<0
warning('Bin edges exceed the polar ranges (O-2pi)')
end
binranges=params.edges;
end
else
if isempty(params.edges)
binranges=linspace(obj.var_lim.minx,obj.var_lim.maxx,params.nbins+1);
else
binranges=params.edges;
end
end
bincenters=(binranges(1:(end-1))+binranges(2:end))/2;
end





%Find actual counts
if iscell(draw_data.x) %If data was provided as Cell/Matrix
%We do the count individually for each element and average
%the counts
bincounts=zeros(1,length(binranges)-1);
for k=1:length(draw_data.x)
bincounts=bincounts+my_histcounts(draw_data.x{k},binranges,params.normalization);
end
bincounts=bincounts/length(draw_data.x);
else
%If data was provided as vector we just count
bincounts = my_histcounts(comb(draw_data.x),binranges,params.normalization);
end

bincounts=shiftdim(bincounts);

results.edges=binranges;
results.centers=bincenters;
results.counts=bincounts;


if setylim
%Set axis limits
obj.plot_lim.miny(obj.current_row,obj.current_column)=0;
if obj.firstrun(obj.current_row,obj.current_column)
obj.plot_lim.maxy(obj.current_row,obj.current_column)=max(bincounts);

if ~isempty(params.edges) %If edges are specified we use those for x scale
obj.plot_lim.minx(obj.current_row,obj.current_column)=binranges(1)-nanmean(diff(binranges));
obj.plot_lim.maxx(obj.current_row,obj.current_column)=binranges(end)+nanmean(diff(binranges));
end

%obj.firstrun(obj.current_row,obj.current_column)=0;
obj.aes_names.y=params.normalization;
%Initialize stacked bar
obj.extra.stacked_bar_height=zeros(size(bincenters));
else
if max(obj.extra.stacked_bar_height+bincounts(1:end)')>obj.plot_lim.maxy(obj.current_row,obj.current_column)
obj.plot_lim.maxy(obj.current_row,obj.current_column)=max(bincounts(1:end)'+obj.extra.stacked_bar_height);
end
if max(bincounts)>obj.plot_lim.maxy(obj.current_row,obj.current_column)
obj.plot_lim.maxy(obj.current_row,obj.current_column)=max(bincounts);
end
end

end


%Set up colors according to fill
[face_color , face_alpha , edge_color , edge_alpha] = parse_fill (params.fill,draw_data.color);



%Set up dodging & width for bars
avl_w=diff(binranges);
dodging=avl_w.*params.dodge./(draw_data.n_colors);
if params.dodge>0
bar_width=avl_w.*params.width./(draw_data.n_colors);
else
bar_width=avl_w.*params.width;
end
bar_mid=bincenters-0.5*dodging*draw_data.n_colors+dodging*0.5+(draw_data.color_index-1)*dodging;
bar_left=bar_mid-0.5*bar_width;
bar_right=bar_mid+0.5*bar_width;


spacing=1-params.width;

%overlaid_bar is just a bar without dodging
if strcmp(params.geom,'overlaid_bar')
params.geom='bar';
end

switch params.geom
case 'bar'
xpatch=[bar_right ; bar_left ; bar_left ; bar_right];
ypatch=[zeros(1,length(bincounts)) ; zeros(1,length(bincounts)) ; bincounts' ; bincounts'];
[xpatch,ypatch]=to_polar(obj,xpatch,ypatch);
results.bar_handle=patch(xpatch,...
ypatch,...
[1 1 1],'FaceColor',face_color,'EdgeColor',edge_color,'FaceAlpha',face_alpha,'EdgeAlpha',edge_alpha);

case 'line'
xtemp=bar_mid;
ytemp=bincounts(1:end)';
[xtemp,ytemp]=to_polar(obj,xtemp,ytemp);
results.line_handle=plot(xtemp,ytemp,'LineStyle',draw_data.line_style,'Color',edge_color,'lineWidth',draw_data.size/4);
xpatch=[bar_mid(1:end-1) ; bar_mid(2:end) ; bar_mid(2:end);bar_mid(1:end-1)];
ypatch=[zeros(1,length(bincounts)-1) ; zeros(1,length(bincounts)-1) ; bincounts(2:end)' ; bincounts(1:end-1)'];
[xpatch,ypatch]=to_polar(obj,xpatch,ypatch);
results.fill_handle=patch(xpatch,ypatch,[1 1 1],'FaceColor',face_color,'EdgeColor','none','FaceAlpha',face_alpha);

case 'stacked_bar'
xpatch=[binranges(1:end-1)+spacing ; binranges(2:end)-spacing ; binranges(2:end)-spacing ; binranges(1:end-1)+spacing];
ypatch=[obj.extra.stacked_bar_height ; obj.extra.stacked_bar_height ; obj.extra.stacked_bar_height+bincounts' ; obj.extra.stacked_bar_height+bincounts'];
[xpatch,ypatch]=to_polar(obj,xpatch,ypatch);
results.bar_handle=patch(xpatch,...
ypatch,...
[1 1 1],'FaceColor',face_color,'EdgeColor',edge_color,'FaceAlpha',face_alpha,'EdgeAlpha',edge_alpha);
obj.extra.stacked_bar_height=obj.extra.stacked_bar_height+bincounts';
case 'stairs'
xtemp=[binranges(1:end-1) ; binranges(2:end)];
ytemp=[bincounts' ; bincounts'];
[xtemp,ytemp]=to_polar(obj,xtemp(:),ytemp(:));
results.line_handle=plot(xtemp,ytemp,'LineStyle',draw_data.line_style,'Color',edge_color,'lineWidth',draw_data.size/4);

xpatch=[binranges(1:end-1) ; binranges(2:end) ; binranges(2:end) ; binranges(1:end-1)];
ypatch=[obj.extra.stacked_bar_height ; obj.extra.stacked_bar_height ; obj.extra.stacked_bar_height+bincounts' ; obj.extra.stacked_bar_height+bincounts'];
[xpatch,ypatch]=to_polar(obj,xpatch,ypatch);

results.fill_handle=patch(xpatch,ypatch,[1 1 1],'FaceColor',face_color,'EdgeColor','none','FaceAlpha',face_alpha);

case 'point'
xtemp=bar_mid;
ytemp=bincounts(1:end)';
[xtemp,ytemp]=to_polar(obj,xtemp,ytemp);
results.point_handle=plot(xtemp,ytemp,draw_data.marker,'MarkerEdgeColor','none','markerSize',draw_data.size,'MarkerFaceColor',draw_data.color);
end


end

180 changes: 1 addition & 179 deletions @gramm/stat_bin.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,184 +31,6 @@

function hndl=my_bin(obj,draw_data,params)

%Presets for dodge parameter
if isempty(params.dodge)
if strcmp(params.geom,'bar') && draw_data.n_colors>1 %With 'bar' do we dodge by default if there are several colors
params.dodge=0.8;
else
params.dodge=0; %With all others we put don't dodge
end
end

%Presets for width parameter
if isempty(params.width)
if params.dodge>0
params.width=params.dodge; %If there is a dodge we modify the width accordingly
else
params.width=1; %Otherwise we use the full with (histogram).
end
end


%Set up default fill options for the different geoms
if isempty(params.fill)
switch params.geom
case 'bar'
params.fill='face';
case 'line'
params.fill='edge';
case 'overlaid_bar'
params.fill='transparent';
case 'stacked_bar'
params.fill='face';
case 'stairs'
params.fill='edge';
case 'point'
params.fill='edge';
end
end


%Compute bins
if obj.x_factor %For categorical Xs (placed at integer values), we override and make the bins 0.5 1.5 2.5 ...
binranges=(0:length(obj.x_ticks))+0.5;
bincenters=1:length(obj.x_ticks);
else
if obj.polar.is_polar %For polar coordinates we make bin around 0:2pi
%Make data modulo 2pi
draw_data.x=mod(comb(draw_data.x),2*pi);
if isempty(params.edges)
binranges=linspace(0,2*pi,params.nbins+1);
else
if max(params.edges)>2*pi || min(params.edges)<0
warning('Bin edges exceed the polar ranges (O-2pi)')
end
binranges=params.edges;
end
else
if isempty(params.edges)
binranges=linspace(obj.var_lim.minx,obj.var_lim.maxx,params.nbins+1);
else
binranges=params.edges;
end
end
bincenters=(binranges(1:(end-1))+binranges(2:end))/2;
end

%Find actual counts
if iscell(draw_data.x) %If data was provided as Cell/Matrix
%We do the count individually for each element and average
%the counts
bincounts=zeros(1,length(binranges)-1);
for k=1:length(draw_data.x)
bincounts=bincounts+my_histcounts(draw_data.x{k},binranges,params.normalization);
end
bincounts=bincounts/length(draw_data.x);
else
%If data was provided as vector we just count
bincounts = my_histcounts(comb(draw_data.x),binranges,params.normalization);
end

bincounts=shiftdim(bincounts);

obj.results.stat_bin{obj.result_ind,1}.edges=bincenters;
obj.results.stat_bin{obj.result_ind,1}.counts=bincounts;

%Set axis limits
obj.plot_lim.miny(obj.current_row,obj.current_column)=0;
if obj.firstrun(obj.current_row,obj.current_column)
obj.plot_lim.maxy(obj.current_row,obj.current_column)=max(bincounts);

if ~isempty(params.edges) %If edges are specified we use those for x scale
obj.plot_lim.minx(obj.current_row,obj.current_column)=binranges(1)-nanmean(diff(binranges));
obj.plot_lim.maxx(obj.current_row,obj.current_column)=binranges(end)+nanmean(diff(binranges));
end

%obj.firstrun(obj.current_row,obj.current_column)=0;
obj.aes_names.y=params.normalization;
%Initialize stacked bar
obj.extra.stacked_bar_height=zeros(size(bincenters));
else
if max(obj.extra.stacked_bar_height+bincounts(1:end)')>obj.plot_lim.maxy(obj.current_row,obj.current_column)
obj.plot_lim.maxy(obj.current_row,obj.current_column)=max(bincounts(1:end)'+obj.extra.stacked_bar_height);
end
if max(bincounts)>obj.plot_lim.maxy(obj.current_row,obj.current_column)
obj.plot_lim.maxy(obj.current_row,obj.current_column)=max(bincounts);
end
end



%Set up colors according to fill
[face_color , face_alpha , edge_color , edge_alpha] = parse_fill (params.fill,draw_data.color);




%Set up dodging & width for bars
avl_w=diff(binranges);
dodging=avl_w.*params.dodge./(draw_data.n_colors);
if params.dodge>0
bar_width=avl_w.*params.width./(draw_data.n_colors);
else
bar_width=avl_w.*params.width;
end
bar_mid=bincenters-0.5*dodging*draw_data.n_colors+dodging*0.5+(draw_data.color_index-1)*dodging;
bar_left=bar_mid-0.5*bar_width;
bar_right=bar_mid+0.5*bar_width;


spacing=1-params.width;

%overlaid_bar is just a bar without dodging
if strcmp(params.geom,'overlaid_bar')
params.geom='bar';
end

switch params.geom
case 'bar'
xpatch=[bar_right ; bar_left ; bar_left ; bar_right];
ypatch=[zeros(1,length(bincounts)) ; zeros(1,length(bincounts)) ; bincounts' ; bincounts'];
[xpatch,ypatch]=to_polar(obj,xpatch,ypatch);
obj.results.stat_bin{obj.result_ind,1}.bar_handle=patch(xpatch,...
ypatch,...
[1 1 1],'FaceColor',face_color,'EdgeColor',edge_color,'FaceAlpha',face_alpha,'EdgeAlpha',edge_alpha);

case 'line'
xtemp=bar_mid;
ytemp=bincounts(1:end)';
[xtemp,ytemp]=to_polar(obj,xtemp,ytemp);
obj.results.stat_bin{obj.result_ind,1}.line_handle=plot(xtemp,ytemp,'LineStyle',draw_data.line_style,'Color',edge_color,'lineWidth',draw_data.size/4);
xpatch=[bar_mid(1:end-1) ; bar_mid(2:end) ; bar_mid(2:end);bar_mid(1:end-1)];
ypatch=[zeros(1,length(bincounts)-1) ; zeros(1,length(bincounts)-1) ; bincounts(2:end)' ; bincounts(1:end-1)'];
[xpatch,ypatch]=to_polar(obj,xpatch,ypatch);
obj.results.stat_bin{obj.result_ind,1}.fill_handle=patch(xpatch,ypatch,[1 1 1],'FaceColor',face_color,'EdgeColor','none','FaceAlpha',face_alpha);

case 'stacked_bar'
xpatch=[binranges(1:end-1)+spacing ; binranges(2:end)-spacing ; binranges(2:end)-spacing ; binranges(1:end-1)+spacing];
ypatch=[obj.extra.stacked_bar_height ; obj.extra.stacked_bar_height ; obj.extra.stacked_bar_height+bincounts' ; obj.extra.stacked_bar_height+bincounts'];
[xpatch,ypatch]=to_polar(obj,xpatch,ypatch);
obj.results.stat_bin{obj.result_ind,1}.bar_handle=patch(xpatch,...
ypatch,...
[1 1 1],'FaceColor',face_color,'EdgeColor',edge_color,'FaceAlpha',face_alpha,'EdgeAlpha',edge_alpha);
obj.extra.stacked_bar_height=obj.extra.stacked_bar_height+bincounts';
case 'stairs'
xtemp=[binranges(1:end-1) ; binranges(2:end)];
ytemp=[bincounts' ; bincounts'];
[xtemp,ytemp]=to_polar(obj,xtemp(:),ytemp(:));
obj.results.stat_bin{obj.result_ind,1}.line_handle=plot(xtemp,ytemp,'LineStyle',draw_data.line_style,'Color',edge_color,'lineWidth',draw_data.size/4);

xpatch=[binranges(1:end-1) ; binranges(2:end) ; binranges(2:end) ; binranges(1:end-1)];
ypatch=[obj.extra.stacked_bar_height ; obj.extra.stacked_bar_height ; obj.extra.stacked_bar_height+bincounts' ; obj.extra.stacked_bar_height+bincounts'];
[xpatch,ypatch]=to_polar(obj,xpatch,ypatch);

obj.results.stat_bin{obj.result_ind,1}.fill_handle=patch(xpatch,ypatch,[1 1 1],'FaceColor',face_color,'EdgeColor','none','FaceAlpha',face_alpha);

case 'point'
xtemp=bar_mid;
ytemp=bincounts(1:end)';
[xtemp,ytemp]=to_polar(obj,xtemp,ytemp);
obj.results.stat_bin{obj.result_ind,1}.point_handle=plot(xtemp,ytemp,draw_data.marker,'MarkerEdgeColor','none','markerSize',draw_data.size,'MarkerFaceColor',draw_data.color);
end
obj.results.stat_bin{obj.result_ind,1}=my_histplot(obj,draw_data,params,true);

end
Loading

0 comments on commit 1328702

Please sign in to comment.