Changeset 109


Ignore:
Timestamp:
05/24/16 17:21:19 (9 years ago)
Author:
bduin
Message:
 
Location:
prextra
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • prextra/emc.m

    r100 r109  
    7979                lab = labb;
    8080                b = setlabtype(b,labtype,lab);
    81                 c = [a; b];
     81                c = [setlabtype(a,labtype); b];
    8282                w = c*classf;
    8383        end
  • prextra/randomforestc.m

    r102 r109  
    3636            v{i} = decisiontree(+x,getnlab(x),opt.K,opt.featsubset);
    3737        else
     38        prwarning(1,'Slow Matlab code used for training Randomforest classifier')
    3839                v{i} = tree_train(+x,getnlab(x),opt);
    3940        end
     
    4748        nrv = length(v); % nr of trees
    4849    out = zeros(n,K);
    49     if exist('decisiontree')==3
     50    if exist('decisiontree')==3 && false
    5051        for j=1:nrv
    5152            I = decisiontree(v{j},+a);
     
    5455    else
    5556        % the old fashioned slow Matlab code
     57        prwarning(1,'Slow Matlab code used for testing Randomforest classifier')
    5658        for i=1:n
    5759            x = +a(i,:);
Note: See TracChangeset for help on using the changeset viewer.