mirror of
https://github.com/sockspls/badfish
synced 2025-04-30 16:53:09 +00:00

Remove the RookOnPawn logic (for rook on rank 5 and above aligning with pawns on same row or file) which was overlapping with a few other parameters. Inspired by @31m059 interesting result hinting that a direct attack on pawns instead of PseudoAttacks might work. http://tests.stockfishchess.org/tests/view/5d89a7c70ebc595091801b8d After a few attempts by me and @31m059, and some long STC greens but red LTC, as a proof of concept I first tried a local SPSA at VSTC trying to tune related rook psqt rows, and mainly some rook related stuff in evaluate.cpp. Result was STC green, but still red LTC, Finally a 100M fishtest SPSA at LTC proved successful both at STC and LTC. All this was possible with the awesome fishtest contributors. At some point, I had 850 workers on the last test ! Run as a simplification STC http://tests.stockfishchess.org/tests/view/5d8d68f40ebc590f3beaf171 LLR: 2.96 (-2.94,2.94) [-3.00,1.00] Total: 7399 W: 1693 L: 1543 D: 4163 LTC http://tests.stockfishchess.org/tests/view/5d8d70270ebc590f3beaf63c LLR: 2.95 (-2.94,2.94) [-3.00,1.00] Total: 41617 W: 6981 L: 6894 D: 27742 Closes https://github.com/official-stockfish/Stockfish/pull/2329 bench: 4037914
130 lines
5.3 KiB
C++
130 lines
5.3 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-2019 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] = {
|
|
{ },
|
|
{ },
|
|
{ // Knight
|
|
{ S(-169,-105), S(-96,-74), S(-80,-46), S(-79,-18) },
|
|
{ S( -79, -70), S(-39,-56), S(-24,-15), S( -9, 6) },
|
|
{ S( -64, -38), S(-20,-33), S( 4, -5), S( 19, 27) },
|
|
{ S( -28, -36), S( 5, 0), S( 41, 13), S( 47, 34) },
|
|
{ S( -29, -41), S( 13,-20), S( 42, 4), S( 52, 35) },
|
|
{ S( -11, -51), S( 28,-38), S( 63,-17), S( 55, 19) },
|
|
{ S( -67, -64), S(-21,-45), S( 6,-37), S( 37, 16) },
|
|
{ S(-200, -98), S(-80,-89), S(-53,-53), S(-32,-16) }
|
|
},
|
|
{ // Bishop
|
|
{ S(-44,-63), S( -4,-30), S(-11,-35), S(-28, -8) },
|
|
{ S(-18,-38), S( 7,-13), S( 14,-14), S( 3, 0) },
|
|
{ S( -8,-18), S( 24, 0), S( -3, -7), S( 15, 13) },
|
|
{ S( 1,-26), S( 8, -3), S( 26, 1), S( 37, 16) },
|
|
{ S( -7,-24), S( 30, -6), S( 23,-10), S( 28, 17) },
|
|
{ S(-17,-26), S( 4, 2), S( -1, 1), S( 8, 16) },
|
|
{ S(-21,-34), S(-19,-18), S( 10, -7), S( -6, 9) },
|
|
{ S(-48,-51), S( -3,-40), S(-12,-39), S(-25,-20) }
|
|
},
|
|
{ // Rook
|
|
{ S(-31, -9), S(-20,-13), S(-14,-10), S(-5, -9) },
|
|
{ S(-21,-12), S(-13, -9), S( -8, -1), S( 6, -2) },
|
|
{ S(-25, 6), S(-11, -8), S( -1, -2), S( 3, -6) },
|
|
{ S(-13, -6), S( -5, 1), S( -4, -9), S(-6, 7) },
|
|
{ S(-27, -5), S(-15, 8), S( -4, 7), S( 3, -6) },
|
|
{ S(-22, 6), S( -2, 1), S( 6, -7), S(12, 10) },
|
|
{ S( -2, 4), S( 12, 5), S( 16, 20), S(18, -5) },
|
|
{ S(-17, 18), S(-19, 0), S( -1, 19), S( 9, 13) }
|
|
},
|
|
{ // Queen
|
|
{ S( 3,-69), S(-5,-57), S(-5,-47), S( 4,-26) },
|
|
{ S(-3,-55), S( 5,-31), S( 8,-22), S(12, -4) },
|
|
{ S(-3,-39), S( 6,-18), S(13, -9), S( 7, 3) },
|
|
{ S( 4,-23), S( 5, -3), S( 9, 13), S( 8, 24) },
|
|
{ S( 0,-29), S(14, -6), S(12, 9), S( 5, 21) },
|
|
{ S(-4,-38), S(10,-18), S( 6,-12), S( 8, 1) },
|
|
{ S(-5,-50), S( 6,-27), S(10,-24), S( 8, -8) },
|
|
{ S(-2,-75), S(-2,-52), S( 1,-43), S(-2,-36) }
|
|
},
|
|
{ // 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) }
|
|
}
|
|
};
|
|
|
|
constexpr Score PBonus[RANK_NB][FILE_NB] =
|
|
{ // Pawn (asymmetric distribution)
|
|
{ },
|
|
{ S( 3,-10), S( 3, -6), S( 10, 10), S( 19, 0), S( 16, 14), S( 19, 7), S( 7, -5), S( -5,-19) },
|
|
{ S( -9,-10), S(-15,-10), S( 11,-10), S( 15, 4), S( 32, 4), S( 22, 3), S( 5, -6), S(-22, -4) },
|
|
{ S( -8, 6), S(-23, -2), S( 6, -8), S( 20, -4), S( 40,-13), S( 17,-12), S( 4,-10), S(-12, -9) },
|
|
{ S( 13, 9), S( 0, 4), S(-13, 3), S( 1,-12), S( 11,-12), S( -2, -6), S(-13, 13), S( 5, 8) },
|
|
{ S( -5, 28), S(-12, 20), S( -7, 21), S( 22, 28), S( -8, 30), S( -5, 7), S(-15, 6), S(-18, 13) },
|
|
{ S( -7, 0), S( 7,-11), S( -3, 12), S(-13, 21), S( 5, 25), S(-16, 19), S( 10, 4), S( -8, 7) }
|
|
};
|
|
|
|
#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 = map_to_queenside(file_of(s));
|
|
psq[ pc][ s] = score + (type_of(pc) == PAWN ? PBonus[rank_of(s)][file_of(s)]
|
|
: Bonus[pc][rank_of(s)][f]);
|
|
psq[~pc][~s] = -psq[pc][s];
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace PSQT
|