From: ianfab Date: Wed, 6 Sep 2017 06:12:32 +0000 (+0200) Subject: Extend ShelterWeakness array by dimension isKingFile X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=ed8286eb1bbbbd577f176f5b4407466b90b15146 Extend ShelterWeakness array by dimension isKingFile Use different penalties for weaknesses in the pawn shelter depending on whether it is on the king's file or not. STC LLR: 2.96 (-2.94,2.94) [0.00,5.00] Total: 71617 W: 13471 L: 13034 D: 45112 LTC LLR: 2.95 (-2.94,2.94) [0.00,5.00] Total: 48708 W: 6463 L: 6187 D: 36058 Bench: 5322108 --- diff --git a/src/pawns.cpp b/src/pawns.cpp index f76b0e69..aa36b1e6 100644 --- a/src/pawns.cpp +++ b/src/pawns.cpp @@ -49,32 +49,36 @@ namespace { S(17, 16), S(33, 32), S(0, 0), S(0, 0) }; - // Weakness of our pawn shelter in front of the king by [distance from edge][rank]. + // Weakness of our pawn shelter in front of the king by [isKingFile][distance from edge][rank]. // RANK_1 = 0 is used for files where we have no pawns or our pawn is behind our king. - const Value ShelterWeakness[][RANK_NB] = { - { V(100), V(20), V(10), V(46), V(82), V( 86), V( 98) }, - { V(116), V( 4), V(28), V(87), V(94), V(108), V(104) }, - { V(109), V( 1), V(59), V(87), V(62), V( 91), V(116) }, - { V( 75), V(12), V(43), V(59), V(90), V( 84), V(112) } + const Value ShelterWeakness[][int(FILE_NB) / 2][RANK_NB] = { + { { V( 97), V(17), V( 9), V(44), V( 84), V( 87), V( 99) }, // Not On King file + { V(106), V( 6), V(33), V(86), V( 87), V(104), V(112) }, + { V(101), V( 2), V(65), V(98), V( 58), V( 89), V(115) }, + { V( 73), V( 7), V(54), V(73), V( 84), V( 83), V(111) } }, + { { V(104), V(20), V( 6), V(27), V( 86), V( 93), V( 82) }, // On King file + { V(123), V( 9), V(34), V(96), V(112), V( 88), V( 75) }, + { V(120), V(25), V(65), V(91), V( 66), V( 78), V(117) }, + { V( 81), V( 2), V(47), V(63), V( 94), V( 93), V(104) } } }; // Danger of enemy pawns moving toward our king by [type][distance from edge][rank]. - // For the unopposed and unblocked cases, RANK_1 = 0 is used when opponent has no pawn - // on the given file, or their pawn is behind our king. + // For the unopposed and unblocked cases, RANK_1 = 0 is used when opponent has + // no pawn on the given file, or their pawn is behind our king. const Value StormDanger[][4][RANK_NB] = { - { { V( 0), V(-290), V(-274), V(57), V(41) }, //BlockedByKing + { { V( 0), V(-290), V(-274), V(57), V(41) }, // BlockedByKing { V( 0), V( 60), V( 144), V(39), V(13) }, { V( 0), V( 65), V( 141), V(41), V(34) }, { V( 0), V( 53), V( 127), V(56), V(14) } }, - { { V( 4), V( 73), V( 132), V(46), V(31) }, //Unopposed + { { V( 4), V( 73), V( 132), V(46), V(31) }, // Unopposed { V( 1), V( 64), V( 143), V(26), V(13) }, { V( 1), V( 47), V( 110), V(44), V(24) }, { V( 0), V( 72), V( 127), V(50), V(31) } }, - { { V( 0), V( 0), V( 79), V(23), V( 1) }, //BlockedByPawn + { { V( 0), V( 0), V( 79), V(23), V( 1) }, // BlockedByPawn { V( 0), V( 0), V( 148), V(27), V( 2) }, { V( 0), V( 0), V( 161), V(16), V( 1) }, { V( 0), V( 0), V( 171), V(22), V(15) } }, - { { V(22), V( 45), V( 104), V(62), V( 6) }, //Unblocked + { { V(22), V( 45), V( 104), V(62), V( 6) }, // Unblocked { V(31), V( 30), V( 99), V(39), V(19) }, { V(23), V( 29), V( 96), V(41), V(15) }, { V(21), V( 23), V( 116), V(41), V(15) } } @@ -259,7 +263,7 @@ Value Entry::shelter_storm(const Position& pos, Square ksq) { Rank rkThem = b ? relative_rank(Us, frontmost_sq(Them, b)) : RANK_1; int d = std::min(f, FILE_H - f); - safety -= ShelterWeakness[d][rkUs] + safety -= ShelterWeakness[f == file_of(ksq)][d][rkUs] + StormDanger [f == file_of(ksq) && rkThem == relative_rank(Us, ksq) + 1 ? BlockedByKing : rkUs == RANK_1 ? Unopposed :