From: Marco Costalba Date: Thu, 17 Aug 2017 08:47:32 +0000 (-0700) Subject: Unify stats update() X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=9001f55147fa304223623a6de0025ffe79f5fcc3;hp=ae6a4ebf1f44cb05e96f8f33342ec281b41b0cc0;ds=sidebyside Unify stats update() Now that is a bit bigger makes sense to unify some duplicated code. No functional change. --- diff --git a/src/movepick.h b/src/movepick.h index 41a83604..d6451f6b 100644 --- a/src/movepick.h +++ b/src/movepick.h @@ -35,6 +35,20 @@ struct StatBoards : public std::array, Size1> { T* p = &(*this)[0][0]; std::fill(p, p + sizeof(*this) / sizeof(*p), v); } + + void update(T& entry, int bonus, const int D) { + + assert([&]{ + int v = entry + bonus * 32 - entry * abs(bonus) / D; + return INT16_MIN < v && v < INT16_MAX; + }()); + + assert(abs(bonus) <= D); // Consistency check for below formula + + entry += bonus * 32 - entry * abs(bonus) / D; + + assert(abs(entry) <= 32 * D); + } }; /// ButterflyBoards are 2 tables (one for each color) indexed by the move's from @@ -50,19 +64,7 @@ typedef StatBoards PieceToBoards; struct ButterflyHistory : public ButterflyBoards { void update(Color c, Move m, int bonus) { - - const int D = 324; - auto& entry = (*this)[c][from_to(m)]; - - assert(abs(bonus) <= D); // Consistency check for below formula - assert([&]{ - int v = entry + bonus * 32 - entry * abs(bonus) / D; - return INT16_MIN < v && v < INT16_MAX; - }()); - - entry += bonus * 32 - entry * abs(bonus) / D; - - assert(abs(entry) <= 32 * D); + StatBoards::update((*this)[c][from_to(m)], bonus, 324); } }; @@ -70,19 +72,7 @@ struct ButterflyHistory : public ButterflyBoards { struct PieceToHistory : public PieceToBoards { void update(Piece pc, Square to, int bonus) { - - const int D = 936; - auto& entry = (*this)[pc][to]; - - assert(abs(bonus) <= D); // Consistency check for below formula - assert([&]{ - int v = entry + bonus * 32 - entry * abs(bonus) / D; - return INT16_MIN < v && v < INT16_MAX; - }()); - - entry += bonus * 32 - entry * abs(bonus) / D; - - assert(abs(entry) <= 32 * D); + StatBoards::update((*this)[pc][to], bonus, 936); } };