From f2bab9d0631f854e3d22ab50eea5e777974f65ab Mon Sep 17 00:00:00 2001 From: winapiadmin <138602885+winapiadmin@users.noreply.github.com> Date: Fri, 10 Jul 2026 07:35:01 +0700 Subject: [PATCH 01/12] try to tune --- Weights.h | 211 +++++++++++++++++++----------------------------------- eval.cpp | 4 +- 2 files changed, 74 insertions(+), 141 deletions(-) diff --git a/Weights.h b/Weights.h index b20dd65..0fae6a4 100644 --- a/Weights.h +++ b/Weights.h @@ -1,139 +1,72 @@ -#ifndef WEIGHTS_H -#define WEIGHTS_H -#include "eval.h" -namespace engine::eval { -inline Value tempo = 20; -inline Value PawnValue = 100; -inline Value KnightValue = 320; -inline Value BishopValue = 330; -inline Value RookValue = 500; -inline Value QueenValue = 900; -inline Value fianchettoBonus = 20; -inline Value trappedBishopPenalty = 60; -inline Value centerWeight = 5; -inline Value mopUpKingDistWeight = 5; -inline Value mopUpEdgeDistWeight = 10; -inline Value spaceWeight = 2; -inline Value bishopPairMg = 25; -inline Value bishopPairEg = 50; -inline Value rookOpenFileMg = 25; -inline Value rookOpenFileEg = 20; -inline Value rookSemiOpenFileMg = 15; -inline Value rookSemiOpenFileEg = 12; -inline Value doubledPawnMg = 10; -inline Value doubledPawnEg = 20; -inline Value isolatedPawnMg = 15; -inline Value isolatedPawnEg = 25; -inline Value kingShelterBaseMg = 20; -inline Value kingShelterBaseEg = 5; -inline Value kingShelterDecayMg = 4; -inline Value kingShelterDecayEg = 1; -inline Value kqkDistWeight = 15; -inline Value kqkEdgeWeight = 15; -inline Value krkDistWeight = 5; -inline Value krkEdgeWeight = 10; -inline Value kpkWeight = 15; -inline Value mgMobilityCnt[7][8] = { - { 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0 }, - { -15, -8, -2, 4, 10, 16, 22, 28 }, - { -20, -12, -4, 5, 14, 23, 32, 40 }, - { -25, -15, -5, 5, 15, 25, 35, 45 }, - { -30, -18, -6, 6, 18, 30, 42, 55 }, - { -10, -5, 0, 5, 10, 15, 20, 25 } -}; -inline Value egMobilityCnt[7][8] = { - { 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0 }, - { -20, -12, -4, 5, 14, 23, 32, 40 }, - { -25, -15, -5, 5, 16, 27, 38, 50 }, - { -30, -18, -6, 6, 18, 30, 42, 55 }, - { -35, -22, -8, 8, 22, 35, 48, 60 }, - { -15, -8, -2, 4, 10, 16, 22, 28 } -}; -inline Value kingTropismMg[7] = { 0, 0, 3, 2, 2, 5, 0 }; -inline Value kingTropismEg[7] = { 0, 0, 2, 2, 3, 4, 0 }; -inline Value passedBonusMg[7] = { 0, 5, 15, 40, 80, 140, 200 }; -inline Value passedBonusEg[7] = { 0, 10, 30, 70, 140, 230, 350 }; -inline Value mg_knight_table[64] = { -50, -40, -30, -30, -30, -30, -40, -50, -40, -20, 0, 5, 5, 0, -20, -40, - -30, 5, 10, 15, 15, 10, 5, -30, -30, 0, 15, 20, 20, 15, 0, -30, - -30, 5, 15, 20, 20, 15, 5, -30, -30, 0, 10, 15, 15, 10, 0, -30, - -40, -20, 0, 0, 0, 0, -20, -40, -50, -40, -30, -30, -30, -30, -40, -50 }; -inline Value mg_bishop_table[64] = { -20, -10, -10, -10, -10, -10, -10, -20, -10, 0, 0, 0, 0, 0, 0, -10, - -10, 0, 10, 10, 10, 10, 0, -10, -10, 0, 5, 10, 10, 5, 0, -10, - -10, 5, 5, 10, 10, 5, 5, -10, -10, 0, 10, 10, 10, 10, 0, -10, - -10, 0, 0, 0, 0, 0, 0, -10, -20, -10, -10, -10, -10, -10, -10, -20 }; -inline Value mg_rook_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, - 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, - 5, 5, 5, 0, 10, 15, 15, 15, 15, 15, 15, 10, 0, 0, 0, 0, 0, 0, 0, 0 }; -inline Value mg_king_table[64] = { -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, - -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, - -20, -30, -30, -40, -40, -30, -30, -20, -10, -20, -20, -20, -20, -20, -20, -10, - 20, 20, 0, 0, 0, 0, 20, 20, 20, 30, 10, 0, 0, 10, 30, 20 }; -inline Value mg_queen_table[64] = { -20, -10, -10, -5, -5, -10, -10, -20, -10, 0, 5, 0, 0, 0, 0, -10, - -10, 5, 5, 5, 5, 5, 0, -10, 0, 0, 5, 5, 5, 5, 0, -5, - -5, 0, 5, 5, 5, 5, 0, -5, -10, 0, 5, 5, 5, 5, 0, -10, - -10, 0, 0, 0, 0, 0, 0, -10, -20, -10, -10, -5, -5, -10, -10, -20 }; -inline Value eg_knight_table[64] = { -50, -40, -20, -20, -20, -20, -40, -50, -40, -10, 5, 10, 10, 5, -10, -40, - -30, 10, 20, 25, 25, 20, 10, -30, -30, 15, 25, 30, 30, 25, 15, -30, - -30, 15, 25, 30, 30, 25, 15, -30, -30, 10, 20, 25, 25, 20, 10, -30, - -40, -10, 5, 10, 10, 5, -10, -40, -50, -40, -20, -20, -20, -20, -40, -50 }; -inline Value eg_bishop_table[64] = { -10, -5, -5, -5, -5, -5, -5, -10, -5, 5, 10, 10, 10, 10, 5, -5, -5, 10, 15, 20, 20, 15, - 10, -5, -5, 10, 20, 25, 25, 20, 10, -5, -5, 10, 20, 25, 25, 20, 10, -5, -5, 10, 15, 20, - 20, 15, 10, -5, -5, 5, 10, 10, 10, 10, 5, -5, -10, -5, -5, -5, -5, -5, -5, -10 }; -inline Value eg_rook_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 10, 15, 15, 10, 5, 0, 0, 5, 10, 15, 15, 10, - 5, 0, 0, 5, 10, 15, 15, 10, 5, 0, 10, 15, 20, 25, 25, 20, 15, 10, 10, 15, 20, 25, - 25, 20, 15, 10, 20, 25, 30, 35, 35, 30, 25, 20, 0, 0, 0, 5, 5, 0, 0, 0 }; -inline Value eg_king_table[64] = { -50, -40, -30, -20, -20, -30, -40, -50, -40, -20, 0, 10, 10, 0, -20, -40, - -30, 0, 20, 30, 30, 20, 0, -30, -20, 10, 30, 40, 40, 30, 10, -20, - -20, 10, 30, 40, 40, 30, 10, -20, -30, 0, 20, 30, 30, 20, 0, -30, - -40, -20, 0, 10, 10, 0, -20, -40, -50, -40, -30, -20, -20, -30, -40, -50 }; -inline Value eg_queen_table[64] = { -10, -5, -5, 0, 0, -5, -5, -10, -5, 0, 5, 5, 5, 5, 0, -5, -5, 5, 10, 15, 15, 10, - 5, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 5, 10, 15, - 15, 10, 5, -5, -5, 0, 5, 5, 5, 5, 0, -5, -10, -5, -5, 0, 0, -5, -5, -10 }; -inline Value mg_pawn_table[56] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5, -2, 2, - 5, 5, 2, -2, -5, -10, -5, 10, 20, 20, 10, -5, -10, -20, -10, 25, 40, 40, 25, - -10, -20, -35, -20, 50, 80, 80, 50, -20, -35, -55, -40, 90, 130, 130, 90, -40, -55 }; -inline Value eg_pawn_table[56] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5, -2, 2, - 5, 5, 2, -2, -5, -10, -5, 10, 20, 20, 10, -5, -10, -20, -10, 30, 55, 55, 30, - -10, -20, -35, -20, 70, 110, 110, 70, -20, -35, -60, -45, 120, 180, 180, 120, -45, -60 }; -inline Value developedMg = 8; -inline Value developedEg = 4; -inline Value outpostBonusKnight[2] = { 15, 30 }; -inline Value outpostBonusBishop[2] = { 10, 25 }; -inline Value kingProtector[6][2] = { - { 0, 0 }, - { 8, 12 }, - { 5, 10 }, - { 10, 15 }, - { 3, 5 }, - { 0, 0 } -}; -inline Value threatByMinor[7][2] = { - { 0, 0 }, - { 0, 0 }, - { 15, 25 }, - { 15, 25 }, - { 25, 35 }, - { 35, 50 } -}; -inline Value threatByRook[7][2] = { - { 0, 0 }, - { 0, 0 }, - { 10, 15 }, - { 10, 15 }, - { 20, 25 }, - { 25, 35 } -}; -inline Value hangingScore = 70; -inline Value overloadScore = 25; -inline Value threatByRankScore = 10; -inline Value minorImWt = 30; -inline Value bishopImWt = 15; -inline Value rookImWt = 20; -inline Value queenImWt = 50; -inline Value rammedPawnPenalty = 10; -inline Value rookOnSeventhBonus = 30; -inline Value earlyQueenPenalty = 5; -} // namespace engine::eval -#endif +#ifndef WEIGHTS_H +#define WEIGHTS_H +#include "eval.h" +namespace engine::eval { +inline Value tempo = 20; +inline Value PawnValue = 80; +inline Value KnightValue = 320; +inline Value BishopValue = 330; +inline Value RookValue = 500; +inline Value QueenValue = 900; +inline Value fianchettoBonus = 20; +inline Value trappedBishopPenalty = 60; +inline Value centerWeight = 5; +inline Value mopUpKingDistWeight = 5; +inline Value mopUpEdgeDistWeight = 10; +inline Value spaceWeight = 2; +inline Value bishopPairMg = 25; +inline Value bishopPairEg = 50; +inline Value developedMg = 8; +inline Value developedEg = 4; +inline Value rookOpenFileMg = 25; +inline Value rookOpenFileEg = 20; +inline Value rookSemiOpenFileMg = 15; +inline Value rookSemiOpenFileEg = 12; +inline Value doubledPawnMg = 10; +inline Value doubledPawnEg = 20; +inline Value isolatedPawnMg = 15; +inline Value isolatedPawnEg = 25; +inline Value kingShelterBaseMg = 20; +inline Value kingShelterBaseEg = 5; +inline Value kingShelterDecayMg = 4; +inline Value kingShelterDecayEg = 1; +inline Value kqkDistWeight = 15; +inline Value kqkEdgeWeight = 15; +inline Value krkDistWeight = 5; +inline Value krkEdgeWeight = 10; +inline Value kpkWeight = 15; +inline Value hangingScore = 70; +inline Value overloadScore = 25; +inline Value threatByRankScore = 60; +inline Value minorImWt = 30; +inline Value bishopImWt = 15; +inline Value rookImWt = 20; +inline Value queenImWt = 50; +inline Value rammedPawnPenalty = 10; +inline Value rookOnSeventhBonus = 30; +inline Value earlyQueenPenalty = 5; +inline Value egMobilityCnt[7][8] = { { 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0 }, { -20, -12, -4, 5, 14, 23, 32, 40 }, { -25, -15, -5, 5, 16, 27, 38, 50 }, { -30, -18, -6, 6, 18, 30, 42, 55 }, { -35, -22, -8, 8, 22, 35, 48, 60 }, { -15, -8, -2, 4, 10, 16, 22, 28 } }; +inline Value eg_bishop_table[64] = { -10, -5, -5, -5, -5, -5, -5, -10, -5, 5, 10, 10, 10, 10, 5, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 10, 20, 25, 25, 20, 10, -5, -5, 10, 20, 25, 25, 20, 10, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 5, 10, 10, 10, 10, 5, -5, -10, -5, -5, -5, -5, -5, -5, -10 }; +inline Value eg_king_table[64] = { -50, -40, -30, -20, -20, -30, -40, -50, -40, -20, 0, 10, 10, 0, -20, -40, -30, 0, 20, 30, 30, 20, 0, -30, -20, 10, 30, 40, 40, 30, 10, -20, -20, 10, 30, 40, 40, 30, 10, -20, -30, 0, 20, 30, 30, 20, 0, -30, -40, -20, 0, 10, 10, 0, -20, -40, -50, -40, -30, -20, -20, -30, -40, -50 }; +inline Value eg_knight_table[64] = { -50, -40, -20, -20, -20, -20, -40, -50, -40, -10, 5, 10, 10, 5, -10, -40, -30, 10, 20, 25, 25, 20, 10, -30, -30, 15, 25, 30, 30, 25, 15, -30, -30, 15, 25, 30, 30, 25, 15, -30, -30, 10, 20, 25, 25, 20, 10, -30, -40, -10, 5, 10, 10, 5, -10, -40, -50, -40, -20, -20, -20, -20, -40, -50 }; +inline Value eg_pawn_table[56] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5, -2, 2, 5, 5, 2, -2, -5, -10, -5, 10, 20, 20, 10, -5, -10, -20, -10, 30, 55, 55, 30, -10, -20, -35, -20, 70, 110, 110, 70, -20, -35, -60, -45, 120, 180, 180, 120, -45, -60 }; +inline Value eg_queen_table[64] = { -10, -5, -5, 0, 0, -5, -5, -10, -5, 0, 5, 5, 5, 5, 0, -5, -5, 5, 10, 15, 15, 10, 5, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 5, 10, 15, 15, 10, 5, -5, -5, 0, 5, 5, 5, 5, 0, -5, -10, -5, -5, 0, 0, -5, -5, -10 }; +inline Value eg_rook_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 10, 15, 15, 10, 5, 0, 0, 5, 10, 15, 15, 10, 5, 0, 0, 5, 10, 15, 15, 10, 5, 0, 10, 15, 20, 25, 25, 20, 15, 10, 10, 15, 20, 25, 25, 20, 15, 10, 20, 25, 30, 35, 35, 30, 25, 20, 0, 0, 0, 5, 5, 0, 0, 0 }; +inline Value kingProtector[6][2] = { { 0, 0 }, { 8, 12 }, { 5, 10 }, { 10, 15 }, { 3, 5 }, { 0, 0 } }; +inline Value kingTropismEg[7] = { 0, 0, 2, 2, 3, 4, 0 }; +inline Value kingTropismMg[7] = { 0, 0, -20, -5, -11, 5, 0 }; +inline Value mgMobilityCnt[7][8] = { { 0, 0, 0, 0, 0, 0, 0, 0 }, { -50, 0, 0, 0, 0, 0, 0, 0 }, { -15, -8, -2, 4, 10, 16, 22, 28 }, { -20, -12, -4, 5, 14, 23, 32, 40 }, { -25, -15, -5, 5, 15, 25, 35, 45 }, { -30, -18, -6, 6, 18, 30, 42, 55 }, { -10, -5, 0, 5, 10, 15, 20, 25 } }; +inline Value mg_bishop_table[64] = { -20, -10, -10, -10, -10, -10, -10, -20, -10, 0, 0, 0, 0, 0, 0, -10, -10, 0, 10, 10, 10, 10, 0, -10, -10, 0, 5, 10, 10, 5, 0, -10, -10, 5, 5, 10, 10, 5, 5, -10, -10, 0, 10, 10, 10, 10, 0, -10, -10, 0, 0, 0, 0, 0, 0, -10, -20, -10, -10, -10, -10, -10, -10, -20 }; +inline Value mg_king_table[64] = { -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, -20, -30, -30, -40, -40, -30, -30, -20, -10, -20, -20, -20, -20, -20, -20, -10, 20, 20, 0, 0, 0, 0, 20, 20, 20, 30, 10, 0, 0, 10, 30, 20 }; +inline Value mg_knight_table[64] = { -50, -40, -30, -30, -30, -30, -40, -50, -40, -20, 0, 5, 5, 0, -20, -40, -30, 5, 10, 15, 15, 10, 5, -30, -30, 0, 15, 20, 20, 15, 0, -30, -30, 5, 15, 20, 20, 15, 5, -30, -30, 0, 10, 15, 15, 10, 0, -30, -40, -20, 0, 0, 0, 0, -20, -40, -50, -40, -30, -30, -30, -30, -40, -50 }; +inline Value mg_pawn_table[56] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5, -2, 2, 5, 5, 2, -2, -5, -10, -5, 10, 20, 20, 10, -5, -10, -20, -10, 25, 40, 40, 25, -10, -20, -35, -20, 50, 80, 80, 50, -20, -35, -55, -40, 90, 130, 130, 90, -40, -55 }; +inline Value mg_queen_table[64] = { -20, -10, -10, -5, -5, -10, -10, -20, -10, 0, 5, 0, 0, 0, 0, -10, -10, 5, 5, 5, 5, 5, 0, -10, 0, 0, 5, 5, 5, 5, 0, -5, -5, 0, 5, 5, 5, 5, 0, -5, -10, 0, 5, 5, 5, 5, 0, -10, -10, 0, 0, 0, 0, 0, 0, -10, -20, -10, -10, -5, -5, -10, -10, -20 }; +inline Value mg_rook_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 10, 15, 15, 15, 15, 15, 15, 10, 0, 0, 0, 0, 0, 0, 0, 0 }; +inline Value outpostBonusBishop[2] = { 10, 25 }; +inline Value outpostBonusKnight[2] = { 15, 30 }; +inline Value passedBonusEg[7] = { 0, 10, 30, 70, 140, 230, 350 }; +inline Value passedBonusMg[7] = { 0, 5, 15, 40, 80, 140, 200 }; +inline Value threatByMinor[7][2] = { { 0, 0 }, { 0, 0 }, { 15, 25 }, { 15, 25 }, { 25, 35 }, { 35, 50 }, { 0, 0 } }; +inline Value threatByRook[7][2] = { { 0, 0 }, { 0, 0 }, { 10, 15 }, { 10, 15 }, { 20, 25 }, { 25, 35 }, { 0, 0 } }; +} // namespace engine::eval +#endif diff --git a/eval.cpp b/eval.cpp index 3dc03b5..ca6517d 100644 --- a/eval.cpp +++ b/eval.cpp @@ -29,7 +29,7 @@ Value *mgPst[] = { nullptr, mg_pawn_table, mg_knight_table, mg_bishop_table, mg_ Value *egPst[] = { nullptr, eg_pawn_table, eg_knight_table, eg_bishop_table, eg_rook_table, eg_queen_table, eg_king_table }; // tuning slop here -/* + TUNE(SetRange(5, 30), tempo, SetRange(80, 120), @@ -225,7 +225,7 @@ TUNE(SetRange(10, 100), minorImWt, SetRange(5, 50), bishopImWt, SetRange(10, 100 TUNE(SetRange(1, 50), rammedPawnPenalty); TUNE(SetRange(1, 100), rookOnSeventhBonus); TUNE(SetRange(1, 50), earlyQueenPenalty); -*/ + EvalComponents eval_components(const chess::Position &board) { constexpr int KnightPhase = 1; constexpr int BishopPhase = 1; From 6bc35db2643ba5fb5ca5fb270af62ec96582936a Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 10 Jul 2026 00:35:25 +0000 Subject: [PATCH 02/12] Apply clang-format --- Weights.h | 103 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 86 insertions(+), 17 deletions(-) diff --git a/Weights.h b/Weights.h index 0fae6a4..93d851c 100644 --- a/Weights.h +++ b/Weights.h @@ -45,28 +45,97 @@ inline Value queenImWt = 50; inline Value rammedPawnPenalty = 10; inline Value rookOnSeventhBonus = 30; inline Value earlyQueenPenalty = 5; -inline Value egMobilityCnt[7][8] = { { 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0 }, { -20, -12, -4, 5, 14, 23, 32, 40 }, { -25, -15, -5, 5, 16, 27, 38, 50 }, { -30, -18, -6, 6, 18, 30, 42, 55 }, { -35, -22, -8, 8, 22, 35, 48, 60 }, { -15, -8, -2, 4, 10, 16, 22, 28 } }; -inline Value eg_bishop_table[64] = { -10, -5, -5, -5, -5, -5, -5, -10, -5, 5, 10, 10, 10, 10, 5, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 10, 20, 25, 25, 20, 10, -5, -5, 10, 20, 25, 25, 20, 10, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 5, 10, 10, 10, 10, 5, -5, -10, -5, -5, -5, -5, -5, -5, -10 }; -inline Value eg_king_table[64] = { -50, -40, -30, -20, -20, -30, -40, -50, -40, -20, 0, 10, 10, 0, -20, -40, -30, 0, 20, 30, 30, 20, 0, -30, -20, 10, 30, 40, 40, 30, 10, -20, -20, 10, 30, 40, 40, 30, 10, -20, -30, 0, 20, 30, 30, 20, 0, -30, -40, -20, 0, 10, 10, 0, -20, -40, -50, -40, -30, -20, -20, -30, -40, -50 }; -inline Value eg_knight_table[64] = { -50, -40, -20, -20, -20, -20, -40, -50, -40, -10, 5, 10, 10, 5, -10, -40, -30, 10, 20, 25, 25, 20, 10, -30, -30, 15, 25, 30, 30, 25, 15, -30, -30, 15, 25, 30, 30, 25, 15, -30, -30, 10, 20, 25, 25, 20, 10, -30, -40, -10, 5, 10, 10, 5, -10, -40, -50, -40, -20, -20, -20, -20, -40, -50 }; -inline Value eg_pawn_table[56] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5, -2, 2, 5, 5, 2, -2, -5, -10, -5, 10, 20, 20, 10, -5, -10, -20, -10, 30, 55, 55, 30, -10, -20, -35, -20, 70, 110, 110, 70, -20, -35, -60, -45, 120, 180, 180, 120, -45, -60 }; -inline Value eg_queen_table[64] = { -10, -5, -5, 0, 0, -5, -5, -10, -5, 0, 5, 5, 5, 5, 0, -5, -5, 5, 10, 15, 15, 10, 5, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 5, 10, 15, 15, 10, 5, -5, -5, 0, 5, 5, 5, 5, 0, -5, -10, -5, -5, 0, 0, -5, -5, -10 }; -inline Value eg_rook_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 10, 15, 15, 10, 5, 0, 0, 5, 10, 15, 15, 10, 5, 0, 0, 5, 10, 15, 15, 10, 5, 0, 10, 15, 20, 25, 25, 20, 15, 10, 10, 15, 20, 25, 25, 20, 15, 10, 20, 25, 30, 35, 35, 30, 25, 20, 0, 0, 0, 5, 5, 0, 0, 0 }; -inline Value kingProtector[6][2] = { { 0, 0 }, { 8, 12 }, { 5, 10 }, { 10, 15 }, { 3, 5 }, { 0, 0 } }; +inline Value egMobilityCnt[7][8] = { + { 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0 }, + { -20, -12, -4, 5, 14, 23, 32, 40 }, + { -25, -15, -5, 5, 16, 27, 38, 50 }, + { -30, -18, -6, 6, 18, 30, 42, 55 }, + { -35, -22, -8, 8, 22, 35, 48, 60 }, + { -15, -8, -2, 4, 10, 16, 22, 28 } +}; +inline Value eg_bishop_table[64] = { -10, -5, -5, -5, -5, -5, -5, -10, -5, 5, 10, 10, 10, 10, 5, -5, -5, 10, 15, 20, 20, 15, + 10, -5, -5, 10, 20, 25, 25, 20, 10, -5, -5, 10, 20, 25, 25, 20, 10, -5, -5, 10, 15, 20, + 20, 15, 10, -5, -5, 5, 10, 10, 10, 10, 5, -5, -10, -5, -5, -5, -5, -5, -5, -10 }; +inline Value eg_king_table[64] = { -50, -40, -30, -20, -20, -30, -40, -50, -40, -20, 0, 10, 10, 0, -20, -40, + -30, 0, 20, 30, 30, 20, 0, -30, -20, 10, 30, 40, 40, 30, 10, -20, + -20, 10, 30, 40, 40, 30, 10, -20, -30, 0, 20, 30, 30, 20, 0, -30, + -40, -20, 0, 10, 10, 0, -20, -40, -50, -40, -30, -20, -20, -30, -40, -50 }; +inline Value eg_knight_table[64] = { -50, -40, -20, -20, -20, -20, -40, -50, -40, -10, 5, 10, 10, 5, -10, -40, + -30, 10, 20, 25, 25, 20, 10, -30, -30, 15, 25, 30, 30, 25, 15, -30, + -30, 15, 25, 30, 30, 25, 15, -30, -30, 10, 20, 25, 25, 20, 10, -30, + -40, -10, 5, 10, 10, 5, -10, -40, -50, -40, -20, -20, -20, -20, -40, -50 }; +inline Value eg_pawn_table[56] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5, -2, 2, + 5, 5, 2, -2, -5, -10, -5, 10, 20, 20, 10, -5, -10, -20, -10, 30, 55, 55, 30, + -10, -20, -35, -20, 70, 110, 110, 70, -20, -35, -60, -45, 120, 180, 180, 120, -45, -60 }; +inline Value eg_queen_table[64] = { -10, -5, -5, 0, 0, -5, -5, -10, -5, 0, 5, 5, 5, 5, 0, -5, -5, 5, 10, 15, 15, 10, + 5, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 5, 10, 15, + 15, 10, 5, -5, -5, 0, 5, 5, 5, 5, 0, -5, -10, -5, -5, 0, 0, -5, -5, -10 }; +inline Value eg_rook_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 10, 15, 15, 10, 5, 0, 0, 5, 10, 15, 15, 10, + 5, 0, 0, 5, 10, 15, 15, 10, 5, 0, 10, 15, 20, 25, 25, 20, 15, 10, 10, 15, 20, 25, + 25, 20, 15, 10, 20, 25, 30, 35, 35, 30, 25, 20, 0, 0, 0, 5, 5, 0, 0, 0 }; +inline Value kingProtector[6][2] = { + { 0, 0 }, + { 8, 12 }, + { 5, 10 }, + { 10, 15 }, + { 3, 5 }, + { 0, 0 } +}; inline Value kingTropismEg[7] = { 0, 0, 2, 2, 3, 4, 0 }; inline Value kingTropismMg[7] = { 0, 0, -20, -5, -11, 5, 0 }; -inline Value mgMobilityCnt[7][8] = { { 0, 0, 0, 0, 0, 0, 0, 0 }, { -50, 0, 0, 0, 0, 0, 0, 0 }, { -15, -8, -2, 4, 10, 16, 22, 28 }, { -20, -12, -4, 5, 14, 23, 32, 40 }, { -25, -15, -5, 5, 15, 25, 35, 45 }, { -30, -18, -6, 6, 18, 30, 42, 55 }, { -10, -5, 0, 5, 10, 15, 20, 25 } }; -inline Value mg_bishop_table[64] = { -20, -10, -10, -10, -10, -10, -10, -20, -10, 0, 0, 0, 0, 0, 0, -10, -10, 0, 10, 10, 10, 10, 0, -10, -10, 0, 5, 10, 10, 5, 0, -10, -10, 5, 5, 10, 10, 5, 5, -10, -10, 0, 10, 10, 10, 10, 0, -10, -10, 0, 0, 0, 0, 0, 0, -10, -20, -10, -10, -10, -10, -10, -10, -20 }; -inline Value mg_king_table[64] = { -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, -20, -30, -30, -40, -40, -30, -30, -20, -10, -20, -20, -20, -20, -20, -20, -10, 20, 20, 0, 0, 0, 0, 20, 20, 20, 30, 10, 0, 0, 10, 30, 20 }; -inline Value mg_knight_table[64] = { -50, -40, -30, -30, -30, -30, -40, -50, -40, -20, 0, 5, 5, 0, -20, -40, -30, 5, 10, 15, 15, 10, 5, -30, -30, 0, 15, 20, 20, 15, 0, -30, -30, 5, 15, 20, 20, 15, 5, -30, -30, 0, 10, 15, 15, 10, 0, -30, -40, -20, 0, 0, 0, 0, -20, -40, -50, -40, -30, -30, -30, -30, -40, -50 }; -inline Value mg_pawn_table[56] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5, -2, 2, 5, 5, 2, -2, -5, -10, -5, 10, 20, 20, 10, -5, -10, -20, -10, 25, 40, 40, 25, -10, -20, -35, -20, 50, 80, 80, 50, -20, -35, -55, -40, 90, 130, 130, 90, -40, -55 }; -inline Value mg_queen_table[64] = { -20, -10, -10, -5, -5, -10, -10, -20, -10, 0, 5, 0, 0, 0, 0, -10, -10, 5, 5, 5, 5, 5, 0, -10, 0, 0, 5, 5, 5, 5, 0, -5, -5, 0, 5, 5, 5, 5, 0, -5, -10, 0, 5, 5, 5, 5, 0, -10, -10, 0, 0, 0, 0, 0, 0, -10, -20, -10, -10, -5, -5, -10, -10, -20 }; -inline Value mg_rook_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 10, 15, 15, 15, 15, 15, 15, 10, 0, 0, 0, 0, 0, 0, 0, 0 }; +inline Value mgMobilityCnt[7][8] = { + { 0, 0, 0, 0, 0, 0, 0, 0 }, + { -50, 0, 0, 0, 0, 0, 0, 0 }, + { -15, -8, -2, 4, 10, 16, 22, 28 }, + { -20, -12, -4, 5, 14, 23, 32, 40 }, + { -25, -15, -5, 5, 15, 25, 35, 45 }, + { -30, -18, -6, 6, 18, 30, 42, 55 }, + { -10, -5, 0, 5, 10, 15, 20, 25 } +}; +inline Value mg_bishop_table[64] = { -20, -10, -10, -10, -10, -10, -10, -20, -10, 0, 0, 0, 0, 0, 0, -10, + -10, 0, 10, 10, 10, 10, 0, -10, -10, 0, 5, 10, 10, 5, 0, -10, + -10, 5, 5, 10, 10, 5, 5, -10, -10, 0, 10, 10, 10, 10, 0, -10, + -10, 0, 0, 0, 0, 0, 0, -10, -20, -10, -10, -10, -10, -10, -10, -20 }; +inline Value mg_king_table[64] = { -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, + -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, + -20, -30, -30, -40, -40, -30, -30, -20, -10, -20, -20, -20, -20, -20, -20, -10, + 20, 20, 0, 0, 0, 0, 20, 20, 20, 30, 10, 0, 0, 10, 30, 20 }; +inline Value mg_knight_table[64] = { -50, -40, -30, -30, -30, -30, -40, -50, -40, -20, 0, 5, 5, 0, -20, -40, + -30, 5, 10, 15, 15, 10, 5, -30, -30, 0, 15, 20, 20, 15, 0, -30, + -30, 5, 15, 20, 20, 15, 5, -30, -30, 0, 10, 15, 15, 10, 0, -30, + -40, -20, 0, 0, 0, 0, -20, -40, -50, -40, -30, -30, -30, -30, -40, -50 }; +inline Value mg_pawn_table[56] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5, -2, 2, + 5, 5, 2, -2, -5, -10, -5, 10, 20, 20, 10, -5, -10, -20, -10, 25, 40, 40, 25, + -10, -20, -35, -20, 50, 80, 80, 50, -20, -35, -55, -40, 90, 130, 130, 90, -40, -55 }; +inline Value mg_queen_table[64] = { -20, -10, -10, -5, -5, -10, -10, -20, -10, 0, 5, 0, 0, 0, 0, -10, + -10, 5, 5, 5, 5, 5, 0, -10, 0, 0, 5, 5, 5, 5, 0, -5, + -5, 0, 5, 5, 5, 5, 0, -5, -10, 0, 5, 5, 5, 5, 0, -10, + -10, 0, 0, 0, 0, 0, 0, -10, -20, -10, -10, -5, -5, -10, -10, -20 }; +inline Value mg_rook_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, + 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, + 5, 5, 5, 0, 10, 15, 15, 15, 15, 15, 15, 10, 0, 0, 0, 0, 0, 0, 0, 0 }; inline Value outpostBonusBishop[2] = { 10, 25 }; inline Value outpostBonusKnight[2] = { 15, 30 }; inline Value passedBonusEg[7] = { 0, 10, 30, 70, 140, 230, 350 }; inline Value passedBonusMg[7] = { 0, 5, 15, 40, 80, 140, 200 }; -inline Value threatByMinor[7][2] = { { 0, 0 }, { 0, 0 }, { 15, 25 }, { 15, 25 }, { 25, 35 }, { 35, 50 }, { 0, 0 } }; -inline Value threatByRook[7][2] = { { 0, 0 }, { 0, 0 }, { 10, 15 }, { 10, 15 }, { 20, 25 }, { 25, 35 }, { 0, 0 } }; +inline Value threatByMinor[7][2] = { + { 0, 0 }, + { 0, 0 }, + { 15, 25 }, + { 15, 25 }, + { 25, 35 }, + { 35, 50 }, + { 0, 0 } +}; +inline Value threatByRook[7][2] = { + { 0, 0 }, + { 0, 0 }, + { 10, 15 }, + { 10, 15 }, + { 20, 25 }, + { 25, 35 }, + { 0, 0 } +}; } // namespace engine::eval #endif From 8a9cb8ba5612f34f39513d8b42ede1ee2c2a13e9 Mon Sep 17 00:00:00 2001 From: winapiadmin <138602885+winapiadmin@users.noreply.github.com> Date: Fri, 10 Jul 2026 11:08:03 +0700 Subject: [PATCH 03/12] revert weights, also proper malus in history --- Weights.h | 280 ++++++++++++++++++++++++++--------------------------- score.h | 2 +- search.cpp | 15 +-- 3 files changed, 148 insertions(+), 149 deletions(-) diff --git a/Weights.h b/Weights.h index 93d851c..b20dd65 100644 --- a/Weights.h +++ b/Weights.h @@ -1,141 +1,139 @@ -#ifndef WEIGHTS_H -#define WEIGHTS_H -#include "eval.h" -namespace engine::eval { -inline Value tempo = 20; -inline Value PawnValue = 80; -inline Value KnightValue = 320; -inline Value BishopValue = 330; -inline Value RookValue = 500; -inline Value QueenValue = 900; -inline Value fianchettoBonus = 20; -inline Value trappedBishopPenalty = 60; -inline Value centerWeight = 5; -inline Value mopUpKingDistWeight = 5; -inline Value mopUpEdgeDistWeight = 10; -inline Value spaceWeight = 2; -inline Value bishopPairMg = 25; -inline Value bishopPairEg = 50; -inline Value developedMg = 8; -inline Value developedEg = 4; -inline Value rookOpenFileMg = 25; -inline Value rookOpenFileEg = 20; -inline Value rookSemiOpenFileMg = 15; -inline Value rookSemiOpenFileEg = 12; -inline Value doubledPawnMg = 10; -inline Value doubledPawnEg = 20; -inline Value isolatedPawnMg = 15; -inline Value isolatedPawnEg = 25; -inline Value kingShelterBaseMg = 20; -inline Value kingShelterBaseEg = 5; -inline Value kingShelterDecayMg = 4; -inline Value kingShelterDecayEg = 1; -inline Value kqkDistWeight = 15; -inline Value kqkEdgeWeight = 15; -inline Value krkDistWeight = 5; -inline Value krkEdgeWeight = 10; -inline Value kpkWeight = 15; -inline Value hangingScore = 70; -inline Value overloadScore = 25; -inline Value threatByRankScore = 60; -inline Value minorImWt = 30; -inline Value bishopImWt = 15; -inline Value rookImWt = 20; -inline Value queenImWt = 50; -inline Value rammedPawnPenalty = 10; -inline Value rookOnSeventhBonus = 30; -inline Value earlyQueenPenalty = 5; -inline Value egMobilityCnt[7][8] = { - { 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0 }, - { -20, -12, -4, 5, 14, 23, 32, 40 }, - { -25, -15, -5, 5, 16, 27, 38, 50 }, - { -30, -18, -6, 6, 18, 30, 42, 55 }, - { -35, -22, -8, 8, 22, 35, 48, 60 }, - { -15, -8, -2, 4, 10, 16, 22, 28 } -}; -inline Value eg_bishop_table[64] = { -10, -5, -5, -5, -5, -5, -5, -10, -5, 5, 10, 10, 10, 10, 5, -5, -5, 10, 15, 20, 20, 15, - 10, -5, -5, 10, 20, 25, 25, 20, 10, -5, -5, 10, 20, 25, 25, 20, 10, -5, -5, 10, 15, 20, - 20, 15, 10, -5, -5, 5, 10, 10, 10, 10, 5, -5, -10, -5, -5, -5, -5, -5, -5, -10 }; -inline Value eg_king_table[64] = { -50, -40, -30, -20, -20, -30, -40, -50, -40, -20, 0, 10, 10, 0, -20, -40, - -30, 0, 20, 30, 30, 20, 0, -30, -20, 10, 30, 40, 40, 30, 10, -20, - -20, 10, 30, 40, 40, 30, 10, -20, -30, 0, 20, 30, 30, 20, 0, -30, - -40, -20, 0, 10, 10, 0, -20, -40, -50, -40, -30, -20, -20, -30, -40, -50 }; -inline Value eg_knight_table[64] = { -50, -40, -20, -20, -20, -20, -40, -50, -40, -10, 5, 10, 10, 5, -10, -40, - -30, 10, 20, 25, 25, 20, 10, -30, -30, 15, 25, 30, 30, 25, 15, -30, - -30, 15, 25, 30, 30, 25, 15, -30, -30, 10, 20, 25, 25, 20, 10, -30, - -40, -10, 5, 10, 10, 5, -10, -40, -50, -40, -20, -20, -20, -20, -40, -50 }; -inline Value eg_pawn_table[56] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5, -2, 2, - 5, 5, 2, -2, -5, -10, -5, 10, 20, 20, 10, -5, -10, -20, -10, 30, 55, 55, 30, - -10, -20, -35, -20, 70, 110, 110, 70, -20, -35, -60, -45, 120, 180, 180, 120, -45, -60 }; -inline Value eg_queen_table[64] = { -10, -5, -5, 0, 0, -5, -5, -10, -5, 0, 5, 5, 5, 5, 0, -5, -5, 5, 10, 15, 15, 10, - 5, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 5, 10, 15, - 15, 10, 5, -5, -5, 0, 5, 5, 5, 5, 0, -5, -10, -5, -5, 0, 0, -5, -5, -10 }; -inline Value eg_rook_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 10, 15, 15, 10, 5, 0, 0, 5, 10, 15, 15, 10, - 5, 0, 0, 5, 10, 15, 15, 10, 5, 0, 10, 15, 20, 25, 25, 20, 15, 10, 10, 15, 20, 25, - 25, 20, 15, 10, 20, 25, 30, 35, 35, 30, 25, 20, 0, 0, 0, 5, 5, 0, 0, 0 }; -inline Value kingProtector[6][2] = { - { 0, 0 }, - { 8, 12 }, - { 5, 10 }, - { 10, 15 }, - { 3, 5 }, - { 0, 0 } -}; -inline Value kingTropismEg[7] = { 0, 0, 2, 2, 3, 4, 0 }; -inline Value kingTropismMg[7] = { 0, 0, -20, -5, -11, 5, 0 }; -inline Value mgMobilityCnt[7][8] = { - { 0, 0, 0, 0, 0, 0, 0, 0 }, - { -50, 0, 0, 0, 0, 0, 0, 0 }, - { -15, -8, -2, 4, 10, 16, 22, 28 }, - { -20, -12, -4, 5, 14, 23, 32, 40 }, - { -25, -15, -5, 5, 15, 25, 35, 45 }, - { -30, -18, -6, 6, 18, 30, 42, 55 }, - { -10, -5, 0, 5, 10, 15, 20, 25 } -}; -inline Value mg_bishop_table[64] = { -20, -10, -10, -10, -10, -10, -10, -20, -10, 0, 0, 0, 0, 0, 0, -10, - -10, 0, 10, 10, 10, 10, 0, -10, -10, 0, 5, 10, 10, 5, 0, -10, - -10, 5, 5, 10, 10, 5, 5, -10, -10, 0, 10, 10, 10, 10, 0, -10, - -10, 0, 0, 0, 0, 0, 0, -10, -20, -10, -10, -10, -10, -10, -10, -20 }; -inline Value mg_king_table[64] = { -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, - -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, - -20, -30, -30, -40, -40, -30, -30, -20, -10, -20, -20, -20, -20, -20, -20, -10, - 20, 20, 0, 0, 0, 0, 20, 20, 20, 30, 10, 0, 0, 10, 30, 20 }; -inline Value mg_knight_table[64] = { -50, -40, -30, -30, -30, -30, -40, -50, -40, -20, 0, 5, 5, 0, -20, -40, - -30, 5, 10, 15, 15, 10, 5, -30, -30, 0, 15, 20, 20, 15, 0, -30, - -30, 5, 15, 20, 20, 15, 5, -30, -30, 0, 10, 15, 15, 10, 0, -30, - -40, -20, 0, 0, 0, 0, -20, -40, -50, -40, -30, -30, -30, -30, -40, -50 }; -inline Value mg_pawn_table[56] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5, -2, 2, - 5, 5, 2, -2, -5, -10, -5, 10, 20, 20, 10, -5, -10, -20, -10, 25, 40, 40, 25, - -10, -20, -35, -20, 50, 80, 80, 50, -20, -35, -55, -40, 90, 130, 130, 90, -40, -55 }; -inline Value mg_queen_table[64] = { -20, -10, -10, -5, -5, -10, -10, -20, -10, 0, 5, 0, 0, 0, 0, -10, - -10, 5, 5, 5, 5, 5, 0, -10, 0, 0, 5, 5, 5, 5, 0, -5, - -5, 0, 5, 5, 5, 5, 0, -5, -10, 0, 5, 5, 5, 5, 0, -10, - -10, 0, 0, 0, 0, 0, 0, -10, -20, -10, -10, -5, -5, -10, -10, -20 }; -inline Value mg_rook_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, - 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, - 5, 5, 5, 0, 10, 15, 15, 15, 15, 15, 15, 10, 0, 0, 0, 0, 0, 0, 0, 0 }; -inline Value outpostBonusBishop[2] = { 10, 25 }; -inline Value outpostBonusKnight[2] = { 15, 30 }; -inline Value passedBonusEg[7] = { 0, 10, 30, 70, 140, 230, 350 }; -inline Value passedBonusMg[7] = { 0, 5, 15, 40, 80, 140, 200 }; -inline Value threatByMinor[7][2] = { - { 0, 0 }, - { 0, 0 }, - { 15, 25 }, - { 15, 25 }, - { 25, 35 }, - { 35, 50 }, - { 0, 0 } -}; -inline Value threatByRook[7][2] = { - { 0, 0 }, - { 0, 0 }, - { 10, 15 }, - { 10, 15 }, - { 20, 25 }, - { 25, 35 }, - { 0, 0 } -}; -} // namespace engine::eval -#endif +#ifndef WEIGHTS_H +#define WEIGHTS_H +#include "eval.h" +namespace engine::eval { +inline Value tempo = 20; +inline Value PawnValue = 100; +inline Value KnightValue = 320; +inline Value BishopValue = 330; +inline Value RookValue = 500; +inline Value QueenValue = 900; +inline Value fianchettoBonus = 20; +inline Value trappedBishopPenalty = 60; +inline Value centerWeight = 5; +inline Value mopUpKingDistWeight = 5; +inline Value mopUpEdgeDistWeight = 10; +inline Value spaceWeight = 2; +inline Value bishopPairMg = 25; +inline Value bishopPairEg = 50; +inline Value rookOpenFileMg = 25; +inline Value rookOpenFileEg = 20; +inline Value rookSemiOpenFileMg = 15; +inline Value rookSemiOpenFileEg = 12; +inline Value doubledPawnMg = 10; +inline Value doubledPawnEg = 20; +inline Value isolatedPawnMg = 15; +inline Value isolatedPawnEg = 25; +inline Value kingShelterBaseMg = 20; +inline Value kingShelterBaseEg = 5; +inline Value kingShelterDecayMg = 4; +inline Value kingShelterDecayEg = 1; +inline Value kqkDistWeight = 15; +inline Value kqkEdgeWeight = 15; +inline Value krkDistWeight = 5; +inline Value krkEdgeWeight = 10; +inline Value kpkWeight = 15; +inline Value mgMobilityCnt[7][8] = { + { 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0 }, + { -15, -8, -2, 4, 10, 16, 22, 28 }, + { -20, -12, -4, 5, 14, 23, 32, 40 }, + { -25, -15, -5, 5, 15, 25, 35, 45 }, + { -30, -18, -6, 6, 18, 30, 42, 55 }, + { -10, -5, 0, 5, 10, 15, 20, 25 } +}; +inline Value egMobilityCnt[7][8] = { + { 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0 }, + { -20, -12, -4, 5, 14, 23, 32, 40 }, + { -25, -15, -5, 5, 16, 27, 38, 50 }, + { -30, -18, -6, 6, 18, 30, 42, 55 }, + { -35, -22, -8, 8, 22, 35, 48, 60 }, + { -15, -8, -2, 4, 10, 16, 22, 28 } +}; +inline Value kingTropismMg[7] = { 0, 0, 3, 2, 2, 5, 0 }; +inline Value kingTropismEg[7] = { 0, 0, 2, 2, 3, 4, 0 }; +inline Value passedBonusMg[7] = { 0, 5, 15, 40, 80, 140, 200 }; +inline Value passedBonusEg[7] = { 0, 10, 30, 70, 140, 230, 350 }; +inline Value mg_knight_table[64] = { -50, -40, -30, -30, -30, -30, -40, -50, -40, -20, 0, 5, 5, 0, -20, -40, + -30, 5, 10, 15, 15, 10, 5, -30, -30, 0, 15, 20, 20, 15, 0, -30, + -30, 5, 15, 20, 20, 15, 5, -30, -30, 0, 10, 15, 15, 10, 0, -30, + -40, -20, 0, 0, 0, 0, -20, -40, -50, -40, -30, -30, -30, -30, -40, -50 }; +inline Value mg_bishop_table[64] = { -20, -10, -10, -10, -10, -10, -10, -20, -10, 0, 0, 0, 0, 0, 0, -10, + -10, 0, 10, 10, 10, 10, 0, -10, -10, 0, 5, 10, 10, 5, 0, -10, + -10, 5, 5, 10, 10, 5, 5, -10, -10, 0, 10, 10, 10, 10, 0, -10, + -10, 0, 0, 0, 0, 0, 0, -10, -20, -10, -10, -10, -10, -10, -10, -20 }; +inline Value mg_rook_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, + 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, + 5, 5, 5, 0, 10, 15, 15, 15, 15, 15, 15, 10, 0, 0, 0, 0, 0, 0, 0, 0 }; +inline Value mg_king_table[64] = { -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, + -30, -40, -40, -50, -50, -40, -40, -30, -30, -40, -40, -50, -50, -40, -40, -30, + -20, -30, -30, -40, -40, -30, -30, -20, -10, -20, -20, -20, -20, -20, -20, -10, + 20, 20, 0, 0, 0, 0, 20, 20, 20, 30, 10, 0, 0, 10, 30, 20 }; +inline Value mg_queen_table[64] = { -20, -10, -10, -5, -5, -10, -10, -20, -10, 0, 5, 0, 0, 0, 0, -10, + -10, 5, 5, 5, 5, 5, 0, -10, 0, 0, 5, 5, 5, 5, 0, -5, + -5, 0, 5, 5, 5, 5, 0, -5, -10, 0, 5, 5, 5, 5, 0, -10, + -10, 0, 0, 0, 0, 0, 0, -10, -20, -10, -10, -5, -5, -10, -10, -20 }; +inline Value eg_knight_table[64] = { -50, -40, -20, -20, -20, -20, -40, -50, -40, -10, 5, 10, 10, 5, -10, -40, + -30, 10, 20, 25, 25, 20, 10, -30, -30, 15, 25, 30, 30, 25, 15, -30, + -30, 15, 25, 30, 30, 25, 15, -30, -30, 10, 20, 25, 25, 20, 10, -30, + -40, -10, 5, 10, 10, 5, -10, -40, -50, -40, -20, -20, -20, -20, -40, -50 }; +inline Value eg_bishop_table[64] = { -10, -5, -5, -5, -5, -5, -5, -10, -5, 5, 10, 10, 10, 10, 5, -5, -5, 10, 15, 20, 20, 15, + 10, -5, -5, 10, 20, 25, 25, 20, 10, -5, -5, 10, 20, 25, 25, 20, 10, -5, -5, 10, 15, 20, + 20, 15, 10, -5, -5, 5, 10, 10, 10, 10, 5, -5, -10, -5, -5, -5, -5, -5, -5, -10 }; +inline Value eg_rook_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 10, 15, 15, 10, 5, 0, 0, 5, 10, 15, 15, 10, + 5, 0, 0, 5, 10, 15, 15, 10, 5, 0, 10, 15, 20, 25, 25, 20, 15, 10, 10, 15, 20, 25, + 25, 20, 15, 10, 20, 25, 30, 35, 35, 30, 25, 20, 0, 0, 0, 5, 5, 0, 0, 0 }; +inline Value eg_king_table[64] = { -50, -40, -30, -20, -20, -30, -40, -50, -40, -20, 0, 10, 10, 0, -20, -40, + -30, 0, 20, 30, 30, 20, 0, -30, -20, 10, 30, 40, 40, 30, 10, -20, + -20, 10, 30, 40, 40, 30, 10, -20, -30, 0, 20, 30, 30, 20, 0, -30, + -40, -20, 0, 10, 10, 0, -20, -40, -50, -40, -30, -20, -20, -30, -40, -50 }; +inline Value eg_queen_table[64] = { -10, -5, -5, 0, 0, -5, -5, -10, -5, 0, 5, 5, 5, 5, 0, -5, -5, 5, 10, 15, 15, 10, + 5, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 10, 15, 20, 20, 15, 10, -5, -5, 5, 10, 15, + 15, 10, 5, -5, -5, 0, 5, 5, 5, 5, 0, -5, -10, -5, -5, 0, 0, -5, -5, -10 }; +inline Value mg_pawn_table[56] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5, -2, 2, + 5, 5, 2, -2, -5, -10, -5, 10, 20, 20, 10, -5, -10, -20, -10, 25, 40, 40, 25, + -10, -20, -35, -20, 50, 80, 80, 50, -20, -35, -55, -40, 90, 130, 130, 90, -40, -55 }; +inline Value eg_pawn_table[56] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5, -2, 2, + 5, 5, 2, -2, -5, -10, -5, 10, 20, 20, 10, -5, -10, -20, -10, 30, 55, 55, 30, + -10, -20, -35, -20, 70, 110, 110, 70, -20, -35, -60, -45, 120, 180, 180, 120, -45, -60 }; +inline Value developedMg = 8; +inline Value developedEg = 4; +inline Value outpostBonusKnight[2] = { 15, 30 }; +inline Value outpostBonusBishop[2] = { 10, 25 }; +inline Value kingProtector[6][2] = { + { 0, 0 }, + { 8, 12 }, + { 5, 10 }, + { 10, 15 }, + { 3, 5 }, + { 0, 0 } +}; +inline Value threatByMinor[7][2] = { + { 0, 0 }, + { 0, 0 }, + { 15, 25 }, + { 15, 25 }, + { 25, 35 }, + { 35, 50 } +}; +inline Value threatByRook[7][2] = { + { 0, 0 }, + { 0, 0 }, + { 10, 15 }, + { 10, 15 }, + { 20, 25 }, + { 25, 35 } +}; +inline Value hangingScore = 70; +inline Value overloadScore = 25; +inline Value threatByRankScore = 10; +inline Value minorImWt = 30; +inline Value bishopImWt = 15; +inline Value rookImWt = 20; +inline Value queenImWt = 50; +inline Value rammedPawnPenalty = 10; +inline Value rookOnSeventhBonus = 30; +inline Value earlyQueenPenalty = 5; +} // namespace engine::eval +#endif diff --git a/score.h b/score.h index d6efe85..6a1d322 100644 --- a/score.h +++ b/score.h @@ -39,7 +39,7 @@ class Score { int value; }; - Score() : score(InternalUnits{ VALUE_ZERO }){}; + Score() : score(InternalUnits{ VALUE_ZERO }) {}; Score(Value v); template bool is() const { return std::holds_alternative(score); } diff --git a/search.cpp b/search.cpp index 37017a3..94d96ca 100644 --- a/search.cpp +++ b/search.cpp @@ -358,7 +358,7 @@ Value doSearch( Value maxScore = -VALUE_INFINITE; Move bestMove = Move::none(); int movesSearched = 0; - + Movelist quietsSearched; for (size_t i = 0; i < moves.size(); ++i) { Move move = moves[i]; if (ply == 0 && !session.tc.searchmoves.empty() && @@ -453,7 +453,7 @@ Value doSearch( board.undoMove(); movesSearched++; - + if (!isCapture && !givesCheck) quietsSearched.push_back(move); if (score > maxScore) { maxScore = score; bestMove = move; @@ -469,11 +469,12 @@ Value doSearch( session.historyHeuristic[(int)move.from()][(int)move.to()] = std::clamp(session.historyHeuristic[(int)move.from()][(int)move.to()] + bonus, -16384, 16384); } - } /*else if (!isCapture && depth > 0) { - int malus = -depth * depth; - session.historyHeuristic[(int)move.from()][(int)move.to()] = - std::clamp(session.historyHeuristic[(int)move.from()][(int)move.to()] + malus, -16384, 16384); - }*/ + } else if (!isCapture && depth > 0) { + int malus = 300 * depth - 250; + for (Move move_:quietsSearched) + session.historyHeuristic[(int)move_.from()][(int)move_.to()] = + std::clamp(session.historyHeuristic[(int)move_.from()][(int)move_.to()] - malus, -16384, 16384); + } if (alpha >= beta) { if (!isCapture) { From ef40cd44cd7de453a18d5a95c3eb336cbe6d88ac Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 10 Jul 2026 04:08:19 +0000 Subject: [PATCH 04/12] Apply clang-format --- score.h | 2 +- search.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/score.h b/score.h index 6a1d322..d6efe85 100644 --- a/score.h +++ b/score.h @@ -39,7 +39,7 @@ class Score { int value; }; - Score() : score(InternalUnits{ VALUE_ZERO }) {}; + Score() : score(InternalUnits{ VALUE_ZERO }){}; Score(Value v); template bool is() const { return std::holds_alternative(score); } diff --git a/search.cpp b/search.cpp index 94d96ca..1af5bfb 100644 --- a/search.cpp +++ b/search.cpp @@ -453,7 +453,8 @@ Value doSearch( board.undoMove(); movesSearched++; - if (!isCapture && !givesCheck) quietsSearched.push_back(move); + if (!isCapture && !givesCheck) + quietsSearched.push_back(move); if (score > maxScore) { maxScore = score; bestMove = move; @@ -471,7 +472,7 @@ Value doSearch( } } else if (!isCapture && depth > 0) { int malus = 300 * depth - 250; - for (Move move_:quietsSearched) + for (Move move_ : quietsSearched) session.historyHeuristic[(int)move_.from()][(int)move_.to()] = std::clamp(session.historyHeuristic[(int)move_.from()][(int)move_.to()] - malus, -16384, 16384); } From cca11e6d10053e88c4236ccb6fdf8a0d280fba5e Mon Sep 17 00:00:00 2001 From: winapiadmin <138602885+winapiadmin@users.noreply.github.com> Date: Fri, 10 Jul 2026 11:09:21 +0700 Subject: [PATCH 05/12] format+base branch --- .github/workflows/games.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/games.yml b/.github/workflows/games.yml index c9b4f10..ca44eb8 100644 --- a/.github/workflows/games.yml +++ b/.github/workflows/games.yml @@ -6,7 +6,7 @@ on: base_ref: description: "Base branch, tag, or commit" required: false - default: "test_chesslib" + default: "HandcraftedEngine" rounds: description: "Max rounds for SPRT" required: false @@ -14,15 +14,15 @@ on: tc: description: "Time control (e.g. 60+0.6 or 10+0.1)" required: false - default: "60+0.6" + default: "10+0.1" elo0: description: "elo0" required: false - default: "0.5" + default: "0.0" elo1: description: "elo1" required: false - default: "2.5" + default: "2.0" output_exec: description: "Executable output file name" required: false From 33ec44c7359dc1149b92462b864d5939581e88f2 Mon Sep 17 00:00:00 2001 From: winapiadmin <138602885+winapiadmin@users.noreply.github.com> Date: Fri, 10 Jul 2026 11:17:03 +0700 Subject: [PATCH 06/12] oopsie wrong locatoin for history --- score.h | 2 +- search.cpp | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/score.h b/score.h index d6efe85..6a1d322 100644 --- a/score.h +++ b/score.h @@ -39,7 +39,7 @@ class Score { int value; }; - Score() : score(InternalUnits{ VALUE_ZERO }){}; + Score() : score(InternalUnits{ VALUE_ZERO }) {}; Score(Value v); template bool is() const { return std::holds_alternative(score); } diff --git a/search.cpp b/search.cpp index 1af5bfb..0390df5 100644 --- a/search.cpp +++ b/search.cpp @@ -460,25 +460,20 @@ Value doSearch( bestMove = move; } - if (score > alpha) { + if (score > alpha) alpha = score; + if (alpha >= beta) { if (!isCapture) { int bonus = depth * depth; if (is_win(score)) bonus += 4 * depth * depth; session.historyHeuristic[(int)move.from()][(int)move.to()] = std::clamp(session.historyHeuristic[(int)move.from()][(int)move.to()] + bonus, -16384, 16384); - } - } else if (!isCapture && depth > 0) { - int malus = 300 * depth - 250; - for (Move move_ : quietsSearched) - session.historyHeuristic[(int)move_.from()][(int)move_.to()] = - std::clamp(session.historyHeuristic[(int)move_.from()][(int)move_.to()] - malus, -16384, 16384); - } - - if (alpha >= beta) { - if (!isCapture) { + int malus = 300 * depth - 250; + for (Move move_ : quietsSearched) + session.historyHeuristic[(int)move_.from()][(int)move_.to()] = + std::clamp(session.historyHeuristic[(int)move_.from()][(int)move_.to()] - malus, -16384, 16384); if (session.killerMoves[ply][0] != move) { session.killerMoves[ply][1] = session.killerMoves[ply][0]; session.killerMoves[ply][0] = move; From 8083ea49e4b733745b07835ef815f4a6e3bacf04 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 10 Jul 2026 04:17:16 +0000 Subject: [PATCH 07/12] Apply clang-format --- score.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/score.h b/score.h index 6a1d322..d6efe85 100644 --- a/score.h +++ b/score.h @@ -39,7 +39,7 @@ class Score { int value; }; - Score() : score(InternalUnits{ VALUE_ZERO }) {}; + Score() : score(InternalUnits{ VALUE_ZERO }){}; Score(Value v); template bool is() const { return std::holds_alternative(score); } From 8568ab2672e1e676e3f83aad08d2f4970e34d069 Mon Sep 17 00:00:00 2001 From: winapiadmin <138602885+winapiadmin@users.noreply.github.com> Date: Fri, 10 Jul 2026 11:46:47 +0700 Subject: [PATCH 08/12] exclude current move (just in case) for malus --- search.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/search.cpp b/search.cpp index 0390df5..b4d0808 100644 --- a/search.cpp +++ b/search.cpp @@ -472,8 +472,9 @@ Value doSearch( std::clamp(session.historyHeuristic[(int)move.from()][(int)move.to()] + bonus, -16384, 16384); int malus = 300 * depth - 250; for (Move move_ : quietsSearched) - session.historyHeuristic[(int)move_.from()][(int)move_.to()] = - std::clamp(session.historyHeuristic[(int)move_.from()][(int)move_.to()] - malus, -16384, 16384); + if (m != move) + session.historyHeuristic[(int)move_.from()][(int)move_.to()] = + std::clamp(session.historyHeuristic[(int)move_.from()][(int)move_.to()] - malus, -16384, 16384); if (session.killerMoves[ply][0] != move) { session.killerMoves[ply][1] = session.killerMoves[ply][0]; session.killerMoves[ply][0] = move; From e995506e8332812270778c245e29df6f307cd2f8 Mon Sep 17 00:00:00 2001 From: winapiadmin <138602885+winapiadmin@users.noreply.github.com> Date: Fri, 10 Jul 2026 11:49:17 +0700 Subject: [PATCH 09/12] compile fix (still exclude current move) --- search.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search.cpp b/search.cpp index b4d0808..1558ee2 100644 --- a/search.cpp +++ b/search.cpp @@ -472,7 +472,7 @@ Value doSearch( std::clamp(session.historyHeuristic[(int)move.from()][(int)move.to()] + bonus, -16384, 16384); int malus = 300 * depth - 250; for (Move move_ : quietsSearched) - if (m != move) + if (move_ != move) session.historyHeuristic[(int)move_.from()][(int)move_.to()] = std::clamp(session.historyHeuristic[(int)move_.from()][(int)move_.to()] - malus, -16384, 16384); if (session.killerMoves[ply][0] != move) { From 5b749d19d54ece89d9bd928884b3d37ef1604048 Mon Sep 17 00:00:00 2001 From: winapiadmin <138602885+winapiadmin@users.noreply.github.com> Date: Fri, 10 Jul 2026 18:44:03 +0700 Subject: [PATCH 10/12] perturb values --- search.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/search.cpp b/search.cpp index 1558ee2..91f7646 100644 --- a/search.cpp +++ b/search.cpp @@ -372,7 +372,7 @@ Value doSearch( // Futility pruning at shallow depths if (!inCheck && !isCapture && !givesCheck && depth <= 2 && ply > 0 && movesSearched > 0) { - Value margin = Value(128 + 128 * depth); + Value margin = Value(200 + 128 * depth); if (staticEval + margin <= alpha && std::abs(alpha) < VALUE_TB_WIN_IN_MAX_PLY) continue; } @@ -385,7 +385,7 @@ Value doSearch( // SEE pruning for losing captures at shallow depths if (!inCheck && isCapture && !givesCheck && depth <= 2 && movesSearched > 0 && move.type_of() != PROMOTION && std::abs(alpha) < VALUE_TB_WIN_IN_MAX_PLY) { - if (movepick::see(board, move) < 0) + if (movepick::see(board, move) < -20) continue; } @@ -408,7 +408,7 @@ Value doSearch( else if (staticEval - 50 >= alphaOrig) reduction--; } else if (movesSearched >= 6) { - reduction = 1 + movesSearched / 8; + reduction = 1 + movesSearched / 6; } if (reduction > 0) reduction = std::clamp(reduction, 1, depth - 2); @@ -419,7 +419,7 @@ Value doSearch( ext = 1; if (ext == 0 && moves.size() == 1) ext = 1; - if (ext == 0 && isCapture && movesSearched == 0) + if (ext == 0 && isCapture) ext = 1; board.doMove(move); From 1494d509b2b24fd64118aa09e052a38d2453819e Mon Sep 17 00:00:00 2001 From: winapiadmin <138602885+winapiadmin@users.noreply.github.com> Date: Fri, 10 Jul 2026 20:55:40 +0700 Subject: [PATCH 11/12] bench No functional change --- main.cpp | 1 + score.h | 2 +- search.cpp | 9 ++++--- search.h | 3 ++- timeman.cpp | 4 +-- timeman.h | 4 +-- uci.cpp | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 7 files changed, 82 insertions(+), 12 deletions(-) diff --git a/main.cpp b/main.cpp index 9ae3626..d40fa01 100644 --- a/main.cpp +++ b/main.cpp @@ -12,6 +12,7 @@ using namespace engine; int main() { std::cout << std::unitbuf; std::cout << "cppchess_engine version " << BUILD_VERSION << '\n'; + options.add("Threads", Option(1, 1, 1)); options.add("Move Overhead", Option(10, 0, 1000)); options.add("Hash", Option(16, 1, 1 << 25, [](const Option &o) { try { diff --git a/score.h b/score.h index d6efe85..6a1d322 100644 --- a/score.h +++ b/score.h @@ -39,7 +39,7 @@ class Score { int value; }; - Score() : score(InternalUnits{ VALUE_ZERO }){}; + Score() : score(InternalUnits{ VALUE_ZERO }) {}; Score(Value v); template bool is() const { return std::holds_alternative(score); } diff --git a/search.cpp b/search.cpp index 91f7646..966f7ec 100644 --- a/search.cpp +++ b/search.cpp @@ -372,7 +372,7 @@ Value doSearch( // Futility pruning at shallow depths if (!inCheck && !isCapture && !givesCheck && depth <= 2 && ply > 0 && movesSearched > 0) { - Value margin = Value(200 + 128 * depth); + Value margin = Value(128 + 128 * depth); if (staticEval + margin <= alpha && std::abs(alpha) < VALUE_TB_WIN_IN_MAX_PLY) continue; } @@ -385,7 +385,7 @@ Value doSearch( // SEE pruning for losing captures at shallow depths if (!inCheck && isCapture && !givesCheck && depth <= 2 && movesSearched > 0 && move.type_of() != PROMOTION && std::abs(alpha) < VALUE_TB_WIN_IN_MAX_PLY) { - if (movepick::see(board, move) < -20) + if (movepick::see(board, move) < 0) continue; } @@ -408,7 +408,7 @@ Value doSearch( else if (staticEval - 50 >= alphaOrig) reduction--; } else if (movesSearched >= 6) { - reduction = 1 + movesSearched / 6; + reduction = 1 + movesSearched / 8; } if (reduction > 0) reduction = std::clamp(reduction, 1, depth - 2); @@ -526,7 +526,7 @@ std::string extract_pv(const chess::Position &root, int maxPly) { return pv; } -void search(const chess::Position &board, const timeman::LimitsType timecontrol) { +uint64_t search(const chess::Position &board, const timeman::LimitsType timecontrol) { stopSearch = false; tt.newSearch(); static double originalTimeAdjust = -1; @@ -653,5 +653,6 @@ void search(const chess::Position &board, const timeman::LimitsType timecontrol) if (entry && entry->getMove() != Move::none().raw()) report(chess::uci::moveToUci(Move(entry->getMove()), board.chess960())); } + return session.nodes; } } // namespace engine::search diff --git a/search.h b/search.h index 3c14789..7f98f38 100644 --- a/search.h +++ b/search.h @@ -2,6 +2,7 @@ #include "eval.h" #include "timeman.h" #include "tt.h" +#include #include namespace engine::search { struct Session { @@ -18,7 +19,7 @@ struct Session { chess::Color ogcolor; }; void stop(); -void search(const chess::Position &, const timeman::LimitsType); +uint64_t search(const chess::Position &, const timeman::LimitsType); bool isStopped(); extern engine::TranspositionTable tt; } // namespace engine::search diff --git a/timeman.cpp b/timeman.cpp index e5f1524..af9dd8d 100644 --- a/timeman.cpp +++ b/timeman.cpp @@ -22,12 +22,12 @@ void TimeManagement::init(LimitsType &limits, chess::Color us, int ply, double & // If we have no time, we don't need to fully initialize TM. // startTime is used by movetime and useNodesTime is used in elapsed calls. - startTime = limits.startTime; + startTime = now(); if (limits.movetime != 0) { optimumTime = maximumTime = TimePoint(limits.movetime); return; } - if (limits.time[us] == 0 && limits.movetime == 0) { + if (!limits.use_time_management()) { optimumTime = maximumTime = INFINITE_TIME; return; } diff --git a/timeman.h b/timeman.h index e5fab2c..02eebaa 100644 --- a/timeman.h +++ b/timeman.h @@ -15,7 +15,7 @@ struct LimitsType { // Init explicitly due to broken value-initialization of non POD in MSVC LimitsType() { - time[chess::WHITE] = time[chess::BLACK] = inc[chess::WHITE] = inc[chess::BLACK] = movetime = startTime = TimePoint(0); + time[chess::WHITE] = time[chess::BLACK] = inc[chess::WHITE] = inc[chess::BLACK] = movetime = TimePoint(0); movestogo = mate = perft = infinite = 0; depth = 64; nodes = 0; @@ -25,7 +25,7 @@ struct LimitsType { bool use_time_management() const { return time[chess::WHITE] || time[chess::BLACK]; } std::vector searchmoves; - TimePoint time[chess::COLOR_NB], inc[chess::COLOR_NB], movetime, startTime; + TimePoint time[chess::COLOR_NB], inc[chess::COLOR_NB], movetime; int movestogo, depth, mate, perft, infinite; uint64_t nodes; bool ponderMode; diff --git a/uci.cpp b/uci.cpp index 25de47d..2ca788c 100644 --- a/uci.cpp +++ b/uci.cpp @@ -83,8 +83,6 @@ timeman::LimitsType parse_limits(std::istream &is) { timeman::LimitsType limits; std::string token; - limits.startTime = timeman::now(); // The search starts as early as possible - while (is >> token) if (token == "searchmoves") // Needs to be the last command on the line while (is >> token) { @@ -240,6 +238,75 @@ void execCmd(const std::string &line) { score = -score; std::cout << score << std::endl; break; + } else if (token == "bench") { + uint64_t nodes = 0; + const std::vector Defaults = { + "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1", + "r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq - 0 10", + "8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - - 0 11", + "4rrk1/pp1n3p/3q2pQ/2p1pb2/2PP4/2P3N1/P2B2PP/4RRK1 b - - 7 19", + "rq3rk1/ppp2ppp/1bnpb3/3N2B1/3NP3/7P/PPPQ1PP1/2KR3R w - - 7 14 moves d4e6", + "r1bq1r1k/1pp1n1pp/1p1p4/4p2Q/4Pp2/1BNP4/PPP2PPP/3R1RK1 w - - 2 14 moves g2g4", + "r3r1k1/2p2ppp/p1p1bn2/8/1q2P3/2NPQN2/PPP3PP/R4RK1 b - - 2 15", + "r1bbk1nr/pp3p1p/2n5/1N4p1/2Np1B2/8/PPP2PPP/2KR1B1R w kq - 0 13", + "r1bq1rk1/ppp1nppp/4n3/3p3Q/3P4/1BP1B3/PP1N2PP/R4RK1 w - - 1 16", + "4r1k1/r1q2ppp/ppp2n2/4P3/5Rb1/1N1BQ3/PPP3PP/R5K1 w - - 1 17", + "2rqkb1r/ppp2p2/2npb1p1/1N1Nn2p/2P1PP2/8/PP2B1PP/R1BQK2R b KQ - 0 11", + "r1bq1r1k/b1p1npp1/p2p3p/1p6/3PP3/1B2NN2/PP3PPP/R2Q1RK1 w - - 1 16", + "3r1rk1/p5pp/bpp1pp2/8/q1PP1P2/b3P3/P2NQRPP/1R2B1K1 b - - 6 22", + "r1q2rk1/2p1bppp/2Pp4/p6b/Q1PNp3/4B3/PP1R1PPP/2K4R w - - 2 18", + "4k2r/1pb2ppp/1p2p3/1R1p4/3P4/2r1PN2/P4PPP/1R4K1 b - - 3 22", + "3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26", + "6k1/6p1/6Pp/ppp5/3pn2P/1P3K2/1PP2P2/3N4 b - - 0 1", + "3b4/5kp1/1p1p1p1p/pP1PpP1P/P1P1P3/3KN3/8/8 w - - 0 1", + "2K5/p7/7P/5pR1/8/5k2/r7/8 w - - 0 1 moves g5g6 f3e3 g6g5 e3f3", + "8/6pk/1p6/8/PP3p1p/5P2/4KP1q/3Q4 w - - 0 1", + "7k/3p2pp/4q3/8/4Q3/5Kp1/P6b/8 w - - 0 1", + "8/2p5/8/2kPKp1p/2p4P/2P5/3P4/8 w - - 0 1", + "8/1p3pp1/7p/5P1P/2k3P1/8/2K2P2/8 w - - 0 1", + "8/pp2r1k1/2p1p3/3pP2p/1P1P1P1P/P5KR/8/8 w - - 0 1", + "8/3p4/p1bk3p/Pp6/1Kp1PpPp/2P2P1P/2P5/5B2 b - - 0 1", + "5k2/7R/4P2p/5K2/p1r2P1p/8/8/8 b - - 0 1", + "6k1/6p1/P6p/r1N5/5p2/7P/1b3PP1/4R1K1 w - - 0 1", + "1r3k2/4q3/2Pp3b/3Bp3/2Q2p2/1p1P2P1/1P2KP2/3N4 w - - 0 1", + "6k1/4pp1p/3p2p1/P1pPb3/R7/1r2P1PP/3B1P2/6K1 w - - 0 1", + "8/3p3B/5p2/5P2/p7/PP5b/k7/6K1 w - - 0 1", + "5rk1/q6p/2p3bR/1pPp1rP1/1P1Pp3/P3B1Q1/1K3P2/R7 w - - 93 90", + "4rrk1/1p1nq3/p7/2p1P1pp/3P2bp/3Q1Bn1/PPPB4/1K2R1NR w - - 40 21", + "r3k2r/3nnpbp/q2pp1p1/p7/Pp1PPPP1/4BNN1/1P5P/R2Q1RK1 w kq - 0 16", + "3Qb1k1/1r2ppb1/pN1n2q1/Pp1Pp1Pr/4P2p/4BP2/4B1R1/1R5K b - - 11 40", + "4k3/3q1r2/1N2r1b1/3ppN2/2nPP3/1B1R2n1/2R1Q3/3K4 w - - 5 1", + "1r6/1P4bk/3qr1p1/N6p/3pp2P/6R1/3Q1PP1/1R4K1 w - - 1 42", + + // 5-man positions + "8/8/8/8/5kp1/P7/8/1K1N4 w - - 0 1", // Kc2 - mate + "8/8/8/5N2/8/p7/8/2NK3k w - - 0 1", // Na2 - mate + "8/3k4/8/8/8/4B3/4KB2/2B5 w - - 0 1", // draw + + // 6-man positions + "8/8/1P6/5pr1/8/4R3/7k/2K5 w - - 0 1", // Re5 - mate + "8/2p4P/8/kr6/6R1/8/8/1K6 w - - 0 1", // Ka2 - mate + "8/8/3P3k/8/1p6/8/1P6/1K3n2 b - - 0 1", // Nd2 - draw + + // 7-man positions + "8/R7/2q5/8/6k1/8/1P5p/K6R w - - 0 124", // Draw + + // Mate and stalemate positions + "6k1/3b3r/1p1p4/p1n2p2/1PPNpP1q/P3Q1p1/1R1RB1P1/5K2 b - - 0 1", + "r2r1n2/pp2bk2/2p1p2p/3q4/3PN1QP/2P3R1/P4PP1/5RK1 w - - 0 1", + "8/8/8/8/8/6k1/6p1/6K1 w - -", + "7k/7P/6K1/8/3B4/8/8/8 b - -", + }; + timeman::LimitsType tc{};tc.depth=10; + auto start = std::chrono::high_resolution_clock::now(); + for (auto& fen: Defaults){ + std::cerr<(end - start).count(); + std::cout << "nodes " << nodes << " nps " << nodes / (duration_ms / 1000.0) << std::endl; } else if (token == "export_weights") { std::string weights_header = "Weights.h"; ss >> weights_header; From 06a2a9ead66b90354d0a0a1724f9921f138fe135 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 10 Jul 2026 13:55:57 +0000 Subject: [PATCH 12/12] Apply clang-format --- score.h | 2 +- uci.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/score.h b/score.h index 6a1d322..d6efe85 100644 --- a/score.h +++ b/score.h @@ -39,7 +39,7 @@ class Score { int value; }; - Score() : score(InternalUnits{ VALUE_ZERO }) {}; + Score() : score(InternalUnits{ VALUE_ZERO }){}; Score(Value v); template bool is() const { return std::holds_alternative(score); } diff --git a/uci.cpp b/uci.cpp index 2ca788c..86e10ca 100644 --- a/uci.cpp +++ b/uci.cpp @@ -297,12 +297,13 @@ void execCmd(const std::string &line) { "8/8/8/8/8/6k1/6p1/6K1 w - -", "7k/7P/6K1/8/3B4/8/8/8 b - -", }; - timeman::LimitsType tc{};tc.depth=10; + timeman::LimitsType tc{}; + tc.depth = 10; auto start = std::chrono::high_resolution_clock::now(); - for (auto& fen: Defaults){ - std::cerr<(end - start).count();