Mercurial > hg > audiodb
changeset 755:37c2b9cce23a multiprobeLSH
Adding mkc_lsh_update branch, trunk candidate with improved LSH: merged trunk 1095 and branch multiprobe_lsh
| author | mas01mc |
|---|---|
| date | Thu, 25 Nov 2010 13:42:40 +0000 |
| parents | 3e1137d12ecc |
| children | |
| files | lshlib.cpp lshlib.h |
| diffstat | 2 files changed, 0 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lshlib.cpp Mon Oct 04 20:48:58 2010 +0000 +++ b/lshlib.cpp Thu Nov 25 13:42:40 2010 +0000 @@ -1,6 +1,5 @@ #include "lshlib.h" - void err(char*s){cout << s << endl;exit(2);} Uns32T get_page_logn(){ @@ -1255,7 +1254,6 @@ } int G::unserialize_lsh_header(char* filename){ - int dbfid; char* db; // Test to see if file exists @@ -1970,7 +1968,6 @@ pe+=lshHeader->numCols; }while(pe<(SerialElementT*)db+lshHeader->numRows*lshHeader->numCols); } - } void G::serial_bucket_dump(SerialElementT* pe){
--- a/lshlib.h Mon Oct 04 20:48:58 2010 +0000 +++ b/lshlib.h Thu Nov 25 13:42:40 2010 +0000 @@ -96,11 +96,8 @@ //#define LSH_DUMP_CORE_TABLES // set to dump hashtables on load //#define _LSH_DEBUG_ // turn on debugging information - //#define USE_U_FUNCTIONS // set to use partial hashfunction re-use - - // Backward-compatible CORE ARRAY lsh index #define LSH_CORE_ARRAY // Set to use arrays for hashtables rather than linked-lists #define LSH_LIST_HEAD_COUNTERS // Enable counters in hashtable list heads