comparison audioDB.cpp @ 66:4c4c4ca6b59e

Fix bugs revealed by test 0009

* initialize the distances (point and track) to something "impossible";
* take the mean of only those points that have actually been found.

   unsigned j=numVectors; // number of query points
   unsigned k,l,n, track, trackOffset=0, processedTracks=0;
   double thisDist;
 
   for(k=0; k<pointNN; k++){
-    distances[k]=0.0;
+    distances[k]=-DBL_MAX;
     qIndexes[k]=~0;
     sIndexes[k]=~0;    
   }
 
   for(k=0; k<trackNN; k++){
-    trackDistances[k]=0.0;
+    trackDistances[k]=-DBL_MAX;
     trackQIndexes[k]=~0;
     trackSIndexes[k]=~0;
     trackIDs[k]=~0;
   }
 

       query+=dbH->dim;
     } // query 
     // Take the average of this track's distance
     // Test the track distances
     thisDist=0;
-    n=pointNN;
-    while(n--)
-      thisDist+=distances[pointNN-n-1];
-    thisDist/=pointNN;
+    for (n = 0; n < pointNN; n++) {
+      if (distances[n] == -DBL_MAX) break;
+      thisDist += distances[n];
+    }
+    thisDist /= n;
+
     n=trackNN;
     while(n--){
       if(thisDist>=trackDistances[n]){
 	if((n==0 || thisDist<=trackDistances[n-1])){
 	  // Copy all values above up the queue

       }
       else
 	break;
     }
     for(unsigned k=0; k<pointNN; k++){
-      distances[k]=0.0;
+      distances[k]=-DBL_MAX;
       qIndexes[k]=~0;
       sIndexes[k]=~0;    
     }
   } // tracks
   gettimeofday(&tv2, NULL);