diff audioDB.cpp @ 224:3a81da6fb1d7

Fixes from refactoring branch:

* make O2_MAXFILES twice as big (for KSA_CHARM 1s features);
* read data even when track shorter than sequence.

--- a/audioDB.cpp	Thu Nov 29 16:31:09 2007 +0000
+++ b/audioDB.cpp	Wed Dec 05 13:52:51 2007 +0000
@@ -2006,6 +2006,22 @@
 
     trackIndexOffset=trackOffset/dbH->dim; // numVectors offset
 
+    if (trackTable[track] * sizeof(double) * dbH->dim > data_buffer_size) {
+      if(data_buffer) {
+	free(data_buffer);
+      }
+      { 
+	data_buffer_size = trackTable[track] * sizeof(double) * dbH->dim;
+	void *tmp = malloc(data_buffer_size);
+	if (tmp == NULL) {
+	  error("error allocating data buffer");
+	}
+	data_buffer = (double *) tmp;
+      }
+    }
+    
+    read(dbfid, data_buffer, trackTable[track] * sizeof(double) * dbH->dim);
+
     if(sequenceLength<=trackTable[track]){  // test for short sequences
       
       if(verbosity>7) {
@@ -2025,22 +2041,6 @@
 	assert(DD[j]);
       }
 
-      if (trackTable[track] * sizeof(double) * dbH->dim > data_buffer_size) {
-	if(data_buffer) {
-	  free(data_buffer);
-	}
-	{ 
-	  data_buffer_size = trackTable[track] * sizeof(double) * dbH->dim;
-	  void *tmp = malloc(data_buffer_size);
-	  if (tmp == NULL) {
-	    error("error allocating data buffer");
-	  }
-	  data_buffer = (double *) tmp;
-	}
-      }
-
-      read(dbfid, data_buffer, trackTable[track] * sizeof(double) * dbH->dim);
-
       // Dot product
       for(j=0; j<numVectors; j++)
 	for(k=0; k<trackTable[track]; k++){
@@ -2500,6 +2500,22 @@
 
     trackIndexOffset=trackOffset/dbH->dim; // numVectors offset
 
+    if (trackTable[track] * sizeof(double) * dbH->dim > data_buffer_size) {
+      if(data_buffer) {
+	free(data_buffer);
+      }
+      { 
+	data_buffer_size = trackTable[track] * sizeof(double) * dbH->dim;
+	void *tmp = malloc(data_buffer_size);
+	if (tmp == NULL) {
+	  error("error allocating data buffer");
+	}
+	data_buffer = (double *) tmp;
+      }
+    }
+    
+    read(dbfid, data_buffer, trackTable[track] * sizeof(double) * dbH->dim);
+
     if(sequenceLength<=trackTable[track]){  // test for short sequences
       
       if(verbosity>7) {
@@ -2519,22 +2535,6 @@
 	assert(DD[j]);
       }
 
-      if (trackTable[track] * sizeof(double) * dbH->dim > data_buffer_size) {
-	if(data_buffer) {
-	  free(data_buffer);
-	}
-	{ 
-	  data_buffer_size = trackTable[track] * sizeof(double) * dbH->dim;
-	  void *tmp = malloc(data_buffer_size);
-	  if (tmp == NULL) {
-	    error("error allocating data buffer");
-	  }
-	  data_buffer = (double *) tmp;
-	}
-      }
-
-      read(dbfid, data_buffer, trackTable[track] * sizeof(double) * dbH->dim);
-
       // Dot product
       for(j=0; j<numVectors; j++)
 	for(k=0; k<trackTable[track]; k++){