From 93349d0dbd22f063b39e6815c02835a4748fffbc Mon Sep 17 00:00:00 2001 From: protonspring Date: Tue, 9 Jul 2019 14:03:00 -0600 Subject: [PATCH] Use score instead of array to evaluate shelter This is a non-functional simplification. Instead of an array of values, just use a Score. STC LLR: 2.95 (-2.94,2.94) [-3.00,1.00] Total: 16309 W: 3673 L: 3541 D: 9095 http://tests.stockfishchess.org/tests/view/5d24f3b80ebc5925cf0ceb5b No functional change --- src/pawns.cpp | 14 +++++++------- src/search.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pawns.cpp b/src/pawns.cpp index c85d4fd9..acc3d770 100644 --- a/src/pawns.cpp +++ b/src/pawns.cpp @@ -181,13 +181,13 @@ Entry* probe(const Position& pos) { template void Entry::evaluate_shelter(const Position& pos, Square ksq, Score& shelter) { - constexpr Color Them = (Us == WHITE ? BLACK : WHITE); + constexpr Color Them = (Us == WHITE ? BLACK : WHITE); Bitboard b = pos.pieces(PAWN) & ~forward_ranks_bb(Them, ksq); Bitboard ourPawns = b & pos.pieces(Us); Bitboard theirPawns = b & pos.pieces(Them); - Value bonus[] = { Value(5), Value(5) }; + Score bonus = make_score(5, 5); File center = clamp(file_of(ksq), FILE_B, FILE_G); for (File f = File(center - 1); f <= File(center + 1); ++f) @@ -199,16 +199,16 @@ void Entry::evaluate_shelter(const Position& pos, Square ksq, Score& shelter) { Rank theirRank = b ? relative_rank(Us, frontmost_sq(Them, b)) : RANK_1; int d = std::min(f, ~f); - bonus[MG] += ShelterStrength[d][ourRank]; + bonus += make_score(ShelterStrength[d][ourRank], 0); if (ourRank && (ourRank == theirRank - 1)) - bonus[MG] -= 82 * (theirRank == RANK_3), bonus[EG] -= 82 * (theirRank == RANK_3); + bonus -= make_score(82 * (theirRank == RANK_3), 82 * (theirRank == RANK_3)); else - bonus[MG] -= UnblockedStorm[d][theirRank]; + bonus -= make_score(UnblockedStorm[d][theirRank], 0); } - if (bonus[MG] > mg_value(shelter)) - shelter = make_score(bonus[MG], bonus[EG]); + if (mg_value(bonus) > mg_value(shelter)) + shelter = bonus; } diff --git a/src/search.cpp b/src/search.cpp index b4a69092..8993a4b0 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -1070,7 +1070,7 @@ moves_loop: // When in check, search starts from here Depth r = reduction(improving, depth, moveCount); // Reduction if other threads are searching this position. - if (th.marked()) + if (th.marked()) r += ONE_PLY; // Decrease reduction if position is or has been on the PV -- 2.39.2