X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=15b0b7768ab496f4e31d3c13f10ac7cb60abf2e3;hp=372028637d51228ac6e17d3f79c3308a2e3a20b9;hb=232c50fed0b80a0f39322a925575f760648ae0a5;hpb=9742fb10fd83e82ad760e4cac5cef3d6dff670ed diff --git a/src/pawns.h b/src/pawns.h index 37202863..15b0b776 100644 --- a/src/pawns.h +++ b/src/pawns.h @@ -1,7 +1,8 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2016 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2015-2017 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 @@ -36,8 +37,8 @@ struct Entry { 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 open_files() const { return openFiles; } int semiopen_file(Color c, File f) const { return semiopenFiles[c] & (1 << f); @@ -52,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)); } @@ -72,9 +73,9 @@ struct Entry { 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;