diff --git a/private/create_Ctrlfig.m b/private/create_Ctrlfig.m
index ebb62ceb07d6dfebc775b0d0cd5189f83ea6dc9f..0d47b1a39c264d98946a063cea798be3d79e47d5 100644
--- a/private/create_Ctrlfig.m
+++ b/private/create_Ctrlfig.m
@@ -2,7 +2,7 @@ function h_axes=create_Ctrlfig(programme,h,ds,m,t,e,method)
% create_Ctrlfig Creates the Control figure for the CRP Toolbox
% Used by CRP Toolbox
-% Copyright (c) 1998-2006 by AMRON
+% Copyright (c) 1998-2007 by AMRON
% Norbert Marwan, Potsdam University, Germany
% http://www.agnld.uni-potsdam.de
%
@@ -10,6 +10,9 @@ function h_axes=create_Ctrlfig(programme,h,ds,m,t,e,method)
% $Revision$
%
% $Log$
+% Revision 4.12 2006/10/24 14:16:26 marwan
+% minor change: sigma in title line of RP shown only for normalised data
+%
% Revision 4.11 2006/03/29 13:07:40 marwan
% problems regarding OPRPs and embedding resolved
%
@@ -64,7 +67,7 @@ global props nonorm
'String','Dimension:',...
'Position',[.16 .895 .35 .02]);
h1=get(h0,'Extent'); h2=get(h0,'Position'); set(h0,'Position',[h2(1) h2(2) h2(3) h1(4)])
- if method==7, set(h0,'Enable','Off'); end
+ if method==8, set(h0,'Enable','Off'); end
h0=uicontrol(props.popup,... % Input Dimension
'Units','Normalized',...
@@ -76,7 +79,7 @@ global props nonorm
'Callback',[programme,' fitdim'],...
'ToolTip','Select the embedding dimension.');
h1=get(h0,'Extent'); h2=get(h0,'Position'); set(h0,'Position',[h2(1) h2(2) h2(3) h1(4)])
- if method==7, set(h0,'Enable','Off'); end
+ if method==8, set(h0,'Enable','Off'); end
h0=uicontrol(props.text,... % Text Delay
'Units','Normalized',...
@@ -84,7 +87,7 @@ global props nonorm
'String','Delay:',...
'Position',[.16 .847 .35 .02]);
h1=get(h0,'Extent'); h2=get(h0,'Position'); set(h0,'Position',[h2(1) h2(2) h2(3) h1(4)])
- if method==7, set(h0,'Enable','Off'); end
+ if method==8, set(h0,'Enable','Off'); end
h0=uicontrol(props.edit,... % Input Delay
'Units','Normalized',...
@@ -93,7 +96,7 @@ global props nonorm
'Position',[.58 .85 .249 .026],...
'ToolTip','Insert the embedding delay time.');
h1=get(h0,'Extent'); h2=get(h0,'Position'); set(h0,'Position',[h2(1) h2(2) h2(3) h1(4)])
- if method==7, set(h0,'Enable','Off'); end
+ if method==8, set(h0,'Enable','Off'); end
h0=uicontrol(props.text,... % Text Vector Switching
'Units','Normalized',...
@@ -121,7 +124,7 @@ global props nonorm
'Units','Normalized',...
'HorizontalAlignment','center',...
'Position',[.15 .534 .7 .06]);
- h2=textwrap(h0,{[char(169),' AGNLD'],'University of Potsdam','1998-2006'});
+ h2=textwrap(h0,{[char(169),' AGNLD'],'University of Potsdam','1998-2007'});
set(h0,'String',h2)
h1=get(h0,'Extent'); h2=get(h0,'Position'); set(h0,'Position',[h2(1) h2(2) h2(3) h1(4)])
@@ -144,8 +147,8 @@ global props nonorm
'Tag','Unthresh',...
'ToolTip','Switch between thresholded and unthresholded CRP.' );
- if method==9, set(h0,'Value',1); end
- if method==7 | method==8, set(h0,'Enable','Off'); end
+ if method==10, set(h0,'Value',1); end
+ if method==8 | method==9, set(h0,'Enable','Off'); end
h1=uicontrol(props.popup, ... % Button Unthresholded Scale
'Units','Normalized',...
@@ -157,18 +160,18 @@ global props nonorm
'Tag','Log',...
'ToolTip','Switch between various scaled CRP.' );
- if method==9, set(h1,'Enable','On'); end
+ if method==10, set(h1,'Enable','On'); end
h2=uicontrol(props.popup,... % Input Neighbourhood Method
'Units','Normalized',...
- 'String','Maximum Norm|Euclidean Norm|Minimum Norm|Normalized Norm|Fixed Amount|Interdependent|Order Matrix|Order Pattern',...
+ 'String','Maximum Norm|Euclidean Norm|Minimum Norm|Normalized Norm|Fixed RR|Fixed Amount|Interdependent|Order Matrix|Order Pattern',...
'Position',[.16 .363 .67 .032],...
'Tag','Method',...
'CallBack',[programme,' unthresh'],...
'ToolTip','Select the method of finding neighbours.');
- if method==9, set(h2,'Enable','Off'); else, set(h2,'Value',method); end
+ if method==10, set(h2,'Enable','Off'); else, set(h2,'Value',method); end
h0=uicontrol(props.text,... % Text Threshold
'Units','Normalized',...
@@ -177,7 +180,7 @@ global props nonorm
'Position',[.16 .311 .35 .02]);
h1=get(h0,'Extent'); h2=get(h0,'Position'); set(h0,'Position',[h2(1) h2(2) h2(3) h1(4)])
- if method==9 | method==8, set(h0,'Enable','Off'); end
+ if method==10 | method==9, set(h0,'Enable','Off'); end
h0=uicontrol(props.edit,... % Input Threshold
@@ -188,7 +191,7 @@ global props nonorm
'ToolTip','Insert the size of neighbourhood.' );
h1=get(h0,'Extent'); h2=get(h0,'Position'); set(h0,'Position',[h2(1) h2(2) h2(3) h1(4)])
- if method==9 | method==8, set(h0,'Enable','Off'); end
+ if method==10 | method==9, set(h0,'Enable','Off'); end
if ~isunix
h0=uicontrol(props.frame, ... % Frame Embedding
diff --git a/private/crp_plugin.m b/private/crp_plugin.m
index ef5a2a99a294a14013606ba9dfdcfcfda9b3909d..8eed5d392e57ae05c8d10f19a745870caaa870f8 100644
--- a/private/crp_plugin.m
+++ b/private/crp_plugin.m
@@ -10,6 +10,9 @@ function [X, matext] = crp_plugin(x, y, m, t, e, mflag, hCRP, plugin_path, silen
% $Revision$
%
% $Log$
+% Revision 4.6 2006/10/24 14:16:26 marwan
+% minor change: sigma in title line of RP shown only for normalised data
+%
% Revision 4.5 2006/03/29 13:07:40 marwan
% problems regarding OPRPs and embedding resolved
%
@@ -38,9 +41,19 @@ X = []; matext = '';
try
- tmp_xdatafile = tempname;
- tmp_ydatafile = tempname;
- tmp_rpdatafile = tempname;
+ while 1
+ tmp_xdatafile = tempname;
+ if ~exist(tmp_xdatafile), break, end
+ end
+ while 1
+ tmp_ydatafile = tempname;
+ if ~exist(tmp_ydatafile), break, end
+ end
+ while 1
+ tmp_rpdatafile = tempname;
+ if ~exist(tmp_rpdatafile), break, end
+ end
+
if ~silent, set(findobj('Tag','Status','Parent',findobj('Parent',hCRP,'Tag','CRPPlot')),'String','Export Data'),drawnow, end
save(tmp_xdatafile,'x','-ascii','-tabs');
if ~isequal(x,y), save(tmp_ydatafile,'y','-ascii','-tabs'); end
diff --git a/private/show_crp.m b/private/show_crp.m
index f18ae5a7451684fcfcba69311ead183d81c467db..b29b1a120e9dd1d67b533b9a1da80d6eda599792 100644
--- a/private/show_crp.m
+++ b/private/show_crp.m
@@ -10,6 +10,9 @@ function show_crp(X,Shuttle)
% $Revision$
%
% $Log$
+% Revision 4.11 2006/03/29 13:07:40 marwan
+% problems regarding OPRPs and embedding resolved
+%
% Revision 4.10 2005/04/15 09:03:03 marwan
% minor bugfix in plugin section
%
@@ -45,7 +48,7 @@ NY=size(X,1);
switch(Shuttle.mflag)
- case {1,2,3,4,5,6,7,8}
+ case {1,2,3,4,5,6,7,8,9}
errcode=12;
set(findobj('Tag','CRPData',...
@@ -59,14 +62,14 @@ NY=size(X,1);
['Dimension: ', num2str(Shuttle.m), ', Delay: ', num2str(Shuttle.t), ...
', Threshold: ', Shuttle.matext ]);
- if Shuttle.mflag == 7
+ if Shuttle.mflag == 8
titletext=sprintf('%s\n',['Order Matrix']);
- elseif Shuttle.mflag == 8
+ elseif Shuttle.mflag == 9
titletext=sprintf('%s\n',['Order Patterns ', Shuttle.txt_cross,'Recurrence Plot',10,...
'Dimension: ', num2str(Shuttle.m), ' (',num2str(factorial(Shuttle.m)),' order patterns), Delay: ', num2str(Shuttle.t)]);
end
- case {9}
+ case {10}
errcode=13;warning on
X=double(X);