ticket-less improvement of some of the testing scripts

mldrugdiscovery · Jan 7, 2018 · df685db · df685db
1 parent be1b99b
commit df685db
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/scripts/test_run.bat b/scripts/test_run.bat
@@ -84,19 +84,7 @@ if ERRORLEVEL 1 (
   echo "Failure!"
   exit /B 1
 )
-call :do_run 1 "vptree" "-c tuneK=%K%,bucketSize=50,desiredRecall=0.975,chunkBucket=1 " 0
-if ERRORLEVEL 1 (
-  echo "====================================="
-  echo "Failure!"
-  exit /B 1
-)
-call :do_run 1 "vptree" "-c tuneK=%K%,bucketSize=50,desiredRecall=0.95,chunkBucket=1 "  0
-if ERRORLEVEL 1 (
-  echo "====================================="
-  echo "Failure!"
-  exit /B 1
-)
-call :do_run 1 "vptree" "-c tuneK=%K%,bucketSize=50,desiredRecall=0.925,chunkBucket=1 " 0
+call :do_run 1 "vptree" "-c tuneK=%K%,bucketSize=50,desiredRecall=0.95,chunkBucket=1 " 0
 if ERRORLEVEL 1 (
   echo "====================================="
   echo "Failure!"

diff --git a/scripts/test_run.sh b/scripts/test_run.sh
@@ -118,9 +118,7 @@ do_run 1 "hnsw"     " -c M=10 " 1 " -t efSearch=10 -t efSearch=20 -t efSearch=40
 
 # Methods that do not support creation of an index
 do_run 1 "vptree" " -c tuneK=$K,bucketSize=50,desiredRecall=0.99,chunkBucket=1   " "0" "" ""
-do_run 1 "vptree" " -c tuneK=$K,bucketSize=50,desiredRecall=0.975,chunkBucket=1  " "0" "" ""
 do_run 1 "vptree" " -c tuneK=$K,bucketSize=50,desiredRecall=0.95,chunkBucket=1   " "0" "" ""
-do_run 1 "vptree" " -c tuneK=$K,bucketSize=50,desiredRecall=0.925,chunkBucket=1  " "0" "" ""
 do_run 1 "vptree" " -c tuneK=$K,bucketSize=50,desiredRecall=0.9,chunkBucket=1    " "0" "" ""
 
 if [ "$GEN_PLOT" = 1 ] ; then

diff --git a/similarity_search/include/searchoracle.h b/similarity_search/include/searchoracle.h
@@ -53,9 +53,9 @@ const size_t MAX_EXP_DEFAULT          =  1;
 
 const size_t MAX_CACHE_GS_QTY_DEFAULT =  1000;
 const size_t MAX_ITER_DEFAULT         =  10;
-const size_t MAX_REC_DEPTH_DEFAULT    =  6;
+const size_t MAX_REC_DEPTH_DEFAULT    =  5;
 const size_t STEP_N_DEFAULT           =  2;
-const size_t ADD_RESTART_QTY_DEFAULT  =  4;
+const size_t ADD_RESTART_QTY_DEFAULT  =  2;
 const double FULL_FACTOR_DEFAULT      = 8.0;
 
 using std::string;