X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=e26ae67e0f9146d4de45f0ed9526a904404f1617;hp=aacaf7247713616910c5e0b5ddb6e3ac68ba04cd;hb=4c95edddbf1aaec22c343adaca4796df0137e4c3;hpb=be509525336b65419e708678abe4e16efb5f6f4d diff --git a/src/pawns.h b/src/pawns.h index aacaf724..e26ae67e 100644 --- a/src/pawns.h +++ b/src/pawns.h @@ -2,6 +2,7 @@ Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, 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 @@ -35,7 +36,9 @@ struct Entry { 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 pawn_span(Color c) const { return pawnSpan[c]; } + Bitboard pawn_attacks_span(Color c) const { return pawnAttacksSpan[c]; } + int pawn_asymmetry() const { return asymmetry; } + int open_files() const { return openFiles; } int semiopen_file(Color c, File f) const { return semiopenFiles[c] & (1 << f); @@ -50,7 +53,7 @@ struct Entry { } template - Score king_safety(const Position& pos, Square ksq) { + Score king_safety(const Position& pos, Square ksq) { return kingSquares[Us] == ksq && castlingRights[Us] == pos.can_castle(Us) ? kingSafety[Us] : (kingSafety[Us] = do_king_safety(pos, ksq)); } @@ -65,12 +68,14 @@ struct Entry { Score score; Bitboard passedPawns[COLOR_NB]; Bitboard pawnAttacks[COLOR_NB]; + Bitboard pawnAttacksSpan[COLOR_NB]; Square kingSquares[COLOR_NB]; Score kingSafety[COLOR_NB]; int castlingRights[COLOR_NB]; int semiopenFiles[COLOR_NB]; - int pawnSpan[COLOR_NB]; int pawnsOnSquares[COLOR_NB][COLOR_NB]; // [color][light/dark squares] + int asymmetry; + int openFiles; }; typedef HashTable Table;