Skip to content
Snippets Groups Projects
Commit dd7e88b1 authored by marwan's avatar marwan
Browse files

minor change: sigma in title line of RP shown only for normalised data

parent 7dad01ca
No related branches found
Tags v5.8
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
crp.m
+ 12
− 6
View file @ dd7e88b1
......@@ -79,6 +79,9 @@ function xout=crp(varargin)
% $Revision$
%
% $Log$
% Revision 5.8 2006/03/29 13:07:55 marwan
% problems regarding OPRPs and embedding resolved
%
% Revision 5.7 2006/02/14 11:45:49 marwan
% *** empty log message ***
%
......@@ -136,7 +139,7 @@ function xout=crp(varargin)
warning off
global errcode props
global errcode props nonorm
errcode=0;
......@@ -303,6 +306,7 @@ else % read input from the GUI
set(findobj('Tag','Size','Parent',hCtrl),'enable','on');
set(findobj('Tag','Sizetext','Parent',hCtrl),'enable','on');
end
nonorm = get(findobj('Tag','nonorm','Parent',hCtrl),'UserData');
if mflag==7 & m > 1,
m=1; ds = 1;
......@@ -542,7 +546,7 @@ switch(action)
% check if plugin exist and is executable
[plugin_exist, plugin_name, plugin_path] = is_crp_plugin;
if plugin_exist & ( mflag < 4 | mflag == 8 | mflag == 9 ) & length(x) == length(y) % if plugin exist and method is MAX, MIN, EUC ord DIS
if plugin_exist & ( mflag < 4 | mflag == 8 | mflag == 9 ) & length(x) == length(y) & ~ispc % if plugin exist and method is MAX, MIN, EUC ord DIS
if nogui == 1, disp('(plugin used)'), end
......@@ -563,6 +567,8 @@ switch(action)
[NY, my] = size(y2);
clear jx jy x1 y1
if ~nonorm, unit = ''; else unit = '\sigma'; end
switch(mflag)
......@@ -583,17 +589,17 @@ switch(action)
case 1
%%%%%%%%%%%%%%%%% maximum norm
s = max(abs(s1),[],3);
matext=[num2str(round(100*e)/100) '\sigma (fixed distance maximum norm)'];
matext=[num2str(round(100*e)/100) unit ' (fixed distance maximum norm)'];
case 2
%%%%%%%%%%%%%%%%% euclidean norm
errcode=112;
s = sqrt(sum(s1.^2, 3));
matext=[num2str(round(100*e)/100) '\sigma (fixed distance euclidean norm)'];
matext=[num2str(round(100*e)/100) unit ' (fixed distance euclidean norm)'];
case 3
%%%%%%%%%%%%%%%%% minimum norm
errcode=113;
s = sum(abs(s1), 3);
matext=[num2str(round(100*e)/100) '\sigma (fixed distance minimum norm)'];
matext=[num2str(round(100*e)/100) unit ' (fixed distance minimum norm)'];
end
set(findobj('Tag','Status','Parent',findobj('Parent',hCRP,'Tag','CRPPlot')'),'String','Building CRP Matrix'),drawnow
......@@ -631,7 +637,7 @@ switch(action)
set(findobj('Tag','Status','Parent',findobj('Parent',hCRP,'Tag','CRPPlot')'),'String','Building CRP Matrix'),drawnow
X=(uint8(255*s/max(s(:)))<(255*e/max(s(:))))'; clear s s1 x1 y1 px py
matext=[num2str(round(100*e)/100) '\sigma (normalized distance euclidean norm)'];
matext=[num2str(round(100*e)/100) unit ' (normalized distance euclidean norm)'];
%%%%%%%%%%%%%%%%% local CRP, fixed neigbours amount
......
crp2.m
+ 174
− 166
View file @ dd7e88b1
This diff is collapsed.
crp_big.m
+ 13
− 5
View file @ dd7e88b1
......@@ -77,6 +77,9 @@ function xout=crp_big(varargin)
% $Revision$
%
% $Log$
% Revision 5.7 2006/03/29 13:07:55 marwan
% problems regarding OPRPs and embedding resolved
%
% Revision 5.6 2006/02/06 13:46:17 marwan
% plugin for order patterns recurrence plots supported
%
......@@ -132,6 +135,7 @@ function xout=crp_big(varargin)
warning off
global errcode props nonorm
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% programme properties
......@@ -296,6 +300,7 @@ else % read input from the GUI
set(findobj('Tag','Size','Parent',hCtrl),'enable','on');
set(findobj('Tag','Sizetext','Parent',hCtrl),'enable','on');
end
nonorm = get(findobj('Tag','nonorm','Parent',hCtrl),'UserData');
if mflag==7 & m > 1,
m=1; ds = 1;
......@@ -515,7 +520,7 @@ switch(action)
% check if plugin exist and is executable
[plugin_exist, plugin_name, plugin_path] = is_crp_plugin;
if plugin_exist & ( mflag < 4 | mflag == 8 | mflag == 9 ) & length(x) == length(y) % if plugin exist and method is MAX, MIN, EUC ord DIS
if plugin_exist & ( mflag < 4 | mflag == 8 | mflag == 9 ) & length(x) == length(y) & ~ispc % if plugin exist and method is MAX, MIN, EUC ord DIS
if nogui == 1, disp('(plugin used)'), end
end
......@@ -554,6 +559,9 @@ switch(action)
end
y(Ny+1:Ny2*ay+t*(m-1))=y(Ny);
y0=y;
if ~nonorm, unit = ''; else unit = '\sigma'; end
set(findobj('Tag','Status','Parent',findobj('Parent',hCRP,'Tag','CRPPlot')),'String','Compute CRP'),drawnow
if nogui==0
......@@ -633,17 +641,17 @@ switch(action)
case 1
%%%%%%%%%%%%%%%%% maximum norm
s = max(abs(s1),[],3);
matext=[num2str(round(100*e)/100) '\sigma (fixed distance maximum norm)'];
matext=[num2str(round(100*e)/100) unit ' (fixed distance maximum norm)'];
case 2
%%%%%%%%%%%%%%%%% euclidean norm
errcode=112;
s = sqrt(sum(s1.^2, 3));
matext=[num2str(round(100*e)/100) '\sigma (fixed distance euclidean norm)'];
matext=[num2str(round(100*e)/100) unit ' (fixed distance euclidean norm)'];
case 3
%%%%%%%%%%%%%%%%% minimum norm
errcode=113;
s = sum(abs(s1), 3);
matext=[num2str(round(100*e)/100) '\sigma (fixed distance minimum norm)'];
matext=[num2str(round(100*e)/100) unit ' (fixed distance minimum norm)'];
end
X1=255*s/max(s(:))<(255*e/max(s(:)));
......@@ -679,7 +687,7 @@ switch(action)
X(NY0+1:end,:)=[];
X(:,NX0+1:end)=[];
NX=NX0; NY=NY0;
matext=[num2str(round(100*e)/100) '\sigma (normalized distance euclidean norm)'];
matext=[num2str(round(100*e)/100) unit ' (normalized distance euclidean norm)'];
%%%%%%%%%%%%%%%%% local CRP, fixed neigbours amount
......
crp_man.pdf
+ 0
− 0
View file @ dd7e88b1
No preview for this file type
crqa.m
+ 4
− 1
View file @ dd7e88b1
......@@ -107,7 +107,7 @@ function xout=crqa(varargin)
% ylabel('recurrence rate'), axis([3.4 4 0 1])
%
%
% See also CRQAD, CRP, CRP2, CRP_BIG, DL, TT, PSS.
% See also CRQAD, CRQAD_BIG, CRP, CRP2, CRP_BIG, DL, TT, PSS.
%
% References:
% Trulla, L. L., Giuliani, A., Zbilut, J. P., Webber Jr., C. L.:
......@@ -135,6 +135,9 @@ function xout=crqa(varargin)
% $Revision$
%
% $Log$
% Revision 5.28 2006/09/13 15:53:36 marwan
% Bug during printing solved
%
% Revision 5.27 2006/07/04 14:04:22 marwan
% order patterns for multi-column vectors without embedding
%
......
crqad.m
+ 4
− 1
View file @ dd7e88b1
......@@ -55,7 +55,7 @@ function out=crqad(varargin)
% b = sin(0:.1:80) + randn(1,801);
% crqad(a,b,3,15,.1,100,'fan')
%
% See also CRQA, CRP, CRP2, CRP_BIG, DL, TT.
% See also CRQA, CRQAD_BIG, CRP, CRP2, CRP_BIG, DL, TT.
%
% References:
% Marwan, N., Kurths, J.:
......@@ -70,6 +70,9 @@ function out=crqad(varargin)
% $Revision$
%
% $Log$
% Revision 2.5 2006/07/04 14:03:57 marwan
% axis-error
%
% Revision 2.4 2005/03/16 11:19:02 marwan
% help text modified
%
......
histn.m
+ 6
− 1
View file @ dd7e88b1
......@@ -36,6 +36,9 @@ function varargout=histn(varargin)
% $Revision$
%
% $Log$
% Revision 1.9 2004/11/10 07:05:37 marwan
% initial import
%
%
% This program is free software; you can redistribute it and/or
% modify it under the terms of the GNU General Public License
......@@ -112,7 +115,9 @@ end
%if size(x,1)<size(x,2), x=x';end
for k=1:m;
x1(k)={(x{k}(1:sm_length,:)-repmat(min(x{k}(1:sm_length,:)),length(x{k}(1:sm_length,:)),1))./repmat(max(x{k}(1:sm_length,:)-repmat(min(x{k}(1:sm_length,:)),length(x{k}(1:sm_length,:)),1)),length(x{k}(1:sm_length,:)),1)-eps};
minX = repmat(min(x{k}(1:sm_length,:)),length(x{k}(1:sm_length,:)),1);
rangeX = repmat(max(x{k}(1:sm_length,:)-repmat(min(x{k}(1:sm_length,:)),length(x{k}(1:sm_length,:)),1)),length(x{k}(1:sm_length,:)),1);
x1(k)={(x{k}(1:sm_length,:) - minX) ./ rangeX - eps};
if m>1 & sm_length/(m-1)<=lag, lag=floor(sm_length/(m-1))-1; warning(['Lag is too large. Using ',num2str(lag),' instead.']), end
end
......
jrp.m
+ 11
− 5
View file @ dd7e88b1
......@@ -80,6 +80,9 @@ function xout=jrp(varargin)
% $Revision$
%
% $Log$
% Revision 2.3 2005/06/15 15:16:48 marwan
% bug due to UINT8 data type resolved
%
% Revision 2.2 2005/04/15 09:02:32 marwan
% minor bugfix in plugin section
%
......@@ -107,7 +110,7 @@ function xout=jrp(varargin)
warning off
global errcode props
global errcode props nonorm
errcode=0;
......@@ -270,6 +273,7 @@ else % read input from the GUI
set(findobj('Tag','Size','Parent',hCtrl),'enable','on');
set(findobj('Tag','Sizetext','Parent',hCtrl),'enable','on');
end
nonorm = get(findobj('Tag','nonorm','Parent',hCtrl),'UserData');
if mflag==7 & m > 1,
m=1; ds = 1;
......@@ -521,6 +525,8 @@ switch(action)
clear jx jy x1 y1
if ~nonorm, unit = ''; else unit = '\sigma'; end
switch(mflag)
%%%%%%%%%%%%%%%%% local JRP, fixed distance
......@@ -549,19 +555,19 @@ switch(action)
%%%%%%%%%%%%%%%%% maximum norm
sx = max(abs(s1),[],3);
sy = max(abs(s2),[],3);
matext=[num2str(round(100*e)/100) '\sigma (fixed distance maximum norm)'];
matext=[num2str(round(100*e)/100) unit ' (fixed distance maximum norm)'];
case 2
%%%%%%%%%%%%%%%%% euclidean norm
errcode=112;
sx = sqrt(sum(s1.^2, 3));
sy = sqrt(sum(s2.^2, 3));
matext=[num2str(round(100*e)/100) '\sigma (fixed distance euclidean norm)'];
matext=[num2str(round(100*e)/100) unit ' (fixed distance euclidean norm)'];
case 3
%%%%%%%%%%%%%%%%% minimum norm
errcode=113;
sx = sum(abs(s1), 3);
sy = sum(abs(s2), 3);
matext=[num2str(round(100*e)/100) '\sigma (fixed distance minimum norm)'];
matext=[num2str(round(100*e)/100) unit ' (fixed distance minimum norm)'];
end
set(findobj('Tag','Status','Parent',findobj('Parent',hCRP,'Tag','CRPPlot')'),'String','Building JRP Matrix'),drawnow
......@@ -610,7 +616,7 @@ switch(action)
set(findobj('Tag','Status','Parent',findobj('Parent',hCRP,'Tag','CRPPlot')'),'String','Building JRP Matrix'),drawnow
X=uint8( (255*sx/max(sx(:)))<(255*e/max(sx(:)))' .* (255*sy/max(sy(:)))<(255*e/max(sy(:)))' );
clear sx sy s1 x1 y1 px py
matext=[num2str(round(100*e)/100) '\sigma (normalized distance euclidean norm)'];
matext=[num2str(round(100*e)/100) unit ' (normalized distance euclidean norm)'];
%%%%%%%%%%%%%%%%% local JRP, fixed neigbours amount
......
private/create_Ctrlfig.m
+ 6
− 1
View file @ dd7e88b1
......@@ -10,6 +10,9 @@ function h_axes=create_Ctrlfig(programme,h,ds,m,t,e,method)
% $Revision$
%
% $Log$
% Revision 4.11 2006/03/29 13:07:40 marwan
% problems regarding OPRPs and embedding resolved
%
% Revision 4.10 2006/02/14 11:46:34 marwan
% *** empty log message ***
%
......@@ -28,7 +31,7 @@ function h_axes=create_Ctrlfig(programme,h,ds,m,t,e,method)
% as published by the Free Software Foundation; either version 2
% of the License, or any later version.
global props
global props nonorm
scr=get(0,'ScreenSize');
h9=figure('Tag','CRPFig',... % Control Figure
......@@ -44,6 +47,8 @@ global props
h0=uicontrol(props.frame, ... % Frame Embedding
'Units','Normalized',...
'UserData',nonorm, ...
'Tag','nonorm', ...
'Position',[.1 .525 .8 .445]);
h0=uicontrol(props.text,... % Text Embedding
......
private/crp_plugin.m
+ 9
− 4
View file @ dd7e88b1
......@@ -10,6 +10,9 @@ function [X, matext] = crp_plugin(x, y, m, t, e, mflag, hCRP, plugin_path, silen
% $Revision$
%
% $Log$
% Revision 4.5 2006/03/29 13:07:40 marwan
% problems regarding OPRPs and embedding resolved
%
% Revision 4.4 2006/02/14 11:46:53 marwan
% dimension and delay for plugin released
%
......@@ -29,7 +32,7 @@ function [X, matext] = crp_plugin(x, y, m, t, e, mflag, hCRP, plugin_path, silen
% as published by the Free Software Foundation; either version 2
% of the License, or any later version.
global errcode
global errcode nonorm
X = []; matext = '';
......@@ -75,19 +78,21 @@ try
if ~silent, set(findobj('Tag','Status','Parent',findobj('Parent',hCRP,'Tag','CRPPlot')),'String','Plot Recurrence Points'),drawnow, end
if ~nonorm, unit = ''; else unit = '\sigma'; end
switch mflag
%%%%%%%%%%%%%%%%% maximum norm
case 1
errcode=111;
matext=[num2str(round(100*e)/100) '\sigma (fixed distance maximum norm)'];
matext=[num2str(round(100*e)/100) unit ' (fixed distance maximum norm)'];
%%%%%%%%%%%%%%%%% euclidean norm
case 2
errcode=112;
matext=[num2str(round(100*e)/100) '\sigma (fixed distance euclidean norm)'];
matext=[num2str(round(100*e)/100) unit ' (fixed distance euclidean norm)'];
%%%%%%%%%%%%%%%%% minimum norm
case 3
errcode=113;
matext=[num2str(round(100*e)/100) '\sigma (fixed distance minimum norm)'];
matext=[num2str(round(100*e)/100) unit ' (fixed distance minimum norm)'];
%%%%%%%%%%%%%%%%% order patterns
case 8
errcode=118;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment