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

new neighbourhood criterion: fixed RR

parent ee7ed5ce
No related branches found
Tags v5.10
No related merge requests found
......@@ -79,6 +79,9 @@ function xout=crp(varargin)
% $Revision$
%
% $Log$
% Revision 5.10 2007/03/29 13:17:51 marwan
% uint8 of order patterns and order matrix
%
% Revision 5.9 2006/10/24 14:16:16 marwan
% minor change: sigma in title line of RP shown only for normalised data
%
......@@ -157,7 +160,7 @@ set(0,'ShowHidden','On')
error(nargchk(1,8,nargin));
if nargout>1, error('Too many output arguments'), end
check_meth={'ma','eu','mi','nr','fa','in','om','op','di'}; % maxnorm, euclidean, nrmnorm, fan, distance
check_meth={'ma','eu','mi','nr','fa','in','om','op','rr','di'}; % maxnorm, euclidean, nrmnorm, fan, distance
check_norm={'non','nor'}; % nonormalize, normalize
check_gui={'gui','nog','sil'}; % gui, nogui, silent
......@@ -361,7 +364,8 @@ if nogui>0
tx(6)={'interdependent neighbours'};
tx(7)={'order matrix'};
tx(8)={'order pattern'};
tx(9)={'distance plot'};
tx(9)={'maximum norm fixed RR'};
tx(10)={'distance plot'};
disp(['use method: ', char(tx(method))]);
if nonorm==1, disp('normalize data'); else disp('do not normalize data'); end
end
......@@ -549,7 +553,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) & ~ispc % if plugin exist and method is MAX, MIN, EUC ord DIS
if plugin_exist & ( mflag < 4 | mflag == 8 | mflag == 10 ) & length(x) == length(y) & ~ispc % if plugin exist and method is MAX, MIN, EUC ord DIS
if nogui == 1, disp('(plugin used)'), end
......@@ -577,7 +581,7 @@ switch(action)
%%%%%%%%%%%%%%%%% local CRP, fixed distance
case {1,2,3}
case {1,2,3,9}
errcode=111;
set(findobj('Tag','Status','Parent',findobj('Parent',hCRP,'Tag','CRPPlot')),'String','Reshape Embedding Vectors'),drawnow
......@@ -593,6 +597,13 @@ switch(action)
%%%%%%%%%%%%%%%%% maximum norm
s = max(abs(s1),[],3);
matext=[num2str(round(100*e)/100) unit ' (fixed distance maximum norm)'];
case 9
%%%%%%%%%%%%%%%%% maximum norm, fixed RR
s = max(abs(s1),[],3);
ss = sort(s(:));
idx = ceil(e * length(ss));
e = ss(idx);
matext=[num2str(round(100*e)/100) '\sigma (fixed distance maximum norm, fixed RR)'];
case 2
%%%%%%%%%%%%%%%%% euclidean norm
errcode=112;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment