friend class PawnInfoTable;
public:
- PawnInfo() : key(0) { clear(); }
+ PawnInfo() { clear(); }
- Value mg_value() const;
- Value eg_value() const;
+ Score pawns_value() const;
Value kingside_storm_value(Color c) const;
Value queenside_storm_value(Color c) const;
+ Bitboard pawn_attacks(Color c) const;
Bitboard passed_pawns() const;
int file_is_half_open(Color c, File f) const;
int has_open_file_to_left(Color c, File f) const;
int get_king_shelter(const Position& pos, Color c, Square ksq);
private:
- inline void clear();
+ void clear();
int updateShelter(const Position& pos, Color c, Square ksq);
Key key;
Bitboard passedPawns;
- int16_t mgValue, egValue;
+ Bitboard pawnAttacks[2];
+ Score value;
int16_t ksStormValue[2], qsStormValue[2];
uint8_t halfOpenFiles[2];
Square kingSquares[2];
- int16_t kingShelters[2];
+ uint8_t kingShelters[2];
};
/// The PawnInfoTable class represents a pawn hash table. It is basically
PawnInfo* get_pawn_info(const Position& pos);
private:
+ template<Color Us>
+ Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi);
+
unsigned size;
PawnInfo* entries;
};
//// Inline functions
////
-inline Value PawnInfo::mg_value() const {
- return Value(mgValue);
-}
-
-inline Value PawnInfo::eg_value() const {
- return Value(egValue);
+inline Score PawnInfo::pawns_value() const {
+ return value;
}
inline Bitboard PawnInfo::passed_pawns() const {
return passedPawns;
}
+inline Bitboard PawnInfo::pawn_attacks(Color c) const {
+ return pawnAttacks[c];
+}
+
inline Value PawnInfo::kingside_storm_value(Color c) const {
return Value(ksStormValue[c]);
}
return (kingSquares[c] == ksq ? kingShelters[c] : updateShelter(pos, c, ksq));
}
-inline void PawnInfo::clear() {
-
- passedPawns = EmptyBoardBB;
- mgValue = egValue = 0;
- ksStormValue[WHITE] = ksStormValue[BLACK] = 0;
- qsStormValue[WHITE] = qsStormValue[BLACK] = 0;
- halfOpenFiles[WHITE] = halfOpenFiles[BLACK] = 0xFF;
- kingSquares[WHITE] = kingSquares[BLACK] = SQ_NONE;
-}
-
-
#endif // !defined(PAWNS_H_INCLUDED)