changeset 294:071a108580a4

fixed UNIT_TEST_LSH.cpp to work with refactored lshlib and fixed default LSH file FORMAT on serialization.

--- a/MakefileLSH	Wed Jul 30 15:22:22 2008 +0000
+++ b/MakefileLSH	Wed Jul 30 18:00:50 2008 +0000
@@ -1,5 +1,5 @@
-CFLAGS= -O3 -g 
-#CFLAGS= -ggdb --save-temps
+#CFLAGS= -O3 -g 
+CFLAGS= -ggdb --save-temps
 MTSOURCES=mt19937/mt19937ar.c
 CFLAGS+=-DMT19937
 GENGETOPT=gengetopt
@@ -7,12 +7,9 @@
 GSOAP_CPP=-lgsoap++
 GSOAP_INCLUDE=
 
-TARGET=TEST_LSH_LIB
-TARGET2=UNIT_TEST_LSH
-LSHOBS=TEST_LSH_LIB.cpp lshlib.cpp 
-LSHOBS2=UNIT_TEST_LSH.cpp lshlib.cpp
-LSHHDRS=TEST_LSH_LIB.h lshlib.h reporter.h audioDB.h ReporterBase.h
-LSHHDRS2=lshlib.h
+TARGET=UNIT_TEST_LSH
+LSHOBS=UNIT_TEST_LSH.cpp lshlib.cpp
+LSHHDRS=lshlib.h
 
 ifeq ($(shell uname),Linux)
 override CFLAGS+=-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
@@ -20,15 +17,8 @@
 
 all: ${TARGET}
 
-unit: ${TARGET2}
-
 ${TARGET}: ${LSHOBS} ${LSHHDRS} ${MTSOURCES} MakefileLSH
 	${GENGETOPT} -e <gengetopt.in
 	${SOAPCPP2} audioDBws.h
 	g++ -o ${TARGET} ${CFLAGS} ${LSHOBS} ${MTSOURCES}
-	  
-${TARGET2}: ${LSHOBS2} ${LSHHDRS2} ${MTSOURCES} MakefileLSH
-	${GENGETOPT} -e <gengetopt.in
-	${SOAPCPP2} audioDBws.h
-	g++ -o ${TARGET2} ${CFLAGS} ${LSHOBS2} ${MTSOURCES}
 

--- a/UNIT_TEST_LSH.cpp	Wed Jul 30 15:22:22 2008 +0000
+++ b/UNIT_TEST_LSH.cpp	Wed Jul 30 18:00:50 2008 +0000
@@ -51,13 +51,13 @@
     serialized=true;
     trackBase = (lsh->get_maxp()>>N_POINT_BITS)+1; // Our encoding of tracks and points
   }  
-  cout << "k:" << lsh->k << " ";
-  cout << "m:" << lsh->m << "(L:" << lsh->L << ") ";
-  cout << "d:" << lsh->d << " ";
-  cout << "N:" << lsh->N << " ";
-  cout << "C:" << lsh->C << " ";
-  cout << "R:" << lsh->get_radius() << endl;
-  cout << "p:" << lsh->p << endl;
+  cout << "k:" << lsh->get_numFuns() << " ";
+  cout << "L:" << lsh->get_numTables() << " ";
+  cout << "d:" << lsh->get_dataDim() << " ";
+  cout << "N:" << lsh->get_numRows() << " ";
+  cout << "C:" << lsh->get_numCols() << " ";
+  cout << "R:" << lsh->get_radius() << " ";
+  cout << "p:" << lsh->get_maxp() << endl;
   cout.flush();
 
   cout << endl << "Constructing " << nT << " tracks with " << nP << " vectors of dimension " << d << endl;

--- a/lshlib.cpp	Wed Jul 30 15:22:22 2008 +0000
+++ b/lshlib.cpp	Wed Jul 30 18:00:50 2008 +0000
@@ -661,7 +661,7 @@
     lshHeader->maxp=H::maxp;
     // Default to FILEFORMAT1
     if(!(lshHeader->flags&O2_SERIAL_FILEFORMAT2))
-      lshHeader->flags|=O2_SERIAL_FILEFORMAT2;
+      lshHeader->flags|=O2_SERIAL_FILEFORMAT1;
     memcpy((char*)db, (char*)lshHeader, sizeof(SerialHeaderT));
     serial_munmap(db, O2_SERIAL_HEADER_SIZE); // drop mmap
   }