From 7f2eb10e93879bc569c7ddf6fb51d6f812cc477c Mon Sep 17 00:00:00 2001 From: Stefano80 Date: Tue, 30 Aug 2016 20:15:51 +0200 Subject: [PATCH] Retire linear imbalance Retire linear imbalance and compensate in piece values enumeration. STC: LLR: 2.96 (-2.94,2.94) [-3.00,1.00] Total: 43596 W: 8105 L: 8023 D: 27468 LTC: LLR: 2.95 (-2.94,2.94) [-3.00,1.00] Total: 24482 W: 3352 L: 3237 D: 17893 Bench: 7777707 --- src/material.cpp | 7 ++----- src/types.h | 12 ++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/material.cpp b/src/material.cpp index f73977b5..f6c4e2d6 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -31,13 +31,10 @@ namespace { // Polynomial material imbalance parameters - // pair pawn knight bishop rook queen - const int Linear[6] = { 1667, -168, -1027, -166, 238, -138 }; - const int QuadraticOurs[][PIECE_TYPE_NB] = { // OUR PIECES // pair pawn knight bishop rook queen - { 0 }, // Bishop pair + {1667 }, // Bishop pair { 40, 2 }, // Pawn { 32, 255, -3 }, // Knight OUR PIECES { 0, 104, 4, 0 }, // Bishop @@ -100,7 +97,7 @@ namespace { if (!pieceCount[Us][pt1]) continue; - int v = Linear[pt1]; + int v = 0; for (int pt2 = NO_PIECE_TYPE; pt2 <= pt1; ++pt2) v += QuadraticOurs[pt1][pt2] * pieceCount[Us][pt2] diff --git a/src/types.h b/src/types.h index 1440f73b..d669d812 100644 --- a/src/types.h +++ b/src/types.h @@ -183,13 +183,13 @@ enum Value : int { VALUE_MATE_IN_MAX_PLY = VALUE_MATE - 2 * MAX_PLY, VALUE_MATED_IN_MAX_PLY = -VALUE_MATE + 2 * MAX_PLY, - PawnValueMg = 198, PawnValueEg = 258, - KnightValueMg = 817, KnightValueEg = 896, - BishopValueMg = 836, BishopValueEg = 907, - RookValueMg = 1270, RookValueEg = 1356, - QueenValueMg = 2521, QueenValueEg = 2658, + PawnValueMg = 188, PawnValueEg = 248, + KnightValueMg = 753, KnightValueEg = 832, + BishopValueMg = 826, BishopValueEg = 897, + RookValueMg = 1285, RookValueEg = 1371, + QueenValueMg = 2513, QueenValueEg = 2650, - MidgameLimit = 15581, EndgameLimit = 3998 + MidgameLimit = 15258, EndgameLimit = 3915 }; enum PieceType { -- 2.39.2