improvements and bugfix

.clang-format

@@ -0,0 +1,16 @@
+BasedOnStyle: LLVM
+IndentWidth: 4
+ContinuationIndentWidth: 4
+ColumnLimit: 128
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: false
+BinPackParameters: false
+BinPackArguments: false
+BraceWrapping:
+#  AfterInitializerList: true
+  AfterFunction: true
+  BeforeElse: false
+  IndentBraces: false
+AlignArrayOfStructures: Right
+Cpp11BracedListStyle: false
+SpacesInContainerLiterals: false

.github/workflows/games.yml

@@ -6,19 +6,27 @@ on:
       base_ref:
         description: "Base branch, tag, or commit"
         required: false
-        default: "HandcraftedEngine"
+        default: "test_chesslib"
       rounds:
         description: "Max rounds for SPRT"
         required: false
         default: "6000"
       tc:
-        description: "Time control (e.g. 60+0.5 or 10+0.1)"
+        description: "Time control (e.g. 60+0.6 or 10+0.1)"
         required: false
-        default: "60+0.5"
+        default: "60+0.6"
+      elo0:
+        description: "elo0"
+        required: false
+        default: "0.5"
+      elo1:
+        description: "elo1"
+        required: false
+        default: "2.5"
       output_exec:
         description: "Executable output file name"
         required: false
-        default: "chess_engine"
+        default: "engine"
 
 permissions:
   contents: write
@@ -31,14 +39,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          path: test_chesslib
+          path: new
 
       - name: Install deps
         run: sudo apt update && sudo apt install -y build-essential cmake
 
       - name: Build new engine
         run: |
-          cd test_chesslib
+          cd new
           mkdir build
           cd build
           cmake .. -DCMAKE_BUILD_TYPE=Release
@@ -48,7 +56,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: new-engine
-          path: test_chesslib/build/engine
+          path: new/build/engine
 
 
   build-base:
@@ -58,14 +66,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.base_ref }}
-          path: handcrafted
+          path: base
 
       - name: Install deps
         run: sudo apt update && sudo apt install -y build-essential cmake
 
       - name: Build base engine
         run: |
-          cd handcrafted
+          cd base
           mkdir build
           cd build
           cmake .. -DCMAKE_BUILD_TYPE=Release
@@ -75,7 +83,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: base-engine
-          path: handcrafted/build/${{ github.event.inputs.output_exec }}
+          path: base/build/${{ github.event.inputs.output_exec }}
 
 
   test:
@@ -115,7 +123,7 @@ jobs:
             -rounds ${{ github.event.inputs.rounds }} \
             -concurrency $(nproc) \
             -pgnout notation=san nodes=true file=games.pgn \
-            -sprt elo0=0 elo1=2 alpha=0.05 beta=0.05 | tee results.txt
+            -sprt elo0=${{ github.event.inputs.elo0 }} elo1=${{ github.event.inputs.elo1 }} alpha=0.05 beta=0.05 | tee results.txt
 
           ./ordo-linux64 -o ratings.txt -- games.pgn
           sed -n '/Results of new vs base/,/^--------------------------------------------------$/p' results.txt >> ratings.txt
@@ -127,3 +135,4 @@ jobs:
           path: |
             games.pgn
             ratings.txt
+            results.txt

.gitignore

@@ -10,4 +10,5 @@
 !.gitignore
 !CMakeLists.txt
 !.github/
