Changeset 109

Timestamp:

05/24/16 17:21:19 (8 years ago)

Author:

bduin

Message:

 

Location:

prextra

Files:

• emc.m (modified) (1 diff)
• randomforestc.m (modified) (3 diffs)

prextra/emc.m

@@ -79 +79 @@
                 lab = labb;
                 b = setlabtype(b,labtype,lab);
-                c = [a; b];
+                c = [setlabtype(a,labtype); b];
                 w = c*classf;
         end

prextra/randomforestc.m

@@ -36 +36 @@
             v{i} = decisiontree(+x,getnlab(x),opt.K,opt.featsubset);
         else
+        prwarning(1,'Slow Matlab code used for training Randomforest classifier')
                 v{i} = tree_train(+x,getnlab(x),opt);
         end
@@ -47 +48 @@
         nrv = length(v); % nr of trees
     out = zeros(n,K);
-    if exist('decisiontree')==3
+    if exist('decisiontree')==3 && false
         for j=1:nrv
             I = decisiontree(v{j},+a);
@@ -54 +55 @@
     else
         % the old fashioned slow Matlab code
+        prwarning(1,'Slow Matlab code used for testing Randomforest classifier')
         for i=1:n
             x = +a(i,:);