Merge branch 'master' of https://github.com/mrkrause/circstat-matlab

Author: adehad

Diff for: Contents.m

@@ -60,4 +60,3 @@
 %
 % Author:
 %   Philipp Berens & Marc J. Velasco, 2009
-

Diff for: circ_ang2rad.m

@@ -8,4 +8,5 @@
 % By Philipp Berens, 2009
 % [email protected] - www.kyb.mpg.de/~berens/circStat.html
 
-alpha = alpha * pi /180;
+alpha = alpha * pi /180;
+end

Diff for: circ_axial.m

@@ -27,3 +27,4 @@
 end
 
 alpha = mod(alpha*p,2*pi);
+end

Diff for: circ_axialmean.m

@@ -1,4 +1,4 @@
-function [r mu] = circ_axialmean(alphas, m, dim)
+function [r, mu] = circ_axialmean(alphas, m, dim)
 %
 % mu = circ_axialmean(alpha, w)
 %   Computes the mean direction for circular data with axial 
@@ -7,7 +7,7 @@
 %   Input:
 %     alpha	sample of angles in radians
 %     [m		axial correction (2,3,4,...)]
-%     [dim      statistic computed along this dimension, 1]
+%     [dim      statistic computed along this dimension, default: 1st non-singular dimension]
 %
 %   Output:
 %     r		mean resultant length
@@ -27,7 +27,10 @@
 % Distributed under Open Source BSD License
 
 if nargin < 3
-  dim = 1;
+  dim = find(size(alphas) > 1, 1, 'first');
+  if isempty(dim)
+    dim = 1;
+  end
 end
 
 if nargin < 2 || isempty(m)
@@ -38,4 +41,4 @@
 
 r = abs(zbarm);
 mu = angle(zbarm)/m;
-
+end

Diff for: circ_clust.m

@@ -138,14 +138,13 @@ function plotColor(x, y, c, varargin)
 colors={'y', 'b', 'r', 'g', 'c', 'k', 'm'};
 
 hold on;
-for j=1:length(csmall);
+for j=1:length(csmall)
 
    ci = (c == csmall(j));
    plot(x(ci), y(ci), strcat(pstring, colors{mod(j, length(colors))+1}), 'MarkerSize', ms);
 
 end
 if ~overlay, hold off; end
 figure(figurenum)
-
-
-
+end
+end

Diff for: circ_cmtest.m

@@ -1,4 +1,4 @@
-function [pval med P] = circ_cmtest(varargin)
+function [pval, med, P] = circ_cmtest(varargin)
 %
 % [pval, med, P] = circ_cmtest(alpha, idx)
 % [pval, med, P] = circ_cmtest(alpha1, alpha2)
@@ -68,7 +68,7 @@
 if pval < 0.05
   med = NaN;
 end
-
+end
 
 
 
@@ -88,4 +88,4 @@
 else
   error('Invalid use of circ_wwtest. Type help circ_wwtest.')
 end
-
+end

Diff for: circ_confmean.m

@@ -10,7 +10,7 @@
 %     [d    spacing of bin centers for binned data, if supplied 
 %           correction factor is used to correct for bias in 
 %           estimation of r, in radians (!)]
-%     [dim  compute along this dimension, default is 1]
+%     [dim  compute along this dimension, default: 1st non-singular dimension]
 %
 %   Output:
 %     t     mean +- d yields upper/lower (1-xi)% confidence limit
@@ -28,7 +28,10 @@
 % [email protected] - www.kyb.mpg.de/~berens/circStat.html
 
 if nargin < 5
-  dim = 1;
+  dim = find(size(alpha) > 1, 1, 'first');
+  if isempty(dim)
+    dim = 1;
+  end
 end
 
 if nargin < 4 || isempty(d)
@@ -74,7 +77,4 @@
 
 % apply final transform
 t = acos(t./R);
-  
-
-
-
+end

Diff for: circ_corrcc.m

@@ -1,4 +1,4 @@
-function [rho pval] = circ_corrcc(alpha1, alpha2)
+function [rho, pval] = circ_corrcc(alpha1, alpha2)
 %
 % [rho pval] = circ_corrcc(alpha1, alpha2)
 %   Circular correlation coefficient for two circular random variables.
@@ -50,4 +50,4 @@
 
 ts = sqrt((n * l20 * l02)/l22) * rho;
 pval = 2 * (1 - normcdf(abs(ts)));
