Make imbalance table more clear

No functional change.

diff --git a/src/material.cpp b/src/material.cpp
index b8b6233cc278dc523f94d755c802b90d74480bbe..9a120661eb249306d1a52994a4485ea1b6bf60f9 100644 (file)
--- a/src/material.cpp
+++ b/src/material.cpp
@@ -32,17 +32,18 @@ namespace {
   //                                  pair  pawn knight bishop rook queen
   const int LinearCoefficients[6] = { 1852, -162, -1122, -183,  249, -154 };
 
   //                                  pair  pawn knight bishop rook queen
   const int LinearCoefficients[6] = { 1852, -162, -1122, -183,  249, -154 };
 

-  const int QuadraticCoefficientsSameColor[][PIECE_TYPE_NB] = {
+  const int QuadraticCoefficientsSameSide[][PIECE_TYPE_NB] = {
+    //            OUR PIECES

     // pair pawn knight bishop rook queen
     {   0                               }, // Bishop pair
     {  39,    2                         }, // Pawn
     // pair pawn knight bishop rook queen
     {   0                               }, // Bishop pair
     {  39,    2                         }, // Pawn

-    {  35,  271,  -4                    }, // Knight
+    {  35,  271,  -4                    }, // knight      OUR PIECES

     {   0,  105,   4,    0              }, // Bishop
     { -27,   -2,  46,   100,  -141      }, // Rook
     {-177,   25, 129,   142,  -137,   0 }  // Queen
   };
 
     {   0,  105,   4,    0              }, // Bishop
     { -27,   -2,  46,   100,  -141      }, // Rook
     {-177,   25, 129,   142,  -137,   0 }  // Queen
   };
 

-  const int QuadraticCoefficientsOppositeColor[][PIECE_TYPE_NB] = {
+  const int QuadraticCoefficientsOppositeSide[][PIECE_TYPE_NB] = {

     //           THEIR PIECES
     // pair pawn knight bishop rook queen
     {   0                               }, // Bishop pair
     //           THEIR PIECES
     // pair pawn knight bishop rook queen
     {   0                               }, // Bishop pair


@@ -106,8 +107,8 @@ namespace {
         v = LinearCoefficients[pt1];
 
         for (pt2 = NO_PIECE_TYPE; pt2 <= pt1; ++pt2)
         v = LinearCoefficients[pt1];
 
         for (pt2 = NO_PIECE_TYPE; pt2 <= pt1; ++pt2)

-            v +=  QuadraticCoefficientsSameColor[pt1][pt2] * pieceCount[Us][pt2]
-                + QuadraticCoefficientsOppositeColor[pt1][pt2] * pieceCount[Them][pt2];
+            v +=  QuadraticCoefficientsSameSide[pt1][pt2] * pieceCount[Us][pt2]
+                + QuadraticCoefficientsOppositeSide[pt1][pt2] * pieceCount[Them][pt2];

 
         value += pc * v;
     }
 
         value += pc * v;
     }

diff --git a/src/search.cpp b/src/search.cpp
index f2f640da6326a6dbfcf80cd1a156d80a5ad519fd..22a954ae8eaa2efd757d4df91552aa20693b3a2b 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -885,7 +885,7 @@ moves_loop: // When in check and at SpNode search starts from here
 
           value = -search<NonPV, false>(pos, ss+1, -(alpha+1), -alpha, d, true);
 
 
           value = -search<NonPV, false>(pos, ss+1, -(alpha+1), -alpha, d, true);
 

-          // Research at intermediate depth if reduction is very high
+          // Re-search at intermediate depth if reduction is very high

           if (value > alpha && ss->reduction >= 4 * ONE_PLY)
           {
               Depth d2 = std::max(newDepth - 2 * ONE_PLY, ONE_PLY);
           if (value > alpha && ss->reduction >= 4 * ONE_PLY)
           {
               Depth d2 = std::max(newDepth - 2 * ONE_PLY, ONE_PLY);