Stat Formula Tweak

VoyagerOne · mcostalba · commit 7d2a79f0372d · 2016-06-10T07:27:47.000+02:00
bonus = d * d + 2 * d - 2

STC:
LLR: 2.94 (-2.94,2.94) [0.00,4.00]
Total: 99444 W: 18274 L: 17778 D: 63392

LTC:
LLR: 2.95 (-2.94,2.94) [0.00,4.00]
Total: 89757 W: 12285 L: 11896 D: 65576

bench: 8276130
diff --git a/src/search.cpp b/src/search.cpp
@@ -1159,7 +1159,7 @@ namespace {
              && !pos.captured_piece_type()
              && is_ok((ss-1)->currentMove))
     {
-        Value bonus = Value((depth / ONE_PLY) * (depth / ONE_PLY) + depth / ONE_PLY - 1);
+        Value bonus = Value((depth / ONE_PLY) * (depth / ONE_PLY) + 2 * depth / ONE_PLY - 2);
         if ((ss-2)->counterMoves)
             (ss-2)->counterMoves->update(pos.piece_on(prevSq), prevSq, bonus);
 
@@ -1439,7 +1439,7 @@ namespace {
         ss->killers[0] = move;
     }
 
-    Value bonus = Value((depth / ONE_PLY) * (depth / ONE_PLY) + depth / ONE_PLY - 1);
+    Value bonus = Value((depth / ONE_PLY) * (depth / ONE_PLY) + 2 * depth / ONE_PLY - 2);
 
     Square prevSq = to_sq((ss-1)->currentMove);
     CounterMoveStats* cmh  = (ss-1)->counterMoves;
@@ -1480,13 +1480,13 @@ namespace {
     if ((ss-1)->moveCount == 1 && !pos.captured_piece_type())
     {
         if ((ss-2)->counterMoves)
-            (ss-2)->counterMoves->update(pos.piece_on(prevSq), prevSq, -bonus - 2 * (depth + 1) / ONE_PLY);
+            (ss-2)->counterMoves->update(pos.piece_on(prevSq), prevSq, -bonus - 2 * (depth + 1) / ONE_PLY - 1);
 
         if ((ss-3)->counterMoves)
-            (ss-3)->counterMoves->update(pos.piece_on(prevSq), prevSq, -bonus - 2 * (depth + 1) / ONE_PLY);
+            (ss-3)->counterMoves->update(pos.piece_on(prevSq), prevSq, -bonus - 2 * (depth + 1) / ONE_PLY - 1);
 
         if ((ss-5)->counterMoves)
-            (ss-5)->counterMoves->update(pos.piece_on(prevSq), prevSq, -bonus - 2 * (depth + 1) / ONE_PLY);
+            (ss-5)->counterMoves->update(pos.piece_on(prevSq), prevSq, -bonus - 2 * (depth + 1) / ONE_PLY - 1);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1159,7 +1159,7 @@ namespace {`
`1159`	`1159`	`&& !pos.captured_piece_type()`
`1160`	`1160`	`&& is_ok((ss-1)->currentMove))`
`1161`	`1161`	`{`
`1162`		`- Value bonus = Value((depth / ONE_PLY) * (depth / ONE_PLY) + depth / ONE_PLY - 1);`
	`1162`	`+ Value bonus = Value((depth / ONE_PLY) * (depth / ONE_PLY) + 2 * depth / ONE_PLY - 2);`
`1163`	`1163`	`if ((ss-2)->counterMoves)`
`1164`	`1164`	`(ss-2)->counterMoves->update(pos.piece_on(prevSq), prevSq, bonus);`
`1165`	`1165`
`@@ -1439,7 +1439,7 @@ namespace {`
`1439`	`1439`	`ss->killers[0] = move;`
`1440`	`1440`	`}`
`1441`	`1441`
`1442`		`- Value bonus = Value((depth / ONE_PLY) * (depth / ONE_PLY) + depth / ONE_PLY - 1);`
	`1442`	`+ Value bonus = Value((depth / ONE_PLY) * (depth / ONE_PLY) + 2 * depth / ONE_PLY - 2);`
`1443`	`1443`
`1444`	`1444`	`Square prevSq = to_sq((ss-1)->currentMove);`
`1445`	`1445`	`CounterMoveStats* cmh = (ss-1)->counterMoves;`
`@@ -1480,13 +1480,13 @@ namespace {`
`1480`	`1480`	`if ((ss-1)->moveCount == 1 && !pos.captured_piece_type())`
`1481`	`1481`	`{`
`1482`	`1482`	`if ((ss-2)->counterMoves)`
`1483`		`- (ss-2)->counterMoves->update(pos.piece_on(prevSq), prevSq, -bonus - 2 * (depth + 1) / ONE_PLY);`
	`1483`	`+ (ss-2)->counterMoves->update(pos.piece_on(prevSq), prevSq, -bonus - 2 * (depth + 1) / ONE_PLY - 1);`
`1484`	`1484`
`1485`	`1485`	`if ((ss-3)->counterMoves)`
`1486`		`- (ss-3)->counterMoves->update(pos.piece_on(prevSq), prevSq, -bonus - 2 * (depth + 1) / ONE_PLY);`
	`1486`	`+ (ss-3)->counterMoves->update(pos.piece_on(prevSq), prevSq, -bonus - 2 * (depth + 1) / ONE_PLY - 1);`
`1487`	`1487`
`1488`	`1488`	`if ((ss-5)->counterMoves)`
`1489`		`- (ss-5)->counterMoves->update(pos.piece_on(prevSq), prevSq, -bonus - 2 * (depth + 1) / ONE_PLY);`
	`1489`	`+ (ss-5)->counterMoves->update(pos.piece_on(prevSq), prevSq, -bonus - 2 * (depth + 1) / ONE_PLY - 1);`
`1490`	`1490`	`}`
`1491`	`1491`	`}`
`1492`	`1492`