X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fpawns.h;h=a84276f82e7036771b59cf2a606a53e4097864d1;hb=6a6fd0b5f51046d09ee1f2377ef14c6aad611b18;hp=307da51c53fb42a4d66ede8c9af0080b1ad03c27;hpb=46409a7852ae22abf9c32cbcfe3b35f164ae8ec5;p=stockfish
diff --git a/src/pawns.h b/src/pawns.h
index 307da51c..a84276f8 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-2014 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"
@@ -27,7 +27,7 @@
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
+/// it only includes a middlegame and endgame 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.
@@ -37,7 +37,8 @@ struct Entry {
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 pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][!!(BlackSquares & s)]; }
+ Bitboard candidate_pawns(Color c) const { return candidatePawns[c]; }
+ int pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][!!(DarkSquares & s)]; }
int semiopen(Color c, File f) const { return semiopenFiles[c] & (1 << int(f)); }
int semiopen_on_side(Color c, File f, bool left) const {
@@ -47,7 +48,7 @@ struct Entry {
template
Score king_safety(const Position& pos, Square ksq) {
- return kingSquares[Us] == ksq && castleRights[Us] == pos.can_castle(Us)
+ return kingSquares[Us] == ksq && castlingFlags[Us] == pos.can_castle(Us)
? kingSafety[Us] : update_safety(pos, ksq);
}
@@ -59,10 +60,11 @@ struct Entry {
Key key;
Bitboard passedPawns[COLOR_NB];
+ Bitboard candidatePawns[COLOR_NB];
Bitboard pawnAttacks[COLOR_NB];
Square kingSquares[COLOR_NB];
int minKPdistance[COLOR_NB];
- int castleRights[COLOR_NB];
+ int castlingFlags[COLOR_NB];
Score value;
int semiopenFiles[COLOR_NB];
Score kingSafety[COLOR_NB];
@@ -71,8 +73,9 @@ struct Entry {
typedef HashTable Table;
+void init();
Entry* probe(const Position& pos, Table& entries);
}
-#endif // !defined(PAWNS_H_INCLUDED)
+#endif // #ifndef PAWNS_H_INCLUDED