Union of 2 changes that failed with good score

uriblass · mcostalba · commit 0915f8589573 · 2013-09-01T08:07:21.000-07:00
This is a union of 2 changes: A tweak of recaptures limit from Joona Kiiski http://tests.stockfishchess.org/tests/view/52166d7c0ebc59319a242400 and a tweak of move count pruning from Leonid Pechenik http://tests.stockfishchess.org/tests/view/5217c7e60ebc59319a242456 The set passed both short TC at 30+0.05 LLR: 2.96 (-2.94,2.94) Total: 18936 W: 3723 L: 3566 D: 11647 And the usual long TC at 60+0.05 LLR: 2.95 (-2.94,2.94) Total: 48962 W: 8837 L: 8487 D: 31638 bench: 3453945
diff --git a/src/search.cpp b/src/search.cpp
@@ -153,8 +153,8 @@ void Search::init() {
   // Init futility move count array
   for (d = 0; d < 32; d++)
   {
-      FutilityMoveCounts[0][d] = int(3.001 + 0.3 * pow(double(d       ), 1.8)) * (d < 5 ? 4 : 3) / 4;
-      FutilityMoveCounts[1][d] = int(3.001 + 0.3 * pow(double(d + 0.98), 1.8));
+      FutilityMoveCounts[0][d] = int(3 + 0.3 * pow(double(d       ), 1.8)) * 3/4 + (2 < d && d < 5);
+      FutilityMoveCounts[1][d] = int(3 + 0.3 * pow(double(d + 0.98), 1.8));
   }
 }
 
diff --git a/src/types.h b/src/types.h
@@ -196,7 +196,7 @@ enum Depth {
   DEPTH_ZERO          =  0 * ONE_PLY,
   DEPTH_QS_CHECKS     = -1 * ONE_PLY,
   DEPTH_QS_NO_CHECKS  = -2 * ONE_PLY,
-  DEPTH_QS_RECAPTURES = -7 * ONE_PLY,
+  DEPTH_QS_RECAPTURES = -5 * ONE_PLY,
 
   DEPTH_NONE = -127 * ONE_PLY
 };

Original file line number	Diff line number	Diff line change
`@@ -153,8 +153,8 @@ void Search::init() {`
`153`	`153`	`// Init futility move count array`
`154`	`154`	`for (d = 0; d < 32; d++)`
`155`	`155`	`{`
`156`		`- FutilityMoveCounts[0][d] = int(3.001 + 0.3 * pow(double(d ), 1.8)) * (d < 5 ? 4 : 3) / 4;`
`157`		`- FutilityMoveCounts[1][d] = int(3.001 + 0.3 * pow(double(d + 0.98), 1.8));`
	`156`	`+ FutilityMoveCounts[0][d] = int(3 + 0.3 * pow(double(d ), 1.8)) * 3/4 + (2 < d && d < 5);`
	`157`	`+ FutilityMoveCounts[1][d] = int(3 + 0.3 * pow(double(d + 0.98), 1.8));`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`