X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fpawns.h;h=aacaf7247713616910c5e0b5ddb6e3ac68ba04cd;hb=3017e8c60401ecd92468a9ede3368002c4ddd440;hp=3ec62334c96d28cbf68e0a4184d3c4f5da2df780;hpb=3e4dfb49a747be902d25ae06783f98ba29fb5030;p=stockfish
diff --git a/src/pawns.h b/src/pawns.h
index 3ec62334..aacaf724 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-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 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,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(PAWNS_H_INCLUDED)
+#ifndef PAWNS_H_INCLUDED
#define PAWNS_H_INCLUDED
#include "misc.h"
@@ -26,52 +26,58 @@
namespace Pawns {
-/// 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.
+/// Pawns::Entry contains various information about a pawn structure. A lookup
+/// to the pawn hash table (performed by calling the probe function) returns a
+/// pointer to an Entry object.
struct Entry {
- Score pawns_value() const { return value; }
+ Score pawns_score() const { return score; }
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]; }
+ int pawn_span(Color c) const { return pawnSpan[c]; }
+
+ 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 pawns_on_same_color_squares(Color c, Square s) const {
+ return pawnsOnSquares[c][!!(DarkSquares & s)];
+ }
template
Score king_safety(const Position& pos, Square ksq) {
-
- return kingSquares[Us] == ksq && castleRights[Us] == pos.can_castle(Us)
- ? kingSafety[Us] : update_safety(pos, ksq);
+ return kingSquares[Us] == ksq && castlingRights[Us] == pos.can_castle(Us)
+ ? kingSafety[Us] : (kingSafety[Us] = do_king_safety(pos, ksq));
}
template
- Score update_safety(const Position& pos, Square ksq);
+ Score do_king_safety(const Position& pos, Square ksq);
template
Value shelter_storm(const Position& pos, Square ksq);
Key key;
+ Score score;
Bitboard passedPawns[COLOR_NB];
Bitboard pawnAttacks[COLOR_NB];
Square kingSquares[COLOR_NB];
- int minKPdistance[COLOR_NB];
- int castleRights[COLOR_NB];
- Score value;
- int halfOpenFiles[COLOR_NB];
Score kingSafety[COLOR_NB];
- int pawnsOnWhiteSquaresCount[COLOR_NB];
- int pawnsOnBlackSquaresCount[COLOR_NB];
+ int castlingRights[COLOR_NB];
+ int semiopenFiles[COLOR_NB];
+ int pawnSpan[COLOR_NB];
+ int pawnsOnSquares[COLOR_NB][COLOR_NB]; // [color][light/dark squares]
};
typedef HashTable Table;
-Entry* probe(const Position& pos, Table& entries);
+void init();
+Entry* probe(const Position& pos);
-}
+} // namespace Pawns
-#endif // !defined(PAWNS_H_INCLUDED)
+#endif // #ifndef PAWNS_H_INCLUDED