Changeset 46 for hep2cells/dosimpleofficial.m

Timestamp:

03/26/13 15:32:10 (12 years ago)

Author:

dtax

Message:

Changes....

File:

• hep2cells/dosimpleofficial.m (modified) (4 diffs)

hep2cells/dosimpleofficial.m

@@ -9 +9 @@
 
 % the classifier:
-u =  loglc2;
+%u =  scalem([],'variance')*loglc2([],0.01);
+%u = scalem([],'variance')*knnc;
 u = scalem([],'variance')*liknonc;
+%u = scalem([],'variance')*libsvc([],[],0.01);
+%u = scalem([],'variance')*libsvc([],proxm([],'r',12),1);
 
 % ***************
@@ -21 +24 @@
 % test on image level:
 [labout,truelab] = majorityimagevote(xtest,wtrain);
+%[labout,truelab] = combinecells(xtest,wtrain);
 acc_CI = mean(all(truelab==labout,2));
 c_CI = confmat(truelab,labout);
+if size(c_CI,2)<size(c_CI,1), c_CI = [c_CI zeros(6,1)]; end
 
 % *********************
@@ -56 +61 @@
    % test on images
    [labout,truelab(i,:)] = majorityimagevote(z,w);
+   %[labout,truelab(i,:)] = combinecells(z,w);
    i1 = strmatch(char(truelab(i,:)),ll);
    i2 = strmatch(labout,ll);
@@ -64 +70 @@
 
 dd_message(4,'\n');
+
+save results_liknon ll c_CC acc_CC c_CI acc_CI truelab n c_IC acc_IC c_II acc_II
 
 % show all: