/*
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-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
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <algorithm>
+
#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)
{ },
{ // Pawn
{ S( 0, 0), S( 0, 0), S( 0, 0), S( 0, 0) },
- { S(-19, 5), S( 1,-4), S( 7, 8), S( 3,-2) },
- { S(-26,-6), S( -7,-5), S( 19, 5), S(24, 4) },
- { S(-25, 1), S(-14, 3), S( 16,-8), S(31,-3) },
- { S(-14, 6), S( 0, 9), S( -1, 7), S(17,-6) },
- { S(-14, 6), S(-13,-5), S(-10, 2), S(-6, 4) },
- { S(-12, 1), S( 15,-9), S( -8, 1), S(-4,18) },
- { S( 0, 0), S( 0, 0), S( 0, 0), S( 0, 0) }
+ { S(-16, 7), S( 1,-4), S( 7, 8), S( 3,-2) },
+ { S(-23,-4), S( -7,-5), S( 19, 5), S(24, 4) },
+ { S(-22, 3), S(-14, 3), S( 20,-8), S(35,-3) },
+ { S(-11, 8), S( 0, 9), S( 3, 7), S(21,-6) },
+ { S(-11, 8), S(-13,-5), S( -6, 2), S(-2, 4) },
+ { S( -9, 3), S( 15,-9), S( -8, 1), S(-4,18) }
},
{ // Knight
{ S(-143, -97), S(-96,-82), S(-80,-46), S(-73,-14) },
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() {
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];
}
}
}