Changeset 72 for birds/doprediction.m

Timestamp:

07/09/13 15:27:17 (11 years ago)

Author:

vcheplygina

Message:

 

File:

• birds/doprediction.m (modified) (4 diffs)

birds/doprediction.m

@@ -10 +10 @@
 load('birds20130709.mat');
 
-ixtrain = find(J == 0);
-ixtest = find(J == 1);
+%ixtrain = find(J == 0);
+%ixtest = find(J == 1);
+%z=a(ixtest,:);
 
-z=a(ixtest,:);
+
 [bags, labs, bagid] = getbags(z);
 
@@ -22 +23 @@
 
 
-u = milvector([],'e')*scalem([],'variance')*loglc2*classc;
+predictions2 = nan(length(bagid), 19);
+
+%u = simple_mil*classc;
+
+u = milvector([],'m')*scalem([],'variance')*libsvc*classc;
+
 
 %For each class, train a classifier
 for i=1:C
-    a = changelablist(a,i+1);  %Bird 1 is lablist 2, etc
-    x = a(ixtrain, :);
-    z = a(ixtest,:);
+    xtr = changelablist(x,i+1);  %Bird 1 is lablist 2, etc
+    thisll = getlablistnames(xtr);
+    xtr = setname(xtr,strtrim(thisll(curlablist(xtr),:)));
+    xtr=makemillabeled(xtr);
     
-    w = x*u;
-    out = z*w;
+    xte = changelablist(z,i+1);  %Bird 1 is lablist 2, etc
+    thisll = getlablistnames(xte);
+    xte = setname(xte,strtrim(thisll(curlablist(xte),:)));
+    xte=makemillabeled(xte);
+
+
+    %x = a(ixtrain, :);
+    %z = a(ixtest,:);
     
-    try
-        testc(out,'auc')
-    catch
-    end
-            
-    predictions(:,i) = out(:,1);
+    w = xtr*u;
+    out = xte*w;
+    
+ 
+    predictions(:,i) = out(:,2);  %Positive class is column 2
 end
 
@@ -50 +62 @@
 
 fid = fopen('pred20130709.csv', 'w');
-fprintf(fid, '%s,%s,%s\n', 'rec_id', 'species', 'probability');
+fprintf(fid, '%s,%s\r\n', 'Id', 'probability');
 
 for i=1:length(bagid)
@@ -56 +68 @@
     for j=1:C
         if (i==length(bagid) && j==C)
-            fprintf(fid, '%d,%d,%f', bagid(i), j-1, predictions(i,j));
+            fprintf(fid, '%d,%f', bagid(i)*100+(j-1), predictions(i,j));
         else
-            fprintf(fid, '%d,%d,%f\n', bagid(i), j-1, predictions(i,j));
+            fprintf(fid, '%d,%f\r\n', bagid(i)*100+(j-1), predictions(i,j));
         end
     end