-
+end

Diff for: circ_corrcl.m

@@ -1,4 +1,4 @@
-function [rho pval] = circ_corrcl(alpha, x)
+function [rho, pval] = circ_corrcl(alpha, x)
 %
 % [rho pval] = circ_corrcc(alpha, x)
 %   Correlation coefficient between one circular and one linear random
@@ -47,4 +47,4 @@
 
 % compute pvalue
 pval = 1 - chi2cdf(n*rho^2,2);
-
+end

Diff for: circ_dist.m

@@ -25,4 +25,5 @@
   error('Input dimensions do not match.')
 end
 
-r = angle(exp(1i*x)./exp(1i*y));
+r = angle(exp(1i*x)./exp(1i*y));
+end

Diff for: circ_dist2.m

@@ -33,4 +33,5 @@
 end
 
 r = angle(repmat(exp(1i*x),1,length(y)) ...
-       ./ repmat(exp(1i*y'),length(x),1));
+       ./ repmat(exp(1i*y'),length(x),1));
+end

Diff for: circ_hktest.m

@@ -1,4 +1,4 @@
-function [pval table] = circ_hktest(alpha, idp, idq, inter, fn)
+function [pval, table] = circ_hktest(alpha, idp, idq, inter, fn)
 
 %
 % [pval, stats] = circ_hktest(alpha, idp, idq, inter, fn)
@@ -238,16 +238,4 @@
     end
 
   end
-
-
 end
-
-
-
-
-
-
-
-
-
-

Diff for: circ_kappa.m

@@ -55,3 +55,4 @@
     kappa = (N-1)^3*kappa/(N^3+N);
   end
 end
+end

Diff for: circ_ktest.m

@@ -51,10 +51,4 @@
   f = 1/f; 
   pval = 2*(1-fcdf(f, n2, n1));
 end
-
-
-
-
-
-
-
+end

Diff for: circ_kuipertest.m

@@ -45,8 +45,8 @@
 m = length(alpha2(:));
 
 % create cdfs of both samples
-[phis1 cdf1 phiplot1 cdfplot1] = circ_samplecdf(alpha1, res);
-[foo, cdf2 phiplot2 cdfplot2] = circ_samplecdf(alpha2, res); %#ok<ASGLU>
+[phis1, cdf1, phiplot1, cdfplot1] = circ_samplecdf(alpha1, res);
+[foo, cdf2, phiplot2, cdfplot2] = circ_samplecdf(alpha2, res); %#ok<ASGLU>
 
 % maximal difference between sample cdfs
 [dplus, gdpi] = max([0 cdf1-cdf2]);
@@ -56,7 +56,7 @@
 k = n * m * (dplus + dminus);
 
 % find p-value
-[pval K] = kuiperlookup(min(n,m),k/sqrt(n*m*(n+m)));
+[pval, K] = kuiperlookup(min(n,m),k/sqrt(n*m*(n+m)));
 K = K * sqrt(n*m*(n+m));
 
 
@@ -83,14 +83,14 @@
 
 end
 
-function [p K] = kuiperlookup(n, k)
+function [p, K] = kuiperlookup(n, k)
 
 load kuipertable.mat;
 alpha = [.10, .05, .02, .01, .005, .002, .001];
 nn = ktable(:,1);  %#ok<NODEF>
 
 % find correct row of the table
-[easy row] = ismember(n, nn);
+[easy, row] = ismember(n, nn);
 if ~easy
    % find closest value if no entry is present)
    row = length(nn) - sum(n<nn); 
@@ -110,5 +110,4 @@
   p = 1;
 end
 K = ktable(row,idx+1);
-
-end
+end

Diff for: circ_kurtosis.m

@@ -1,12 +1,12 @@
-function [k k0] = circ_kurtosis(alpha, w, dim)
+function [k, k0] = circ_kurtosis(alpha, w, dim)
 
 % [k k0] = circ_kurtosis(alpha,w,dim)
 %   Calculates a measure of angular kurtosis.
 %
 %   Input:
 %     alpha     sample of angles
 %     [w        weightings in case of binned angle data]
-%     [dim      statistic computed along this dimension, 1]
+%     [dim      statistic computed along this dimension, default: 1st non-singular dimension]
 %
 %     If dim argument is specified, all other optional arguments can be
 %     left empty: circ_kurtosis(alpha, [], dim)
@@ -25,7 +25,10 @@
 % [email protected]
 
 if nargin < 3
-  dim = 1;
+  dim = find(size(alpha) > 1, 1, 'first');
+  if isempty(dim)
+    dim = 1;
+  end  
 end
 
 if nargin < 2 || isempty(w)
@@ -48,4 +51,5 @@
 theta2 = repmat(theta, size(alpha)./size(theta));
 k = sum(w.*(cos(2*(circ_dist(alpha,theta2)))),dim)./sum(w,dim);
 k0 = (rho2.*cos(circ_dist(mu2,2*theta))-R.^4)./(1-R).^2;    % (formula 2.30)
+end
 

Diff for: circ_mean.m

@@ -1,12 +1,12 @@
-function [mu ul ll] = circ_mean(alpha, w, dim)
+function [mu, ul, ll] = circ_mean(alpha, w, dim)
 %
 % [mu ul ll] = circ_mean(alpha, w, dim)
 %   Computes the mean direction for circular data.
 %
 %   Input:
 %     alpha	sample of angles in radians
 %     [w		weightings in case of binned angle data]
-%     [dim  compute along this dimension, default is 1]
+%     [dim  compute along this dimension, default: 1st non-singular dimension]
 %
 %     If dim argument is specified, all other optional arguments can be
 %     left empty: circ_mean(alpha, [], dim)
@@ -29,7 +29,10 @@
 % [email protected] - www.kyb.mpg.de/~berens/circStat.html
 
 if nargin < 3
-  dim = 1;
+  dim = find(size(alpha) > 1, 1, 'first');
+  if isempty(dim)
+    dim = 1;
+  end
 end
 
 if nargin < 2 || isempty(w)
@@ -53,4 +56,5 @@
   t = circ_confmean(alpha,0.05,w,[],dim);
   ul = mu + t;
   ll = mu - t;
-end
+end
+end

Diff for: circ_median.m

@@ -5,7 +5,7 @@
 %
 %   Input:
 %     alpha	sample of angles in radians
-%     [dim  compute along this dimension, default is 1, must 
+%     [dim  compute along this dimension, default: 1st non-singular dimension, must 
 %           be either 1 or 2 for circ_median]
 %
 %   Output:
@@ -25,7 +25,10 @@
 % [email protected] - www.kyb.mpg.de/~berens/circStat.html
 
 if nargin < 2
-  dim = 1;
+  dim = find(size(alpha) > 1, 1, 'first');
+  if isempty(dim)
+    dim = 1;
+  end  
 end
 
 M = size(alpha);
@@ -48,7 +51,7 @@
 
   dm = abs(m1-m2);
   if mod(n,2)==1
-    [m idx] = min(dm);
+    [m, idx] = min(dm);
   else
     m = min(dm);
     idx = find(dm==m,2);
@@ -70,4 +73,5 @@
 
 if dim == 2
   med = med';
-end
+end
+end

Diff for: circ_medtest.m

@@ -40,7 +40,4 @@
 
 % compute p-value with binomial test
 pval = sum(binopdf([0:min(n1,n2) max(n1,n2):n],n,0.5));
-
-
-
-
+end

Diff for: circ_moment.m

@@ -1,4 +1,4 @@
-function [mp  rho_p mu_p] = circ_moment(alpha, w, p, cent, dim)
+function [mp,  rho_p, mu_p] = circ_moment(alpha, w, p, cent, dim)
 
 % [mp rho_p mu_p] = circ_moment(alpha, w, p, cent, dim)
 %   Calculates the complex p-th centred or non-centred moment 
@@ -9,7 +9,7 @@
 %     [w        weightings in case of binned angle data]
 %     [p        p-th moment to be computed, default is p=1]
 %     [cent     if true, central moments are computed, default = false]
-%     [dim      compute along this dimension, default is 1]
+%     [dim      compute along this dimension, default is 1st non-singular dimension]
 %
 %     If dim argument is specified, all other optional arguments can be
 %     left empty: circ_moment(alpha, [], [], [], dim)
@@ -29,7 +29,10 @@
 % [email protected]
 
 if nargin < 5
-  dim = 1;
+  dim = find(size(alpha) > 1, 1, 'first');
+  if isempty(dim)
+    dim = 1;
+  end
 end
 
 if nargin < 4
@@ -65,5 +68,4 @@
 
 rho_p = abs(mp);
 mu_p = angle(mp);
-
-
+end