Changeset 100

Timestamp:

04/21/15 09:51:26 (10 years ago)

Author:

bduin

Message:

 

File:

• prextra/emc.m (modified) (4 diffs)

prextra/emc.m

@@ -27 +27 @@
 % P.O. Box 5031, 2600 GA Delft, The Netherlands
 
-function w = emc(a,b,classf,labtype,fid)
-        if nargin < 5, fid = []; end
+function w = emc(a,b,classf,labtype)
         if nargin < 4 | isempty(labtype), labtype = 'crisp'; end
         if nargin < 3 | isempty(classf), classf = qdc; end      
@@ -53 +52 @@
         nlab = getnlab(a);
         lablist = getlablist(a);
+  p = getprior(a);
         a = setlabels(a,nlab); 
+  a = setprior(a,p);
         a = setlabtype(a,labtype);
         switch labtype
@@ -61 +62 @@
                         lab = zeros(size(b,1),c);
         end
-        b = dataset(+b);
+        b = prdataset(+b);
         w = a*classf;
         
-        prprogress(fid,'\nem_classifier optimization\n')                
         while change > epsilon
                 d = b*w;
@@ -81 +81 @@
                 c = [a; b];
                 w = c*classf;
-                prprogress(fid,'  change = %d\n', change)
         end