Changeset 138 for proiecte/PPPP/ica/nnClassFn.m

Timestamp:

Jan 14, 2010, 4:14:48 PM (14 years ago)

Author:

(none)

Message:

PPPP - ica

File:

• proiecte/PPPP/ica/nnClassFn.m (modified) (3 diffs)

proiecte/PPPP/ica/nnClassFn.m

@@ -17 +17 @@
 
 
-function [testPerf,rankmat,rank] = nnclassFn(train,test,trainClass,answer);
+function [testPerf] = nnclassFn(train,test,trainClass,answer);
 
 numTest = size(test,2);
@@ -29 +29 @@
 [Sdist,nearest] = sort(dists'); %cols of Sdist are distances in ascend order
         %1st row of nearest is index of 1st closest training example
+
+disp(Sdist)
 
 %Create vector with nearest example, and vector with class label.
@@ -43 +45 @@
 
 %get rank = %correct in top N:
-cumtestPerf=0;
-for i = 1:3
-        rankmat(:,i) = trainClass(nearest(i,:)');
-        correcti = find( (rankmat(:,i) - answer == 0));
-        cumtestPerf = cumtestPerf + size(correcti,1) / size(answer,1);
-        rank(i) = cumtestPerf;
-end
+%cumtestPerf=0;
+%for i = 1
+%        rankmat(:,i) = trainClass(nearest(i,:)');
+%        correcti = find( (rankmat(:,i) - answer == 0));
+%        cumtestPerf = cumtestPerf + size(correcti,1) / size(answer,1);
+%        rank(i) = cumtestPerf;
+%end
 
 %For FERET test, want probeID (answer), then rank, then matched ID no.,