X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=39fc9e3f16aa94c0acdebe3191448ca32178c0b4;hp=212b14488f116babcd5bd6226000426f9bdce784;hb=3b92159908e7026683d5a6090b7a2d7fb41e97a5;hpb=158014b39d69eaaf791d4913b98ffde5c4d7a874 diff --git a/src/pawns.h b/src/pawns.h index 212b1448..39fc9e3f 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-2012 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 @@ -38,8 +38,10 @@ struct Entry { 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 pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][!!(BlackSquares & s)]; } + int has_open_file_on_side(Color c, File f, bool left) const { + return halfOpenFiles[c] & (left ? ((1 << int(f)) - 1) : ~((1 << int(f+1)) - 1)); + } template Score king_safety(const Position& pos, Square ksq) { @@ -63,6 +65,7 @@ struct Entry { Score value; int halfOpenFiles[COLOR_NB]; Score kingSafety[COLOR_NB]; + int pawnsOnSquares[COLOR_NB][COLOR_NB]; }; typedef HashTable Table;