comparison query.cpp @ 474:f9d86b1db21c

Fixed memory leaks, added WS --no_unit_norming, and removed capping of LSH_N_POINT_BITS to 15 bits, instead allow any number of bits to encode points, remaining bits encode tracks
author mas01mc
date Fri, 09 Jan 2009 18:05:32 +0000
parents 2d5c3f8e8c22
children fd890d2b38da
comparison
equal deleted inserted replaced
471:add65705e655 474:f9d86b1db21c
587 else 587 else
588 if(no_unit_norming) 588 if(no_unit_norming)
589 dist = qn*qn + sn*sn - 2*dist; 589 dist = qn*qn + sn*sn - 2*dist;
590 // else 590 // else
591 // dist = dist; 591 // dist = dist;
592 if((!radius) || dist <= (O2_LSH_EXACT_MULT*radius+O2_DISTANCE_TOLERANCE)) 592 if((!radius) || dist <= (radius+O2_DISTANCE_TOLERANCE))
593 reporter->add_point(pp.trackID, pp.qpos, pp.spos, dist); 593 reporter->add_point(pp.trackID, pp.qpos, pp.spos, dist);
594 } 594 }
595 exact_evaluation_queue->pop(); 595 exact_evaluation_queue->pop();
596 } 596 }
597
598
597 // Cleanup 599 // Cleanup
600 free(data_buffer);
598 SAFE_DELETE_ARRAY(sNorm); 601 SAFE_DELETE_ARRAY(sNorm);
599 SAFE_DELETE_ARRAY(sPower); 602 SAFE_DELETE_ARRAY(sPower);
600 SAFE_DELETE_ARRAY(meanDBdur); 603 SAFE_DELETE_ARRAY(meanDBdur);
601 } 604 }
602 605