comparison audioDB.cpp @ 12:a206d3e91f8b

fixed keyList logic (in sequence match only) to avoid halting just because the database's last key was visited before end of keylist sequence.

     // CLEAN UP
     munmap(indata,statbuf.st_size);
     close(infid);
     munmap(db,O2_DEFAULTDBSIZE);
   }while(!filesIn->eof());
+
+  // mmap the database file
+  if ((db = (char*) mmap(0, O2_DEFAULTDBSIZE, PROT_READ | PROT_WRITE,
+			 MAP_SHARED, dbfid, 0)) == (caddr_t) -1)
+    error("mmap error for creating database");
   
   if(verbosity)
     cerr << COM_BATCHINSERT << " " << dbName << " " << totalVectors << " vectors " 
 	 << totalVectors*dbH->dim*sizeof(double) << " bytes." << endl;
   
   // Report status
   status(dbName);
-
+  
+  munmap(db,O2_DEFAULTDBSIZE);
 }
 
 void audioDB::ws_status(const char*dbName, char* hostport){
   struct soap soap;
   int adbStatusResult;  

   for(seg=0 ; seg < dbH->numFiles ; seg++, processedSegs++){
     if(segFile){
       if(!segFile->eof()){
 	//*segFile>>seg;
 	segFile->getline(nextKey,MAXSTR);
+	if(verbosity>3){
+	  cerr << nextKey << endl;
+	  cerr.flush();
+	}
 	seg=getKeyPos(nextKey);
       }
       else
 	break;
     }

 	*pn+=*ps++;
       *pn/=segTable[i]-sequenceLength+1;
       SILENCE_THRESH+=*pn;
       processedSegs++;
     }
+    ps = sNorm + segTable[i];
   }
   if(verbosity>1)
     cerr << "processedSegs: " << processedSegs << endl;
   SILENCE_THRESH/=processedSegs;
   USE_THRESH=1; // Turn thresholding on

     segOffsetTable[k]=cumSeg;
     cumSeg+=segTable[k]*dbH->dim;
   }
 
   char nextKey [MAXSTR];
-  for(seg=0 ; seg < dbH->numFiles ; seg++, processedSegs++){
+  for(processedSegs=0, seg=0 ; processedSegs < dbH->numFiles ; seg++, processedSegs++){
 
     // get segID from file if using a control file
     if(segFile){
       if(!segFile->eof()){
 	segFile->getline(nextKey,MAXSTR);
 	seg=getKeyPos(nextKey);
       }
       else
 	break;
     }
+
     segOffset=segOffsetTable[seg];     // numDoubles offset
     segIndexOffset=segOffset/dbH->dim; // numVectors offset
 
     if(sequenceLength<segTable[seg]){  // test for short sequences
       

 	      spd+=HOP_SIZE;
 	    }
 	  }
       }
       
-      if(verbosity>3){
+      if(verbosity>3 && usingTimes){
 	cerr << "meanQdur=" << meanQdur << " meanDBdur=" << meanDBdur[seg] << endl;
 	cerr.flush();
       }
 
       if(!usingTimes || 
 	 (usingTimes 
 	  && fabs(meanDBdur[seg]-meanQdur)<meanQdur*timesTol)){
 
-	if(verbosity>3){
+	if(verbosity>3 && usingTimes){
 	  cerr << "within duration tolerance." << endl;
 	  cerr.flush();
 	}
 
 	// Search for minimum distance by shingles (concatenated vectors)

 	    // Power test
 	    if(!USE_THRESH || 
 	       // Threshold on mean L2 of Q and S sequences
 	       (USE_THRESH && qNorm[j]>SILENCE_THRESH && sNorm[k]>SILENCE_THRESH && 
 		// Are both query and target windows above mean energy?
-		(qNorm[j]>qMeanL2*.25 && sNorm[k]>sMeanL2[seg]*.25 &&  diffL2 < DIFF_THRESH )))
+		(qNorm[j]>qMeanL2 && sNorm[k]>sMeanL2[seg] &&  diffL2 < DIFF_THRESH )))
 	      thisDist=DD[j][k]*oneOverWL;
 	    else
 	      thisDist=0.0;
 	    
 	    // NBest match algorithm

 	thisDist=0.0;
 	for(m=0; m<pointNN; m++)
 	  thisDist+=distances[m];
 	thisDist/=pointNN;
 	
+	// Let's see the distances then...
+	if(verbosity>3)
+	  cerr << "d[" << fileTable+seg*O2_FILETABLESIZE << "]=" << thisDist << endl;
+
 	// All the seg stuff goes here
 	n=segNN;
 	while(n--){
 	  if(thisDist>=segDistances[n]){
 	    if((n==0 || thisDist<=segDistances[n-1])){