summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
cc40d1c)
And some little tidy up
No functional change.
extern Bitboard AttackSpanMask[COLOR_NB][SQUARE_NB];
extern Bitboard PseudoAttacks[PIECE_TYPE_NB][SQUARE_NB];
extern Bitboard AttackSpanMask[COLOR_NB][SQUARE_NB];
extern Bitboard PseudoAttacks[PIECE_TYPE_NB][SQUARE_NB];
-const Bitboard WhiteSquares = 0x55AA55AA55AA55AAULL;
const Bitboard BlackSquares = 0xAA55AA55AA55AA55ULL;
/// Overloads of bitwise operators between a Bitboard and a Square for testing
const Bitboard BlackSquares = 0xAA55AA55AA55AA55ULL;
/// Overloads of bitwise operators between a Bitboard and a Square for testing
/// the same color of the given square.
inline Bitboard same_color_squares(Square s) {
/// the same color of the given square.
inline Bitboard same_color_squares(Square s) {
- return Bitboard(0xAA55AA55AA55AA55ULL) & s ? 0xAA55AA55AA55AA55ULL
- : ~0xAA55AA55AA55AA55ULL;
+ return BlackSquares & s ? BlackSquares : ~BlackSquares;
// right to castle.
const Value TrappedRookPenalty = Value(180);
// right to castle.
const Value TrappedRookPenalty = Value(180);
+ // Penalty for bishop with pawns on the same coloured squares
+ const Score BishopPawnsPenalty = make_score(8, 12);
+
// Penalty for a bishop on a1/h1 (a8/h8 for black) which is trapped by
// a friendly pawn on b2/g2 (b7/g7 for black). This can obviously only
// happen in Chess960 games.
// Penalty for a bishop on a1/h1 (a8/h8 for black) which is trapped by
// a friendly pawn on b2/g2 (b7/g7 for black). This can obviously only
// happen in Chess960 games.
// Penalty for bishop with same coloured pawns
if (Piece == BISHOP)
// Penalty for bishop with same coloured pawns
if (Piece == BISHOP)
- score -= make_score(8, 12) * ei.pi->same_colored_pawn_count(s, Us);
+ score -= BishopPawnsPenalty * ei.pi->pawns_on_same_color_squares(Us, s);
// Bishop and knight outposts squares
if ( (Piece == BISHOP || Piece == KNIGHT)
// Bishop and knight outposts squares
if ( (Piece == BISHOP || Piece == KNIGHT)
value += CandidateBonus[relative_rank(Us, s)];
}
value += CandidateBonus[relative_rank(Us, s)];
}
- e->pawnsOnWhiteSquaresCount[Us] = popcount<Max15>(ourPawns & WhiteSquares);
- e->pawnsOnWhiteSquaresCount[Them] = popcount<Max15>(theirPawns & WhiteSquares);
+ e->pawnsOnSquares[Us][BLACK] = popcount<Max15>(ourPawns & BlackSquares);
+ e->pawnsOnSquares[Us][WHITE] = pos.piece_count(Us, PAWN) - e->pawnsOnSquares[Us][BLACK];
- e->pawnsOnBlackSquaresCount[Us] = popcount<Max15>(ourPawns & BlackSquares);
- e->pawnsOnBlackSquaresCount[Them] = popcount<Max15>(theirPawns & BlackSquares);
+ e->pawnsOnSquares[Them][BLACK] = popcount<Max15>(theirPawns & BlackSquares);
+ e->pawnsOnSquares[Them][WHITE] = pos.piece_count(Them, PAWN) - e->pawnsOnSquares[Them][BLACK];
int file_is_half_open(Color c, File f) const { return halfOpenFiles[c] & (1 << int(f)); }
int has_open_file_to_left(Color c, File f) const { return halfOpenFiles[c] & ((1 << int(f)) - 1); }
int has_open_file_to_right(Color c, File f) const { return halfOpenFiles[c] & ~((1 << int(f+1)) - 1); }
int file_is_half_open(Color c, File f) const { return halfOpenFiles[c] & (1 << int(f)); }
int has_open_file_to_left(Color c, File f) const { return halfOpenFiles[c] & ((1 << int(f)) - 1); }
int has_open_file_to_right(Color c, File f) const { return halfOpenFiles[c] & ~((1 << int(f+1)) - 1); }
- int same_colored_pawn_count(Square s, Color c) const { return (BlackSquares & s) ? pawnsOnBlackSquaresCount[c] : pawnsOnWhiteSquaresCount[c]; }
+ int pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][!!(BlackSquares & s)]; }
template<Color Us>
Score king_safety(const Position& pos, Square ksq) {
template<Color Us>
Score king_safety(const Position& pos, Square ksq) {
Score value;
int halfOpenFiles[COLOR_NB];
Score kingSafety[COLOR_NB];
Score value;
int halfOpenFiles[COLOR_NB];
Score kingSafety[COLOR_NB];
- int pawnsOnWhiteSquaresCount[COLOR_NB];
- int pawnsOnBlackSquaresCount[COLOR_NB];
+ int pawnsOnSquares[COLOR_NB][COLOR_NB];
};
typedef HashTable<Entry, 16384> Table;
};
typedef HashTable<Entry, 16384> Table;