mirror of
https://github.com/sockspls/badfish
synced 2025-05-01 09:13:08 +00:00

a) Reduce PSQT values along the long diagonals on non-central squares and increase the LongDiagonal bonus accordingly. The effect is to penalise bishops on the long diagonal which can not "see" the 2 central squares. The "good" bishops still have more or less the same bonus as current master. b) For a bishop on a central square, because of the "| s" term in the code, the LongDiagonalBonus was always given. So while being there, remove the "| s" and compensate the central Bishop PSQT accordingly. Passed STC LLR: 2.95 (-2.94,2.94) [0.00,4.00] Total: 44498 W: 9658 L: 9323 D: 25517 http://tests.stockfishchess.org/tests/view/5b8992770ebc592cf2748942 Passed LTC LLR: 2.95 (-2.94,2.94) [0.00,4.00] Total: 63092 W: 10324 L: 9975 D: 42793 http://tests.stockfishchess.org/tests/view/5b89a17a0ebc592cf2748b59 Closes https://github.com/official-stockfish/Stockfish/pull/1760 bench: 4693901
126 lines
4.8 KiB
C++
126 lines
4.8 KiB
C++
/*
|
|
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-2018 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
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
Stockfish is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
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)
|
|
|
|
// Bonus[PieceType][Square / 2] contains Piece-Square scores. For each piece
|
|
// type on a given square a (middlegame, endgame) score pair is assigned. Table
|
|
// is defined for files A..D and white side: it is symmetric for black side and
|
|
// second half of the files.
|
|
constexpr Score Bonus[][RANK_NB][int(FILE_NB) / 2] = {
|
|
{ },
|
|
{ // Pawn
|
|
{ S( 0, 0), S( 0, 0), S( 0, 0), S( 0, 0) },
|
|
{ S(-11, 7), S( 6,-4), S( 7, 8), S( 3,-2) },
|
|
{ S(-18,-4), S( -2,-5), S( 19, 5), S(24, 4) },
|
|
{ S(-17, 3), S( -9, 3), S( 20,-8), S(35,-3) },
|
|
{ S( -6, 8), S( 5, 9), S( 3, 7), S(21,-6) },
|
|
{ S( -6, 8), S( -8,-5), S( -6, 2), S(-2, 4) },
|
|
{ S( -4, 3), S( 20,-9), S( -8, 1), S(-4,18) }
|
|
},
|
|
{ // Knight
|
|
{ S(-161,-105), S(-96,-82), S(-80,-46), S(-73,-14) },
|
|
{ S( -83, -69), S(-43,-54), S(-21,-17), S(-10, 9) },
|
|
{ S( -71, -50), S(-22,-39), S( 0, -7), S( 9, 28) },
|
|
{ S( -25, -41), S( 18,-25), S( 43, 6), S( 47, 38) },
|
|
{ S( -26, -46), S( 16,-25), S( 38, 3), S( 50, 40) },
|
|
{ S( -11, -54), S( 37,-38), S( 56, -7), S( 65, 27) },
|
|
{ S( -63, -65), S(-19,-50), S( 5,-24), S( 14, 13) },
|
|
{ S(-195,-109), S(-67,-89), S(-42,-50), S(-29,-13) }
|
|
},
|
|
{ // Bishop
|
|
{ S(-64,-58), S(-13,-31), S(-25,-37), S(-34,-19) },
|
|
{ S(-20,-34), S( 0, -9), S( 12,-14), S( 1, 4) },
|
|
{ S( -9,-23), S( 27, 0), S( 1, -3), S( 11, 16) },
|
|
{ S(-11,-26), S( 28, -3), S( 21, -5), S( 32, 16) },
|
|
{ S(-11,-26), S( 27, -4), S( 16, -7), S( 31, 14) },
|
|
{ S(-17,-24), S( 16, -2), S( -8, 0), S( 2, 13) },
|
|
{ S(-23,-34), S( -3,-10), S( 6,-12), S( -2, 6) },
|
|
{ S(-55,-55), S(-11,-32), S(-19,-36), S(-29,-17) }
|
|
},
|
|
{ // Rook
|
|
{ S(-25, 0), S(-16, 0), S(-16, 0), S(-9, 0) },
|
|
{ S(-21, 0), S( -8, 0), S( -3, 0), S( 0, 0) },
|
|
{ S(-21, 0), S( -9, 0), S( -4, 0), S( 2, 0) },
|
|
{ S(-22, 0), S( -6, 0), S( -1, 0), S( 2, 0) },
|
|
{ S(-22, 0), S( -7, 0), S( 0, 0), S( 1, 0) },
|
|
{ S(-21, 0), S( -7, 0), S( 0, 0), S( 2, 0) },
|
|
{ S(-12, 0), S( 4, 0), S( 8, 0), S(12, 0) },
|
|
{ S(-23, 0), S(-15, 0), S(-11, 0), S(-5, 0) }
|
|
},
|
|
{ // Queen
|
|
{ S( 0,-71), S(-4,-56), S(-3,-42), S(-1,-29) },
|
|
{ S(-4,-56), S( 6,-30), S( 9,-21), S( 8, -5) },
|
|
{ S(-2,-39), S( 6,-17), S( 9, -8), S( 9, 5) },
|
|
{ S(-1,-29), S( 8, -5), S(10, 9), S( 7, 19) },
|
|
{ S(-3,-27), S( 9, -5), S( 8, 10), S( 7, 21) },
|
|
{ S(-2,-40), S( 6,-16), S( 8,-10), S(10, 3) },
|
|
{ S(-2,-55), S( 7,-30), S( 7,-21), S( 6, -6) },
|
|
{ S(-1,-74), S(-4,-55), S(-1,-43), S( 0,-30) }
|
|
},
|
|
{ // King
|
|
{ S(272, 0), S(325, 41), S(273, 80), S(190, 93) },
|
|
{ S(277, 57), S(305, 98), S(241,138), S(183,131) },
|
|
{ S(198, 86), S(253,138), S(168,165), S(120,173) },
|
|
{ S(169,103), S(191,152), S(136,168), S(108,169) },
|
|
{ S(145, 98), S(176,166), S(112,197), S(69, 194) },
|
|
{ S(122, 87), S(159,164), S(85, 174), S(36, 189) },
|
|
{ S(87, 40), S(120, 99), S(64, 128), S(25, 141) },
|
|
{ S(64, 5), S(87, 60), S(49, 75), S(0, 75) }
|
|
}
|
|
};
|
|
|
|
#undef S
|
|
|
|
Score psq[PIECE_NB][SQUARE_NB];
|
|
|
|
// 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 (Piece pc = W_PAWN; pc <= W_KING; ++pc)
|
|
{
|
|
PieceValue[MG][~pc] = PieceValue[MG][pc];
|
|
PieceValue[EG][~pc] = PieceValue[EG][pc];
|
|
|
|
Score score = make_score(PieceValue[MG][pc], PieceValue[EG][pc]);
|
|
|
|
for (Square s = SQ_A1; s <= SQ_H8; ++s)
|
|
{
|
|
File f = std::min(file_of(s), ~file_of(s));
|
|
psq[ pc][ s] = score + Bonus[pc][rank_of(s)][f];
|
|
psq[~pc][~s] = -psq[pc][s];
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace PSQT
|