bug in windowing approach when using window length = data length fixed

crqa.m

@@ -149,6 +149,9 @@ function xout=crqa(varargin)
 % $Revision$
 %
 % $Log$
+% Revision 5.48  2014/01/07 07:55:29  marwan
+% corrected output length, RQA measures of last window added
+%
 % Revision 5.47  2013/08/22 06:35:01  marwan
 % bugfix in estimation black and white vertical lines
 %
@@ -1075,8 +1078,8 @@ case 'compute'
     set(h(1),'ToolTip','Stops the computation.','String','Stop','Callback','set(0,''ShowHidden'',''on'');h=findobj(''tag'',''crqa_button_apply'');set(h(1),''String'',''Stopped'');set(0,''ShowHidden'',''off'')')
   end
 
-if Nx==w & wstep<2, wstep=1; Nx=w+1; end
-if Nx==w, Nx=w+1; end
+if Nx==w & wstep<2, wstep=1; Nx=w; end
+if Nx==w, Nx=w; end
 if nogui~=2, hw=waitbar(0,['0/',num2str(Nx-w)]);set(hw,'Name','Please Wait!');h1=get(hw,'chil');h1=get(h1,'title'); drawnow; end
 if strcmpi(method,'Order Pattern') method = 'op'; end
 if strcmpi(method,'Order Matrx') method = 'om'; end
@@ -1096,10 +1099,11 @@ hist_l = []; hist_v = []; hist_w = [];
 
 
 % main loop through all windows
-Y = zeros(length(xscale),13);
+Y = zeros(length(xscale)-w+1,13);
 if undocumented
-   Y = zeros(length(xscale),17);
+   Y = zeros(length(xscale)-w+1,17);
 end
+   
 for i=1:wstep:Nx-w+1; 
      if ~nogui
          set(0,'ShowHidden','on')