X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=d46ff4cdd2272d0bdd48a63c27b338ca244325eb;hp=55bd944df6609a84cbf6e55484106092e3ec5cbd;hb=77fa960f8923ca83ba0391835d50f4230ac6a345;hpb=42b48b08e81b55e385e55b3074b7c59d81809a45 diff --git a/src/pawns.h b/src/pawns.h index 55bd944d..d46ff4cd 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,6 +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]; } + Bitboard pawn_attacks_span(Color c) const { return pawnAttacksSpan[c]; } + int pawn_span(Color c) const { return pawnSpan[c]; } + int pawn_asymmetry() const { return asymmetry; } int semiopen_file(Color c, File f) const { return semiopenFiles[c] & (1 << f); @@ -44,10 +48,6 @@ struct Entry { return semiopenFiles[c] & (leftSide ? (1 << f) - 1 : ~((1 << (f + 1)) - 1)); } - int pawn_span(Color c) const { - return pawnSpan[c]; - } - int pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][!!(DarkSquares & s)]; } @@ -68,13 +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 minKingPawnDistance[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; }; typedef HashTable Table;