X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.cpp;h=068d88e702092a67259ae312165bb33683cb101e;hp=4fd125de25bc5e1740f774e2eff0e07a7871a05f;hb=b9768b8bc5ec9e814faedccf557d0304997d8aaf;hpb=53c04c0429c3e3d8988ec92dc949cc6c67919378 diff --git a/src/material.cpp b/src/material.cpp index 4fd125de..068d88e7 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -35,11 +35,9 @@ namespace { const int NoPawnsSF[4] = { 6, 12, 32 }; // Polynomial material balance parameters - const Value RedundantQueen = Value(320); - const Value RedundantRook = Value(554); // pair pawn knight bishop rook queen - const int LinearCoefficients[6] = { 1852, -162, -1122, -183, 105, 26 }; + const int LinearCoefficients[6] = { 1852, -162, -1122, -183, 249, -52 }; const int QuadraticCoefficientsSameColor[][PIECE_TYPE_NB] = { // pair pawn knight bishop rook queen @@ -47,8 +45,8 @@ namespace { { 39, 2 }, // Pawn { 35, 271, -4 }, // Knight { 0, 105, 4, 0 }, // Bishop - { -27, -2, 46, 100, 56 }, // Rook - { 58, 29, 83, 148, -3, -25 } // Queen + { -27, -2, 46, 100, -141 }, // Rook + { 58, 29, 83, 148, -163, 0 } // Queen }; const int QuadraticCoefficientsOppositeColor[][PIECE_TYPE_NB] = { @@ -106,12 +104,6 @@ namespace { int pt1, pt2, pc, v; int value = 0; - // Redundancy of major pieces, formula based on Kaufman's paper - // "The Evaluation of Material Imbalances in Chess" - if (pieceCount[Us][ROOK] > 0) - value -= RedundantRook * (pieceCount[Us][ROOK] - 1) - + RedundantQueen * pieceCount[Us][QUEEN]; - // Second-degree polynomial material imbalance by Tord Romstad for (pt1 = NO_PIECE_TYPE; pt1 <= QUEEN; ++pt1) {