X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmaterial.cpp;h=6aeb117aea5cf54befa8f714d3ae4e1eb6eeff5d;hb=4c9b42316112efc7383c27570102d5d528d6af0a;hp=b7db134b9aa35d0a43dae7d4355f71af34a65327;hpb=ab580106fd995c23aaa7c297e9cbd210cfd33f11;p=stockfish diff --git a/src/material.cpp b/src/material.cpp index b7db134b..6aeb117a 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -27,7 +27,7 @@ using namespace std; namespace { - // Polynomial material balance parameters + // Polynomial material imbalance parameters // pair pawn knight bishop rook queen const int Linear[6] = { 1852, -162, -1122, -183, 249, -154 }; @@ -37,7 +37,7 @@ namespace { // pair pawn knight bishop rook queen { 0 }, // Bishop pair { 39, 2 }, // Pawn - { 35, 271, -4 }, // knight OUR PIECES + { 35, 271, -4 }, // Knight OUR PIECES { 0, 105, 4, 0 }, // Bishop { -27, -2, 46, 100, -141 }, // Rook {-177, 25, 129, 142, -137, 0 } // Queen @@ -223,15 +223,6 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) { if (pos.count(BLACK) == 1 && npm_b - npm_w <= BishopValueMg) e->factor[BLACK] = (uint8_t) SCALE_FACTOR_ONEPAWN; - // Compute the space weight - if (npm_w + npm_b >= 2 * QueenValueMg + 4 * RookValueMg + 2 * KnightValueMg) - { - int minorPieceCount = pos.count(WHITE) + pos.count(WHITE) - + pos.count(BLACK) + pos.count(BLACK); - - e->spaceWeight = make_score(minorPieceCount * minorPieceCount, 0); - } - // Evaluate the material imbalance. We use PIECE_TYPE_NONE as a place holder // for the bishop pair "extended piece", which allows us to be more flexible // in defining bishop pair bonuses.