tune

Author: winapiadmin

.github/workflows/spsa.yml

@@ -2,11 +2,6 @@ name: run SPSA (see gist)
 
 on:
   workflow_dispatch:
-    inputs:
-      output_exec:
-        description: "Executable output file name"
-        required: false
-        default: "engine"
 jobs:
   worker:
     runs-on: ubuntu-latest

Weights.h

@@ -16,8 +16,6 @@ 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;
@@ -35,16 +33,6 @@ 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 = 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;
 inline Value mgMobilityCnt[7][8] = {
     {   0,   0,  0, 0,  0,  0,  0,  0 },
     {   0,   0,  0, 0,  0,  0,  0,  0 },
@@ -109,6 +97,8 @@ inline Value mg_pawn_table[56] = { 0,   0,   0,   0,   0,  0,   0,  0,  0,   0,
 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] = {
@@ -125,17 +115,25 @@ inline Value threatByMinor[7][2] = {
     { 15, 25 },
     { 15, 25 },
     { 25, 35 },
-    { 35, 50 },
-    {  0,  0 }
+    { 35, 50 }
 };
 inline Value threatByRook[7][2] = {
     {  0,  0 },
     {  0,  0 },
     { 10, 15 },
     { 10, 15 },
     { 20, 25 },
-    { 25, 35 },
-    {  0,  0 }
+    { 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

eval.cpp

@@ -238,7 +238,7 @@ EvalComponents eval_components(const chess::Position &board) {
     // Precompute pawn attacks (needed for outpost, threats, etc.)
     Bitboard pawnBB[2] = { board.pieces(PAWN, WHITE), board.pieces(PAWN, BLACK) };
     Bitboard pawnAtks[2] = { attacks::pawn<WHITE>(pawnBB[WHITE]), attacks::pawn<BLACK>(pawnBB[BLACK]) };
-#if 0
+#if 1
     // Development bonus: penalize undeveloped knights/bishops in middlegame
     int devCount[2] = { 0, 0 };
     for (Color c : { WHITE, BLACK }) {
@@ -250,7 +250,7 @@ EvalComponents eval_components(const chess::Position &board) {
         devCount[c] = popcount(knightsHome) + popcount(bishopsHome);
     }
     mgScore += (devCount[BLACK] - devCount[WHITE]) * developedMg;
-    egScore += (devCount[BLACK] - devCount[WHITE]) * developedEg;
+    //egScore += (devCount[BLACK] - devCount[WHITE]) * developedEg;
 
     // Early queen development penalty: queen moved but minors still on back rank
     for (Color c : { WHITE, BLACK }) {
@@ -312,7 +312,7 @@ EvalComponents eval_components(const chess::Position &board) {
                 mgScore += _sign * (7 - kd) * kingTropismMg[pt];
                 egScore += _sign * (7 - kd) * kingTropismEg[pt];
             }
-#if 0
+#if 1
             // King protector: bonus for pieces close to own king
             if (pt != PAWN && pt != KING) {
                 int kdist = square_distance(sq, board.kingSq(pc));
@@ -361,7 +361,7 @@ EvalComponents eval_components(const chess::Position &board) {
             }
         }
     }
-#if 0
+#if 1
     // Trapped bishop penalty
     for (Color c : { WHITE, BLACK }) {
         int s = (c == WHITE) ? 1 : -1;
@@ -394,7 +394,7 @@ EvalComponents eval_components(const chess::Position &board) {
             }
         }
     }
-#if 0
+#if 1
     // Rook on seventh rank bonus (endgame, x-raying >=2 undefended pawns)
     for (Color c : { WHITE, BLACK }) {
         int s = (c == WHITE) ? 1 : -1;
@@ -463,7 +463,7 @@ EvalComponents eval_components(const chess::Position &board) {
             }
         }
     }
-#if 0
+#if 1
     // Pawn rams: blocked pawn penalty
     for (Color c : { WHITE, BLACK }) {
         int s = (c == WHITE) ? 1 : -1;
@@ -606,7 +606,7 @@ EvalComponents eval_components(const chess::Position &board) {
     }
 
 // --- Threat evaluation ---
-#if 0
+#if 1
     for (Color c : { WHITE, BLACK }) {
         int s = (c == WHITE) ? 1 : -1;
         Color opp = ~c;

spsa.py

@@ -255,7 +255,7 @@ def run_fastchess_match(plus_params, minus_params, args, iteration):
         return 0.5, 0.5
     stats = output_config.get("stats", {})
 
-    if stats_key in stats and "wins" in stats[stats_key]:
+    if "Plus vs Minus" in stats and "wins" in stats["Plus vs Minus"]:
         w = stats[stats_key]["wins"]
         l = stats[stats_key]["losses"]
         d = stats[stats_key]["draws"]