Changeset 1156 for trunk/yat/classifier

Timestamp:

Feb 26, 2008, 9:46:49 AM (16 years ago)

Author:

Markus Ringnér

Message:

Refs. #335, fixed for KNN

Location:

trunk/yat/classifier

Files:

• KNN.h (modified) (1 diff)
• KNN_ReciprocalRank.cc (modified) (2 diffs)
• KNN_Uniform.cc (modified) (2 diffs)

trunk/yat/classifier/KNN.h

@@ -245 +245 @@
         (*distances)(i,j) = distance_(training1.begin(), training1.end(), 
                                       test1.begin());
+        // If the distance is NaN (no common variables with non-zero weights),
+        // the distance is set to infinity to be sorted as a neighbor at the end
+        if(std::isnan((*distances)(i,j))) 
+          (*distances)(i,j)=std::numeric_limits<double>::infinity();
       }
     }

trunk/yat/classifier/KNN_ReciprocalRank.cc

@@ -7 +7 @@
 #include "yat/utility/VectorMutable.h"
 
+#include <cmath>
 #include <vector>
 
@@ -19 +20 @@
   {           
     for(size_t j=0;j<k_sorted.size();j++) 
-      prediction(target(k_sorted[j]))+=1.0/(j+1);               
+      if(!std::isinf(distance(k_sorted[j])))
+         prediction(target(k_sorted[j]))+=1.0/(j+1);                
   }
 

trunk/yat/classifier/KNN_Uniform.cc

@@ -7 +7 @@
 #include "yat/utility/VectorMutable.h"
 
+#include <cmath>
 #include <vector>
 
@@ -19 +20 @@
   {           
     for(size_t j=0;j<k_sorted.size();j++) 
-      prediction(target(k_sorted[j]))+=1.0;           
+      if(!std::isinf(distance(k_sorted[j])))
+         prediction(target(k_sorted[j]))+=1.0;            
   }