/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008 Marco Costalba
+ Copyright (C) 2008-2009 Marco Costalba
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
//// Includes
////
-#include "position.h"
-
+#include "bitboard.h"
+#include "value.h"
////
//// Types
////
/// PawnInfo is a class which contains various information about a pawn
-/// structure. Currently, it only includes a middle game and an end game
-/// pawn structure evaluation, and a bitboard of passed pawns. We may want
-/// to add further information in the future. A lookup to the pawn hash table
+/// structure. Currently, it only includes a middle game and an end game
+/// pawn structure evaluation, and a bitboard of passed pawns. We may want
+/// to add further information in the future. A lookup to the pawn hash table
/// (performed by calling the get_pawn_info method in a PawnInfoTable object)
/// returns a pointer to a PawnInfo object.
+class Position;
class PawnInfo {
friend class PawnInfoTable;
public:
+ PawnInfo() : key(0) { clear(); }
+
Value mg_value() const;
Value eg_value() const;
Value kingside_storm_value(Color c) const;
Value queenside_storm_value(Color c) const;
Bitboard passed_pawns() const;
- bool file_is_half_open(Color c, File f) const;
- bool has_open_file_to_left(Color c, File f) const;
- bool has_open_file_to_right(Color c, File f) const;
+ int file_is_half_open(Color c, File f) const;
+ int has_open_file_to_left(Color c, File f) const;
+ int has_open_file_to_right(Color c, File f) const;
+ int get_king_shelter(const Position& pos, Color c, Square ksq);
private:
void clear();
+ int updateShelter(const Position& pos, Color c, Square ksq);
Key key;
Bitboard passedPawns;
int16_t mgValue, egValue;
int16_t ksStormValue[2], qsStormValue[2];
uint8_t halfOpenFiles[2];
+ Square kingSquares[2];
+ uint8_t kingShelters[2];
};
-
/// The PawnInfoTable class represents a pawn hash table. It is basically
/// just an array of PawnInfo objects and a few methods for accessing these
/// objects. The most important method is get_pawn_info, which looks up a
public:
PawnInfoTable(unsigned numOfEntries);
~PawnInfoTable();
- void clear();
- PawnInfo *get_pawn_info(const Position &pos);
+ PawnInfo* get_pawn_info(const Position& pos);
private:
unsigned size;
- PawnInfo *entries;
+ PawnInfo* entries;
};
return Value(qsStormValue[c]);
}
-inline bool PawnInfo::file_is_half_open(Color c, File f) const {
+inline int PawnInfo::file_is_half_open(Color c, File f) const {
return (halfOpenFiles[c] & (1 << int(f)));
}
-inline bool PawnInfo::has_open_file_to_left(Color c, File f) const {
+inline int PawnInfo::has_open_file_to_left(Color c, File f) const {
return halfOpenFiles[c] & ((1 << int(f)) - 1);
}
-inline bool PawnInfo::has_open_file_to_right(Color c, File f) const {
+inline int PawnInfo::has_open_file_to_right(Color c, File f) const {
return halfOpenFiles[c] & ~((1 << int(f+1)) - 1);
}
-inline void PawnInfo::clear() {
-
- passedPawns = EmptyBoardBB;
- mgValue = egValue = 0;
- ksStormValue[WHITE] = ksStormValue[BLACK] = 0;
- qsStormValue[WHITE] = qsStormValue[BLACK] = 0;
- halfOpenFiles[WHITE] = halfOpenFiles[BLACK] = 0xFF;
+inline int PawnInfo::get_king_shelter(const Position& pos, Color c, Square ksq) {
+ return (kingSquares[c] == ksq ? kingShelters[c] : updateShelter(pos, c, ksq));
}
-
#endif // !defined(PAWNS_H_INCLUDED)