comparison audioDB.cpp @ 296:f922c234462f

fixed file size allocation for FORMAT2 files. Made LSH index size() in bytes an unsigned long long. Changed the name of lsh_inCore flag to lsh_on_disk (to reverse the sense of the 'flag').

       error("INDEXing requires 1 <= sequenceLength <= 1000");
     command=COM_INDEX;
     dbName=args_info.database_arg;
 
     // Whether to store LSH hash tables for query in core (FORMAT2)
-    lsh_in_core = args_info.lsh_inCore_flag;
+    lsh_in_core = args_info.lsh_on_disk_flag; // This flag is set to 0 if on_disk requested
 
     lsh_param_w = args_info.lsh_w_arg;
     if(!(lsh_param_w>0 && lsh_param_w<=O2_SERIAL_MAX_BINWIDTH))
       error("Indexing parameter w out of range (0.0 < w <= 100.0)");
 

     
     lsh_param_b = args_info.lsh_b_arg;
     if(!(lsh_param_b>0 && lsh_param_b<=O2_SERIAL_MAX_TRACKBATCH))
       error("Indexing parameter b out of range (1 <= b <= 10000)");
     
-    lsh_param_ncols = args_info.lsh_ncols_arg;
+    lsh_param_ncols = args_info.lsh_ncols_arg;    
+    if(lsh_in_core) // We don't want to block rows with FORMAT2 indexing
+      lsh_param_ncols = O2_SERIAL_MAX_COLS;
     if( !(lsh_param_ncols>0 && lsh_param_ncols<=O2_SERIAL_MAX_COLS))
       error("Indexing parameter ncols out of range (1 <= ncols <= 1000");
 
     return 0;
   }

       usingQueryPoint=1;
       if(queryPoint<0 || queryPoint >10000)
         error("queryPoint out of range: 0 <= queryPoint <= 10000");
     }
 
-    // Whether to pre-load LSH hash tables for query
-    lsh_in_core = args_info.lsh_inCore_flag;
+    // Whether to pre-load LSH hash tables for query (default on, if flag set then off)
+    lsh_in_core = args_info.lsh_on_disk_flag;
 
     // Whether to perform exact evaluation of points returned by LSH
     lsh_exact = args_info.lsh_exact_flag;
 
     pointNN = args_info.pointnn_arg;