From: Marco Costalba Date: Sat, 3 Oct 2009 11:25:51 +0000 (+0200) Subject: Small touches to increased mobility patch X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=1361ba75cb06e9cdb6aa4afd0169112ac039291d Small touches to increased mobility patch No functional change. Signed-off-by: Marco Costalba --- diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 168b9961..0f19783a 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -207,7 +207,7 @@ namespace { ((1ULL << SQ_A8) | (1ULL << SQ_H8)) }; - // The SpaceMask[color] contains the area of the board which is consdered + // The SpaceMask[color] contains the area of the board which is considered // by the space evaluation. In the middle game, each side is given a bonus // based on how many squares inside this area are safe and available for // friendly minor pieces. @@ -555,13 +555,14 @@ namespace { // The squares occupied by enemy pieces (not defended by pawns) will be // counted two times instead of one. The shift (almost) guarantees that - // intersection with b is zero so when we 'or' the two bitboards togheter - // and count we get the correct sum of '1' in b and attacked bitboards. - Bitboard attacked = Us == WHITE ? ((b & pos.pieces_of_color(Them)) >> 1) - : ((b & pos.pieces_of_color(Them)) << 1); + // intersection of the shifted value with b is zero so that after or-ing + // the count of 1s bits is increased by the number of affected squares. + b |= Us == WHITE ? ((b & pos.pieces_of_color(Them)) >> 1) + : ((b & pos.pieces_of_color(Them)) << 1); + // Mobility - int mob = (Piece != QUEEN ? count_1s_max_15(b | attacked) - : count_1s(b | attacked)); + int mob = (Piece != QUEEN ? count_1s_max_15(b) + : count_1s(b)); if (mob > lastIndex[Piece]) mob = lastIndex[Piece];