Shortcut see_sign() when SEE is known negative

[stockfish] / src / evaluate.cpp

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 35d62ace7e9cc9b34a64990139b3fdb328da5d81..82edeec8ac0c43b666ea6df70d728da0989b62b9 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -245,10 +245,10 @@ namespace {
   // attacks which one.
   const Value MidgameThreatBonus[8][8] = {
       { V(0), V(0), V(0), V(0),  V(0),  V(0), V(0), V(0) }, // not used
-      { V(0),V(30), V(0),V(50), V(70), V(70), V(0), V(0) }, // KNIGHT attacks
-      { V(0),V(30),V(50), V(0), V(70), V(70), V(0), V(0) }, // BISHOP attacks
-      { V(0),V(20),V(40),V(40),  V(0), V(50), V(0), V(0) }, // ROOK attacks
-      { V(0),V(40),V(40),V(40), V(40),  V(0), V(0), V(0) }, // QUEEN attacks
+      { V(0),V(18), V(0),V(37), V(55), V(55), V(0), V(0) }, // KNIGHT attacks
+      { V(0),V(18),V(37), V(0), V(55), V(55), V(0), V(0) }, // BISHOP attacks
+      { V(0), V(9),V(27),V(27),  V(0), V(37), V(0), V(0) }, // ROOK attacks
+      { V(0),V(27),V(27),V(27), V(27),  V(0), V(0), V(0) }, // QUEEN attacks
       { V(0), V(0), V(0), V(0),  V(0),  V(0), V(0), V(0) }, // not used
       { V(0), V(0), V(0), V(0),  V(0),  V(0), V(0), V(0) }, // not used
       { V(0), V(0), V(0), V(0),  V(0),  V(0), V(0), V(0) }  // not used
@@ -256,10 +256,10 @@ namespace {
 
   const Value EndgameThreatBonus[8][8] = {
       { V(0), V(0), V(0), V(0),  V(0),  V(0), V(0), V(0) }, // not used
-      { V(0),V(40), V(0),V(50),V(100),V(100), V(0), V(0) }, // KNIGHT attacks
-      { V(0),V(40),V(50), V(0),V(100),V(100), V(0), V(0) }, // BISHOP attacks
-      { V(0),V(30),V(50),V(50),  V(0), V(50), V(0), V(0) }, // ROOK attacks
-      { V(0),V(40),V(40),V(40), V(40),  V(0), V(0), V(0) }, // QUEEN attacks
+      { V(0),V(37), V(0),V(47), V(97), V(97), V(0), V(0) }, // KNIGHT attacks
+      { V(0),V(37),V(47), V(0), V(97), V(97), V(0), V(0) }, // BISHOP attacks
+      { V(0),V(27),V(47),V(47),  V(0), V(47), V(0), V(0) }, // ROOK attacks
+      { V(0),V(37),V(37),V(37), V(37),  V(0), V(0), V(0) }, // QUEEN attacks
       { V(0), V(0), V(0), V(0),  V(0),  V(0), V(0), V(0) }, // not used
       { V(0), V(0), V(0), V(0),  V(0),  V(0), V(0), V(0) }, // not used
       { V(0), V(0), V(0), V(0),  V(0),  V(0), V(0), V(0) }  // not used
@@ -268,11 +268,11 @@ namespace {
   // ThreatedByPawnPenalty[] contains a penalty according to which piece
   // type is attacked by an enemy pawn.
   const Value MidgameThreatedByPawnPenalty[8] = {
-    V(0), V(0), V(50), V(50), V(70), V(80), V(0), V(0)
+    V(0), V(0), V(56), V(56), V(76), V(86), V(0), V(0)
   };
 
   const Value EndgameThreatedByPawnPenalty[8] = {
-    V(0), V(0), V(70), V(70), V(100), V(120), V(0), V(0)
+    V(0), V(0), V(70), V(70), V(99), V(118), V(0), V(0)
   };
 
   // InitKingDanger[] contains bonuses based on the position of the defending
@@ -1171,8 +1171,8 @@ namespace {
     Square b8 = relative_square(us, (square_file(s) == FILE_A) ? SQ_B8 : SQ_G8);
 
     if (   pos.piece_on(b6) == piece_of_color_and_type(opposite_color(us), PAWN)
-        && pos.see(s, b6) < 0
-        && pos.see(s, b8) < 0)
+        && pos.see(s, b6, false) < 0
+        && pos.see(s, b8, false) < 0)
     {
         ei.mgValue -= Sign[us] * TrappedBishopA7H7Penalty;
         ei.egValue -= Sign[us] * TrappedBishopA7H7Penalty;