Changeset 66

Timestamp:

07/08/13 18:17:33 (11 years ago)

Author:

bduin

Message:

 

File:

• distools/protselfd.m (modified) (7 diffs)

distools/protselfd.m

@@ -15 +15 @@
 %
 % OUTPUT
-%   W     Selection mapping ('feature selection')
+%   W     Selection mapping ('feature selection') or prototype indices.
 %   E     Error stimate as a function of number of selected prototypes
 %         (for supervised selection only reliable for prototype sizes >= class size)
@@ -46 +46 @@
 % In case of unsupervised selection the maximum or the mean distances to
 % the nearest prototype are minimized. These criteria are the same as used
-% in the KCENTRE and KMEDIOD cluster procedures.
+% in the KCENTRE and KMEDIOD cluster procedures. What is returned now in W
+% is the (ordered) list of prototype indices and not a mapping.
 %
 % REFERENCE
@@ -60 +61 @@
 % P.O. Box 5031, 2600 GA Delft, The Netherlands
 
-% 
-
 function [R,e,D] = protselfd(D,ksel,type)
 
@@ -77 +76 @@
       [R,e,D,J,nlab,clab] = protselfd(D,ksel,type);
     case {'maxdist','meandist'}
-      R = protselfd_unsuper(D,ksel,type);
+      [R,e] = protselfd_unsuper(D,ksel,type);
     otherwise
       error('Unknown selection type')
@@ -182 +181 @@
 %   D     Square dissimilarity matrix, zeros on diagonal
 %   P     Number of prototypes to be selected
-%   CRIT  'dist' or 'centre'
+%   CRIT  'maxdist' or 'meandist'
 %
 % OUTPUT
@@ -197 +196 @@
 %
 % SEE ALSO
-% KCENTRES
+% KCENTRES, KMEDIODS
 
 % Copyright: R.P.W. Duin, r.p.w.duin@prtools.org
@@ -203 +202 @@
 % P.O. Box 5031, 2600 GA Delft, The Netherlands
 
-function N = protselfd_unsuper(d,p,crit)
+function [N,e] = protselfd_unsuper(d,p,crit)
 
 d = +d;