X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpsqt.cpp;h=76e4e7decdf439838f2569cafe4b5ac1836dd676;hp=7e645d44335091eeb7949e14b3b97b95467e3190;hb=7eaea3848c9e8a388c0b79cee6fba6bf3cd32108;hpb=aa31f7f096adef50fe119b41d4e7834c41fec310
diff --git a/src/psqt.cpp b/src/psqt.cpp
index 7e645d44..76e4e7de 100644
--- a/src/psqt.cpp
+++ b/src/psqt.cpp
@@ -18,8 +18,14 @@
along with this program. If not, see .
*/
+#include
+
#include "types.h"
+Value PieceValue[PHASE_NB][PIECE_NB] = {
+{ VALUE_ZERO, PawnValueMg, KnightValueMg, BishopValueMg, RookValueMg, QueenValueMg },
+{ VALUE_ZERO, PawnValueEg, KnightValueEg, BishopValueEg, RookValueEg, QueenValueEg } };
+
namespace PSQT {
#define S(mg, eg) make_score(mg, eg)
@@ -96,7 +102,7 @@ const Score Bonus[][RANK_NB][int(FILE_NB) / 2] = {
Score psq[COLOR_NB][PIECE_TYPE_NB][SQUARE_NB];
-// init() initializes piece square tables: the white halves of the tables are
+// init() initializes piece-square tables: the white halves of the tables are
// copied from Bonus[] adding the piece value, then the black halves of the
// tables are initialized by flipping and changing the sign of the white scores.
void init() {
@@ -110,8 +116,9 @@ void init() {
for (Square s = SQ_A1; s <= SQ_H8; ++s)
{
- int edgeDistance = file_of(s) < FILE_E ? file_of(s) : FILE_H - file_of(s);
- psq[BLACK][pt][~s] = -(psq[WHITE][pt][s] = v + Bonus[pt][rank_of(s)][edgeDistance]);
+ File f = std::min(file_of(s), FILE_H - file_of(s));
+ psq[WHITE][pt][ s] = v + Bonus[pt][rank_of(s)][f];
+ psq[BLACK][pt][~s] = -psq[WHITE][pt][s];
}
}
}