mirror of
https://github.com/HChaZZY/Stockfish.git
synced 2025-12-21 01:27:16 +08:00
Remove pawncount array in imbalance
This is a natural follow up to last commit where values on the QuadraticOurs diagonal and some piece value deltas were changed. @Stefano80 tried to simplify the newly introduced pawncount array using QuadraticOurs[1][1] =52 and a -30 adjustment on pawn values His STC [-3,1] was green http://tests.stockfishchess.org/tests/view/5b707f5b0ebc5902bdba2745 but not his LTC[-3,1] http://tests.stockfishchess.org/tests/view/5b7095700ebc5902bdba2a49 So I started a 80000 30+0.3 SPSA on the QuadraticOurs diagonal and on the piece values using @Stefano80 start values. SPSA gave the new values QuadraticOurs[1][1] =38 and a -33 on pawn values (the other changes on QuadraticOurs were kept, but were not ignificant according to this test http://tests.stockfishchess.org/tests/view/5b710ccb0ebc5902bdba2f27) STC http://tests.stockfishchess.org/tests/view/5b710b220ebc5902bdba2f19 LLR: 2.95 (-2.94,2.94) [-3.00,1.00] Total: 50902 W: 11214 L: 11150 D: 28538 LTC http://tests.stockfishchess.org/tests/view/5b7124ef0ebc5902bdba3106 LLR: 2.96 (-2.94,2.94) [-3.00,1.00] Total: 34271 W: 5852 L: 5753 D: 22666 Closes https://github.com/official-stockfish/Stockfish/pull/1735 bench: 4738555
This commit is contained in:
committed by
Stéphane Nicolet
parent
41cc4eb953
commit
4d22d3e52d
@@ -34,12 +34,12 @@ namespace {
|
|||||||
constexpr int QuadraticOurs[][PIECE_TYPE_NB] = {
|
constexpr int QuadraticOurs[][PIECE_TYPE_NB] = {
|
||||||
// OUR PIECES
|
// OUR PIECES
|
||||||
// pair pawn knight bishop rook queen
|
// pair pawn knight bishop rook queen
|
||||||
{1443 }, // Bishop pair
|
{1438 }, // Bishop pair
|
||||||
{ 40, 0 }, // Pawn
|
{ 40, 38 }, // Pawn
|
||||||
{ 32, 255, -67 }, // Knight OUR PIECES
|
{ 32, 255, -62 }, // Knight OUR PIECES
|
||||||
{ 0, 104, 4, 0 }, // Bishop
|
{ 0, 104, 4, 0 }, // Bishop
|
||||||
{ -26, -2, 47, 105, -221 }, // Rook
|
{ -26, -2, 47, 105, -208 }, // Rook
|
||||||
{-189, 24, 117, 133, -134, -10 } // Queen
|
{-189, 24, 117, 133, -134, -6 } // Queen
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr int QuadraticTheirs[][PIECE_TYPE_NB] = {
|
constexpr int QuadraticTheirs[][PIECE_TYPE_NB] = {
|
||||||
@@ -53,8 +53,6 @@ namespace {
|
|||||||
{ 97, 100, -42, 137, 268, 0 } // Queen
|
{ 97, 100, -42, 137, 268, 0 } // Queen
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr int PawnCount[] = { 0, 304, 144, -320, -560, -704, -672, -464, -320 };
|
|
||||||
|
|
||||||
// Endgame evaluation and scaling functions are accessed directly and not through
|
// Endgame evaluation and scaling functions are accessed directly and not through
|
||||||
// the function maps because they correspond to more than one material hash key.
|
// the function maps because they correspond to more than one material hash key.
|
||||||
Endgame<KXK> EvaluateKXK[] = { Endgame<KXK>(WHITE), Endgame<KXK>(BLACK) };
|
Endgame<KXK> EvaluateKXK[] = { Endgame<KXK>(WHITE), Endgame<KXK>(BLACK) };
|
||||||
@@ -91,7 +89,7 @@ namespace {
|
|||||||
|
|
||||||
constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
|
constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
|
||||||
|
|
||||||
int bonus = PawnCount[pieceCount[Us][PAWN]];
|
int bonus = 0;
|
||||||
|
|
||||||
// Second-degree polynomial material imbalance, by Tord Romstad
|
// Second-degree polynomial material imbalance, by Tord Romstad
|
||||||
for (int pt1 = NO_PIECE_TYPE; pt1 <= QUEEN; ++pt1)
|
for (int pt1 = NO_PIECE_TYPE; pt1 <= QUEEN; ++pt1)
|
||||||
|
|||||||
@@ -182,11 +182,11 @@ enum Value : int {
|
|||||||
VALUE_MATE_IN_MAX_PLY = VALUE_MATE - 2 * MAX_PLY,
|
VALUE_MATE_IN_MAX_PLY = VALUE_MATE - 2 * MAX_PLY,
|
||||||
VALUE_MATED_IN_MAX_PLY = -VALUE_MATE + 2 * MAX_PLY,
|
VALUE_MATED_IN_MAX_PLY = -VALUE_MATE + 2 * MAX_PLY,
|
||||||
|
|
||||||
PawnValueMg = 175, PawnValueEg = 240,
|
PawnValueMg = 142, PawnValueEg = 207,
|
||||||
KnightValueMg = 784, KnightValueEg = 868,
|
KnightValueMg = 784, KnightValueEg = 868,
|
||||||
BishopValueMg = 831, BishopValueEg = 919,
|
BishopValueMg = 828, BishopValueEg = 916,
|
||||||
RookValueMg = 1286, RookValueEg = 1378,
|
RookValueMg = 1286, RookValueEg = 1378,
|
||||||
QueenValueMg = 2527, QueenValueEg = 2697,
|
QueenValueMg = 2528, QueenValueEg = 2698,
|
||||||
|
|
||||||
MidgameLimit = 15258, EndgameLimit = 3915
|
MidgameLimit = 15258, EndgameLimit = 3915
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user