Changeset 880 for trunk/src/plot_field.m

Timestamp:

Mar 4, 2015, 12:01:38 AM (9 years ago)

Author:

sommeria

Message:

various bug fixes

File:

• trunk/src/plot_field.m (modified) (3 diffs)

trunk/src/plot_field.m

@@ -224 +224 @@
 if ~(isfield(PlotParamOut,'Axes')&&isfield(PlotParamOut.Axes,'TextDisplay')&&(PlotParamOut.Axes.TextDisplay)) % if text is not already given as statistics
     htext=findobj(hfig,'Tag','TableDisplay');
-%     hchecktable=findobj(hfig,'Tag','CheckTable');
     if ~isempty(htext)%&&~isempty(hchecktable)
         if isempty(index_0D)
@@ -577 +576 @@
 
 %% give statistics for pdf
-ind_var=find(testplot);
+%ind_var=find(testplot);
 TableData={'Variable';'SampleNbr';'bin size';'Mean';'RMS';'Skewness';'Kurtosis';'    centered ';...
     'Min';'FirstCentile';'FirstDecile';'Median';'LastDecile';'LastCentile';'Max'};
-%PlotParamOut.TableDisplay={};
+
 TextDisplay=0;
 for icell=1:numel(CellInfo)
     if isfield(CellInfo{icell},'VarIndex_histo')
-        check_stat=1;
         TextDisplay=1;
         VarName=data.ListVarName{CellInfo{icell}.CoordIndex};
         pdf_val=data.(data.ListVarName{CellInfo{icell}.VarIndex_histo});
         x=coord_x{icell};
-        Val=zeros(12,1);
-        Val(1)=sum(pdf_val);% total sample number
-        Val(7)=min(x);
-        Val(13)=max(x);
-        Val(2)=(Val(13)-Val(7))/(numel(x)-1);%bin size
-        pdf_val=pdf_val/Val(1);% normalised pdf
-        Val(3)=sum(x.*pdf_val);%Mean
-        x=x-Val(3); %centered variable
-        Variance=sum(x.*x.*pdf_val);
-        Val(4)=sqrt(Variance);
-        Val(5)=(sum(x.*x.*x.*pdf_val))/(Variance*Val(4));%skewness
-        Val(6)=(sum(x.*x.*x.*x.*pdf_val))/(Variance*Variance);%kurtosis
-        cumpdf=cumsum(pdf_val);% sum of pdf
-        ind_centile=find(cumpdf>=0.01,1);% first index with cumsum >=0.01
-        Val(8)=x(ind_centile)+Val(2)/2;%
-        if ind_centile>1
-            Val(8)=(cumpdf(ind_centile)-0.01)*x(ind_centile-1)+(0.01-cumpdf(ind_centile-1))*x(ind_centile);
-            Val(8)=Val(8)/(cumpdf(ind_centile)-cumpdf(ind_centile-1))+Val(2)/2;%linear interpolation near ind_centile
-        end
-        ind_decile=find(cumpdf>=0.1,1);
-        if ind_decile>1
-            Val(9)=x(ind_decile)+Val(2)/2;%
-            Val(9)=(cumpdf(ind_decile)-0.1)*x(ind_decile-1)+(0.1-cumpdf(ind_decile-1))*x(ind_decile);
-            Val(9)=Val(9)/(cumpdf(ind_decile)-cumpdf(ind_decile-1))+Val(2)/2;%linear interpolation near ind_decile;
-        end
-        ind_median=find(cumpdf>= 0.5,1);
-        Val(10)=(cumpdf(ind_median)-0.5)*x(ind_median-1)+(0.5-cumpdf(ind_median-1))*x(ind_median);
-        Val(10)=Val(10)/(cumpdf(ind_median)-cumpdf(ind_median-1))+Val(2)/2;%linear interpolation near ind_median;
-        %     Val(9)=x(ind_median);
-        ind_decile=find(cumpdf>=0.9,1);
-        Val(11)=(cumpdf(ind_decile)-0.9)*x(ind_decile-1)+(0.9-cumpdf(ind_decile-1))*x(ind_decile);
-        Val(11)=Val(11)/(cumpdf(ind_decile)-cumpdf(ind_decile-1))+Val(2)/2;%linear interpolation near ind_median;
-        ind_centile=find(cumpdf>=0.99,1);
-        Val(12)=(cumpdf(ind_centile)-0.99)*x(ind_centile-1)+(0.99-cumpdf(ind_centile-1))*x(ind_centile);
-        Val(12)=Val(12)/(cumpdf(ind_centile)-cumpdf(ind_centile-1))+Val(2)/2;%linear interpolation near ind_centile;
+        
+        Val=pdf2stat(x',pdf_val');
+
         Column=mat2cell(Val,ones(13,1),1);
         Column=[{VarName};Column(1:6);{'stat: --'};Column(7:13)];
@@ -632 +598 @@
     disp(TableData);
     PlotParamOut.TableDisplay=TableData;
-   % PlotParamOut.CheckTable=1;
-%     htable=findobj(hfig,'Tag','TableDisplay');
-%     set(htable,'Data',TableData)
-%     set(htable,'Visible','on')
-%     drawnow
 else
     if isfield(PlotParamOut,'TableDisplay')