Compare commits
2 Commits
fb282e53e1
...
baac9e2032
Author | SHA1 | Date | |
---|---|---|---|
|
baac9e2032 | ||
|
2c7a9f90f0 |
24
CREClass.m
24
CREClass.m
@ -76,11 +76,13 @@ classdef CREClass < handle
|
||||
if isempty(obj.nBin)
|
||||
obj.nBin=floor(numel(obj.Data)./10);
|
||||
end
|
||||
[N,bin]=hist(obj.Data(:),obj.nBin);
|
||||
N=transpose(N);
|
||||
P=N./sum(N);
|
||||
CP=cumsum(P);
|
||||
FC=1-CP;
|
||||
%update part below to prefered matlab commands
|
||||
% [N,bin]=hist(obj.Data(:),obj.nBin);
|
||||
% N=transpose(N);
|
||||
% P=N./sum(N);
|
||||
% CP=cumsum(P);
|
||||
[CP,bin]=histcounts(obj.Data(:),obj.nBin,'Normalization','cdf');
|
||||
FC=1-transpose(CP);
|
||||
FC(FC<0)=0;
|
||||
dl=ones(size(FC))./numel(FC);
|
||||
else
|
||||
@ -90,7 +92,7 @@ classdef CREClass < handle
|
||||
for k=1:numel(q)
|
||||
FC(k)=sum(obj.Data(:)>=q(k));
|
||||
if k==1
|
||||
dl(k)=(q(k+1)-q(k))/2; %should I divide by 2?
|
||||
dl(k)=(q(k+1)-q(k))/2;
|
||||
elseif k==numel(q)
|
||||
dl(k)=(q(k)-q(k-1))/2;
|
||||
else
|
||||
@ -101,8 +103,14 @@ classdef CREClass < handle
|
||||
end
|
||||
LogFC=log(FC);
|
||||
LogFC(~isfinite(LogFC))=0;%the log of 0 is -inf. however in Fc.*logFc it should end up as 0. to avoid conflicts removing the -inf
|
||||
if any(isnan(FC));keyboard;end
|
||||
obj.CRE=-transpose(dl)*(FC.*LogFC)./(transpose(dl)*FC); %CRE zografos
|
||||
if any(isnan(FC));error('something went wrong');end %catch a posible error.
|
||||
if transpose(dl)*FC==0;
|
||||
%if only one value in the most left bin in the distribution I may get a 0 divided by 0
|
||||
%as the CRE of a delta function is 0, enforce this outcome
|
||||
obj.CRE=0;
|
||||
else
|
||||
obj.CRE=-transpose(dl)*(FC.*LogFC)./(transpose(dl)*FC); %CRE zografos
|
||||
end
|
||||
%% get the RB
|
||||
dl(FC>0.5)=0; %set the weight for all in the histogram to the left side (i.e. <p50) to 0
|
||||
CRE_Med_Inf=-transpose(dl)*(FC.*LogFC)./(transpose(dl)*FC); %CRE zografos
|
||||
|
@ -1,5 +1,5 @@
|
||||
S=CREClass;
|
||||
S.Data=randn(100000,1);
|
||||
S.Data=randn(100,1);
|
||||
S.nBin=(1000);
|
||||
%% use histogram
|
||||
S.UseHistProxy=true;
|
||||
@ -13,10 +13,16 @@ std(S.Data)
|
||||
%% multiply S
|
||||
S.Data=100*S.Data;
|
||||
S.UseHistProxy=true;
|
||||
S.Calc
|
||||
S.Calc;
|
||||
S
|
||||
std(S.Data)
|
||||
%% ones again the "new" way
|
||||
S.UseHistProxy=false;
|
||||
S.Calc
|
||||
S.Calc;
|
||||
S
|
||||
%% Test CCRE class
|
||||
CS=CCREClass;
|
||||
CS.Data=randn(100,1);
|
||||
CS.nBin=10;
|
||||
CS.DataRef=randn(100,1);
|
||||
CS.nBinRef=10;
|
Loading…
Reference in New Issue
Block a user