X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=4d65bea2c4e11bffa81eff1702ae0477a0dd2485;hp=95575184c9554279c72793b9787e698244e289dd;hb=c2d42ea8339b49e52a116e488214a14fda09d413;hpb=d3600c39a745179ed6b094b305d0645e83a1ee86
diff --git a/src/pawns.h b/src/pawns.h
index 95575184..4d65bea2 100644
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -1,131 +1,107 @@
/*
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-2010 Marco Costalba, Joona Kiiski, 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
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
Stockfish is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-
#if !defined(PAWNS_H_INCLUDED)
#define PAWNS_H_INCLUDED
-////
-//// Includes
-////
-
#include "position.h"
+#include "tt.h"
+#include "types.h"
+const int PawnTableSize = 16384;
-////
-//// 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
-/// (performed by calling the get_pawn_info method in a PawnInfoTable object)
-/// returns a pointer to a PawnInfo object.
+/// 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 (performed by calling the pawn_info method in a PawnInfoTable
+/// object) returns a pointer to a PawnInfo object.
class PawnInfo {
friend class PawnInfoTable;
public:
- 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;
+ Score pawns_value() const;
+ Bitboard pawn_attacks(Color c) const;
+ Bitboard passed_pawns(Color c) 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;
+
+ template
+ Score king_shelter(const Position& pos, Square ksq);
private:
- void clear();
+ template
+ Score updateShelter(const Position& pos, Square ksq);
Key key;
- Bitboard passedPawns;
- int16_t mgValue, egValue;
- int8_t ksStormValue[2], qsStormValue[2];
- uint8_t halfOpenFiles[2];
+ Bitboard passedPawns[2];
+ Bitboard pawnAttacks[2];
+ Square kingSquares[2];
+ Score value;
+ int halfOpenFiles[2];
+ Score 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
-/// position in the table and returns a pointer to a PawnInfo object.
-
-class PawnInfoTable {
+/// The PawnInfoTable class represents a pawn hash table. The most important
+/// method is pawn_info, which returns a pointer to a PawnInfo object.
+class PawnInfoTable : public SimpleHash {
public:
- PawnInfoTable(unsigned numOfEntries);
- ~PawnInfoTable();
- void clear();
- PawnInfo *get_pawn_info(const Position &pos);
+ PawnInfo* pawn_info(const Position& pos) const;
private:
- unsigned size;
- PawnInfo *entries;
+ template
+ static Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi);
};
-////
-//// 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]);
+inline Bitboard PawnInfo::passed_pawns(Color c) const {
+ return passedPawns[c];
}
-inline Value PawnInfo::queenside_storm_value(Color c) const {
- return Value(qsStormValue[c]);
+inline int PawnInfo::file_is_half_open(Color c, File f) const {
+ return halfOpenFiles[c] & (1 << int(f));
}
-inline bool 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() {
- mgValue = egValue = 0;
- passedPawns = EmptyBoardBB;
- ksStormValue[WHITE] = ksStormValue[BLACK] = 0;
- qsStormValue[WHITE] = qsStormValue[BLACK] = 0;
- halfOpenFiles[WHITE] = halfOpenFiles[BLACK] = 0xFF;
+template
+inline Score PawnInfo::king_shelter(const Position& pos, Square ksq) {
+ return kingSquares[Us] == ksq ? kingShelters[Us] : updateShelter(pos, ksq);
}
-
#endif // !defined(PAWNS_H_INCLUDED)