X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=3ec62334c96d28cbf68e0a4184d3c4f5da2df780;hp=900b0925451c545fe79e5668ede1638bcd43776f;hb=3e4dfb49a747be902d25ae06783f98ba29fb5030;hpb=7b721b3663920a2b74039ad6588ba4ed638c368b
diff --git a/src/pawns.h b/src/pawns.h
index 900b0925..3ec62334 100644
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 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
@@ -17,131 +17,61 @@
along with this program. If not, see .
*/
-
#if !defined(PAWNS_H_INCLUDED)
#define PAWNS_H_INCLUDED
-////
-//// Includes
-////
+#include "misc.h"
+#include "position.h"
+#include "types.h"
-#include "bitboard.h"
-#include "value.h"
+namespace Pawns {
-////
-//// Types
-////
+/// Pawns::Entry contains various information about a pawn structure. Currently,
+/// it only includes a middle game and 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 probe function)
+/// returns a pointer to an Entry object.
-const int PawnTableSize = 16384;
+struct Entry {
-/// 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.
-class Position;
+ Score pawns_value() const { return value; }
+ Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; }
+ Bitboard passed_pawns(Color c) const { return passedPawns[c]; }
+ 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]; }
-class PawnInfo {
+ template
+ Score king_safety(const Position& pos, Square ksq) {
- friend class PawnInfoTable;
+ return kingSquares[Us] == ksq && castleRights[Us] == pos.can_castle(Us)
+ ? kingSafety[Us] : update_safety(pos, ksq);
+ }
-public:
- 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(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;
- Score king_shelter(const Position& pos, Color c, Square ksq);
+ template
+ Score update_safety(const Position& pos, Square ksq);
-private:
- Score updateShelter(const Position& pos, Color c, Square ksq);
+ template
+ Value shelter_storm(const Position& pos, Square ksq);
Key key;
- Bitboard passedPawns[2];
- Bitboard pawnAttacks[2];
- Square kingSquares[2];
+ Bitboard passedPawns[COLOR_NB];
+ Bitboard pawnAttacks[COLOR_NB];
+ Square kingSquares[COLOR_NB];
+ int minKPdistance[COLOR_NB];
+ int castleRights[COLOR_NB];
Score value;
- int ksStormValue[2];
- int qsStormValue[2];
- 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 {
-
- enum SideType { KingSide, QueenSide };
-
-public:
- PawnInfoTable();
- ~PawnInfoTable();
- PawnInfo* get_pawn_info(const Position& pos) const;
- void prefetch(Key key) const;
-
-private:
- template
- Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi) const;
-
- template
- int evaluate_pawn_storm(Square s, Rank r, File f, Bitboard theirPawns) const;
-
- PawnInfo* entries;
+ int halfOpenFiles[COLOR_NB];
+ Score kingSafety[COLOR_NB];
+ int pawnsOnWhiteSquaresCount[COLOR_NB];
+ int pawnsOnBlackSquaresCount[COLOR_NB];
};
+typedef HashTable Table;
-////
-//// Inline functions
-////
-
-inline void PawnInfoTable::prefetch(Key key) const {
-
- unsigned index = unsigned(key & (PawnTableSize - 1));
- PawnInfo* pi = entries + index;
- ::prefetch((char*) pi);
-}
-
-inline Score PawnInfo::pawns_value() const {
- return value;
-}
-
-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 Value PawnInfo::queenside_storm_value(Color c) const {
- return Value(qsStormValue[c]);
-}
-
-inline Bitboard PawnInfo::passed_pawns(Color c) const {
- return passedPawns[c];
-}
-
-inline int PawnInfo::file_is_half_open(Color c, File f) const {
- return (halfOpenFiles[c] & (1 << int(f)));
-}
-
-inline int PawnInfo::has_open_file_to_left(Color c, File f) const {
- return halfOpenFiles[c] & ((1 << int(f)) - 1);
-}
-
-inline int PawnInfo::has_open_file_to_right(Color c, File f) const {
- return halfOpenFiles[c] & ~((1 << int(f+1)) - 1);
-}
+Entry* probe(const Position& pos, Table& entries);
-inline Score PawnInfo::king_shelter(const Position& pos, Color c, Square ksq) {
- return kingSquares[c] == ksq ? kingShelters[c] : updateShelter(pos, c, ksq);
}
#endif // !defined(PAWNS_H_INCLUDED)