-!.github/**
+!.github/**
+!.clang-format

CMakeLists.txt

@@ -11,9 +11,35 @@ FetchContent_Declare(
     GIT_REPOSITORY https://github.com/winapiadmin/chesslib.git
     GIT_TAG main
 )
-FetchContent_MakeAvailable(chesslib)
-add_executable(engine "main.cpp" "timeman.cpp" "timeman.h" "eval.h" "eval.cpp" "tune.h" "ucioption.h" "tune.cpp" "ucioption.cpp" "tt.h" "tt.cpp" "uci.cpp" "uci.h" "search.h" "search.cpp" "score.h" "score.cpp" "movepick.h" "movepick.cpp")
-target_link_libraries(engine PRIVATE chesslib)
+FetchContent_Declare(
+    tbprobe
+    GIT_REPOSITORY https://github.com/winapiadmin/tb_probing_tool.git
+    GIT_TAG main
+)
+set(BUILD_GAVIOTA OFF CACHE BOOL "Enable Gaviota TB probing" FORCE)
+option(ENGINE_TUNING "enable Texel tuning (requires csv-parser)" OFF)
+FetchContent_MakeAvailable(chesslib tbprobe)
+set(SOURCES 
+    "main.cpp" 
+    "timeman.cpp" 
+    "eval.cpp" 
+    "tune.cpp"
+    "ucioption.cpp" 
+    "tt.cpp" 
+    "uci.cpp" 
+    "search.cpp" 
+    "score.cpp" 
+    "movepick.cpp" 
+    "tb.cpp"
+)
+
+if(ENGINE_TUNING)
+    list(APPEND SOURCES "tune_cmd.cpp")
+endif()
+
+add_executable(engine ${SOURCES})
+
+target_link_libraries(engine PRIVATE chesslib syzygy_probe)
 target_include_directories(engine PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${chesslib_SOURCE_DIR})
 execute_process(
     COMMAND git rev-parse --short HEAD
@@ -39,5 +65,14 @@ else()
 endif()
 
 message(STATUS "Build Version: ${BUILD_VERSION}")
-add_definitions(-DBUILD_VERSION="${BUILD_VERSION}")
-
+target_compile_definitions(engine PRIVATE BUILD_VERSION="${BUILD_VERSION}")
+if (ENGINE_TUNING)
+    FetchContent_Declare(
+        csv
+        GIT_REPOSITORY https://github.com/vincentlaucsb/csv-parser.git
+        GIT_TAG master
+    )
+    FetchContent_MakeAvailable(csv)
+    target_link_libraries(engine PRIVATE csv)
+    target_compile_definitions(engine PRIVATE USE_CSV_PARSER)
+endif()

Makefile

@@ -0,0 +1,47 @@
+# :( openbench and fishtest require make
+TARGET = engine
+
+CXX ?= g++
+CXXFLAGS ?= -std=c++17 -Wall -Wextra
+OPTFLAGS ?= -O3
+ifeq ($(LTO), yes)
+    OPTFLAGS += -flto
+endif
+ifeq ($(debug),no)
+    CXXFLAGS += -DNDEBUG
+endif
+ARCH ?= native
+
+ifeq ($(ARCH), native)
+    CXXFLAGS += -march=native -mtune=native
+endif
+ifeq ($(ARCH), avx2)
+    CXXFLAGS += -march=haswell -mavx2 -mbmi -mbmi2 -msse4.1
+endif
+ifeq ($(ARCH), bmi2)
+    CXXFLAGS += -mbmi2
+endif
+ifeq ($(ARCH), sse41)
+    CXXFLAGS += -msse4.1
+endif
+ifeq ($(ARCH), x86-64)
+    CXXFLAGS += -march=x86-64
+endif
+deps:
+	test -d deps/chesslib || git clone https://github.com/winapiadmin/chesslib deps/chesslib
+	test -d deps/tbprobe || git clone https://github.com/winapiadmin/tb_probing_tool deps/tbprobe
+# Tuning is not required on Makefile, use CMake.
+SRCS = $(filter-out tune_cmd.cpp, $(wildcard *.cpp)) $(wildcard deps/chesslib/*.cpp) $(wildcard deps/tbprobe/*.cpp)
+OBJS = $(SRCS:.cpp=.o)
+
+.PHONY: all clean deps
+all: deps $(TARGET)
+
+$(TARGET): $(OBJS)
+	$(CXX) $(CXXFLAGS) $(OPTFLAGS) -o $(TARGET) $(OBJS)
+
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) $(OPTFLAGS) -Ideps/chesslib -Ideps/tbprobe/syzygy -c $< -o $@
+
+clean:
+	rm -f $(OBJS) $(TARGET)

Weights.h

@@ -0,0 +1,139 @@
+#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