comparison audioDB.cpp @ 57:67de6f2c5f7d

Fix a couple of off-by-one errors, including one which was preventing a
sequence match of the length of the track from matching, and one which
was causing the threshold computation to yield NaN for one-frame tracks.

Mark a couple more off-by-one errors as needing to be fixed.

     *pn++=0.0;
   ps=sNorm;
   unsigned processedTracks=0;
   for(i=0; i<dbH->numFiles; i++){
     if(trackTable[i]>sequenceLength-1){
-      w = trackTable[i]-sequenceLength;
+      w = trackTable[i]-sequenceLength+1;
       pn = sMeanL2+i;
       *pn=0;
       while(w--)
 	if(*ps>0)
 	  *pn+=*ps++;
-      *pn/=trackTable[i]-sequenceLength;
+      *pn/=trackTable[i]-sequenceLength+1;
       SILENCE_THRESH+=*pn;
       processedTracks++;
     }
     ps = sNorm + trackTable[i];
   }

     }
 
     trackOffset=trackOffsetTable[track];     // numDoubles offset
     trackIndexOffset=trackOffset/dbH->dim; // numVectors offset
 
-    if(sequenceLength<trackTable[track]){  // test for short sequences
+    if(sequenceLength<=trackTable[track]){  // test for short sequences
       
       if(verbosity>7)
 	cerr << track << "." << trackIndexOffset << "." << trackTable[track] << " | ";cerr.flush();
 		
       // Sum products matrix

 	      thisDist=thisDist; // Computed above
 	    else
 	      thisDist=1000000.0;
 
 	    // k-NN match algorithm
-	    m=pointNN;
+	    m=pointNN; /* FIXME: -1?  distances[pointNN] */
 	    while(m--){
 	      if(thisDist<=distances[m])
 		if(m==0 || thisDist>=distances[m-1]){
 		// Shuffle distances up the list
 		for(l=pointNN-1; l>m; l--){

 	if(verbosity>3)
 	  cerr << fileTable+track*O2_FILETABLESIZE << " " << thisDist << endl;
 
 
 	// All the track stuff goes here
-	n=trackNN;
+	n=trackNN; /* FIXME: trackNN-1 */
 	while(n--){
 	  if(thisDist<=trackDistances[n]){
 	    if((n==0 || thisDist>=trackDistances[n-1])){
 	      // Copy all values above up the queue
 	      for( l=trackNN-1 ; l > n ; l--){