/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
struct Entry {
- Score pawns_score() const { return score; }
+ Score pawn_score(Color c) const { return scores[c]; }
Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; }
Bitboard passed_pawns(Color c) const { return passedPawns[c]; }
+ Bitboard pawn_attacks_span(Color c) const { return pawnAttacksSpan[c]; }
+ int weak_unopposed(Color c) const { return weakUnopposed[c]; }
+ int pawn_asymmetry() const { return asymmetry; }
+ int open_files() const { return openFiles; }
int semiopen_file(Color c, File f) const {
return semiopenFiles[c] & (1 << f);
}
- int semiopen_side(Color c, File f, bool leftSide) const {
- return semiopenFiles[c] & (leftSide ? (1 << f) - 1 : ~((1 << (f + 1)) - 1));
- }
-
- int pawn_span(Color c) const {
- return pawnSpan[c];
- }
-
int pawns_on_same_color_squares(Color c, Square s) const {
- return pawnsOnSquares[c][!!(DarkSquares & s)];
+ return pawnsOnSquares[c][bool(DarkSquares & s)];
}
template<Color Us>
- Score king_safety(const Position& pos, Square ksq) {
+ Score king_safety(const Position& pos, Square ksq) {
return kingSquares[Us] == ksq && castlingRights[Us] == pos.can_castle(Us)
? kingSafety[Us] : (kingSafety[Us] = do_king_safety<Us>(pos, ksq));
}
Value shelter_storm(const Position& pos, Square ksq);
Key key;
- Score score;
+ Score scores[COLOR_NB];
Bitboard passedPawns[COLOR_NB];
Bitboard pawnAttacks[COLOR_NB];
+ Bitboard pawnAttacksSpan[COLOR_NB];
Square kingSquares[COLOR_NB];
Score kingSafety[COLOR_NB];
- int minKingPawnDistance[COLOR_NB];
+ int weakUnopposed[COLOR_NB];
int castlingRights[COLOR_NB];
int semiopenFiles[COLOR_NB];
- int pawnSpan[COLOR_NB];
int pawnsOnSquares[COLOR_NB][COLOR_NB]; // [color][light/dark squares]
+ int asymmetry;
+ int openFiles;
};
typedef HashTable<Entry, 16384> Table;
void init();
-Entry* probe(const Position& pos, Table& entries);
+Entry* probe(const Position& pos);
} // namespace Pawns