Changeset 79 for distools/discc.m

Timestamp:

07/23/13 12:22:18 (11 years ago)

Author:

bduin

Message:

 

File:

• distools/discc.m (modified) (4 diffs)

distools/discc.m

@@ -34 +34 @@
 if nargin < 1 | isempty(d)
         if isstr(par)   % untrained classifier, par = 'loo' or 'all'
-                W = mapping('discc',par);
+                W = prmapping('discc',par);
         else                    % fixed classifier, par = knn
-                W = mapping('discc','fixed',par);
+                W = prmapping('discc','fixed',par);
         end
         return
 end
 
-[nlab,lablist,m,k,c,p,featlist] = dataset(d);
+[nlab,lablist,m,k,c,p,featlist] = prdataset(d);
 [clab,classlist] = renumlab(featlist);
 c = size(classlist,1);
@@ -78 +78 @@
                         K = K+k;
                 end
-                w = +(dataset(s,2-(t==r))*loglc);
-                W = mapping('discc',w,lablist,k,c,1);
+                w = +(prdataset(s,2-(t==r))*loglc);
+                W = prmapping('discc',w,lablist,k,c,1);
         elseif strcmp(par,'all')
                 n = m*k;
@@ -92 +92 @@
                         K = K+k;
                 end
-                w = +(dataset(s,2-(t==r))*loglc);
-                W = mapping('discc',w,lablist,k,c,1);
+                w = +(prdataset(s,2-(t==r))*loglc);
+                W = prmapping('discc',w,lablist,k,c,1);
         else
                 error(['Unknown option ''' par ''''])
@@ -102 +102 @@
         % testing for given mapping
                 
-        if isa(par,'mapping')
+        if isa(par,'prmapping')
                 w = +par;
                 W = d*w(1) + w(2);