X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.cpp;h=b8152f7d2870db93ec92331025f9e247e48f332d;hp=9e46d05d4e74ffc237cc081458e628ffef9ba265;hb=8bfb53efe21c314695220a76ab5555492a3cf94a;hpb=299afcd88653739b80691991f7e5072a0505f542 diff --git a/src/material.cpp b/src/material.cpp index 9e46d05d..b8152f7d 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -34,7 +34,7 @@ namespace { // Polynomial material balance parameters // pair pawn knight bishop rook queen - const int LinearCoefficients[6] = { 1852, -162, -1122, -183, 249, -52 }; + const int LinearCoefficients[6] = { 1852, -162, -1122, -183, 249, -157 }; const int QuadraticCoefficientsSameColor[][PIECE_TYPE_NB] = { // pair pawn knight bishop rook queen @@ -43,7 +43,7 @@ namespace { { 35, 271, -4 }, // Knight { 0, 105, 4, 0 }, // Bishop { -27, -2, 46, 100, -141 }, // Rook - { 58, 29, 83, 148, -163, 0 } // Queen + {-161, 30, 126, 144, -127, 0 } // Queen }; const int QuadraticCoefficientsOppositeColor[][PIECE_TYPE_NB] = { @@ -54,7 +54,7 @@ namespace { { 10, 62, 0 }, // Knight OUR PIECES { 57, 64, 39, 0 }, // Bishop { 50, 40, 23, -22, 0 }, // Rook - { 106, 101, 3, 151, 171, 0 } // Queen + { 103, 90, -40, 142, 268, 0 } // Queen }; // Endgame evaluation and scaling functions are accessed directly and not through @@ -116,16 +116,6 @@ namespace { value += pc * v; } - // Queen vs. 3 minors slightly favours the minors - if (pieceCount[Us][QUEEN] == 1 && pieceCount[Them][QUEEN] == 0) - { - int n = pieceCount[Them][KNIGHT] - pieceCount[Us][KNIGHT]; - int b = pieceCount[Them][BISHOP] - pieceCount[Us][BISHOP]; - - if ((n == 2 && b == 1) || (n == 1 && b == 2)) - value -= 66 * 16; - } - return value; }