resolved issues

Author: winapiadmin

Makefile

@@ -31,9 +31,10 @@ 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 tuning_cmd.cpp, $(wildcard *.cpp)) $(wildcard deps/chesslib/*.cpp) $(wildcard deps/tbprobe/*.cpp)
+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)

eval.cpp

@@ -712,12 +712,14 @@ EvalComponents eval_components(const chess::Position &board) {
         board.count<ROOK>() == 0 && board.count<QUEEN>() == 0)
         return { 0, 0, 0 };
 
-    phase = (phase * 256 + TotalPhase / 2) / TotalPhase;
+    phase = std::min((phase * 256 + TotalPhase / 2) / TotalPhase, 256);
     return { mgScore, egScore, phase };
 }
 Value eval(const chess::Position &board) {
     const int sign = board.side_to_move() == WHITE ? 1 : -1;
     auto [mg, eg, phase] = eval_components(board);
+    if (mg == 0 && eg == 0)
+        return 0;
     return (((mg * phase) + (eg * (256 - phase))) * sign) / 256 + engine::eval::tempo;
 }
 Value piece_value(PieceType pt) {

main.cpp

@@ -4,6 +4,7 @@
 #include "uci.h"
 #include "ucioption.h"
 #include <iostream>
+#include <new>
 using namespace engine;
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
@@ -13,7 +14,11 @@ int main() {
     std::cout << "cppchess_engine version " << BUILD_VERSION << '\n';
     options.add("Move Overhead", Option(10, 0, 1000));
     options.add("Hash", Option(16, 1, 1 << 25, [](const Option &o) {
-                    search::tt.resize(int(o));
+                    try {
+                        search::tt.resize(int(o));
+                    } catch (std::bad_alloc &) {
+                        std::cerr << "info string Hash resize failed: bad_alloc\n";
+                    }
                     return std::nullopt;
                 }));
 
@@ -22,11 +27,11 @@ int main() {
 
                     return std::nullopt;
                 }));
-    // work in progress
     options.add("SyzygyPath", Option("", [](const Option &o) {
                     tb::init(std::string(o));
                     return std::nullopt;
                 }));
     Tune::init(options);
+    std::cout.flush();
     loop();
 }

movepick.cpp

@@ -58,6 +58,8 @@ Value see(Position &board, Move move) {
 
     Bitboard occ = board.occ();
     occ ^= 1ULL << from;
+    if (move.type_of() == EN_PASSANT)
+        occ ^= 1ULL << Square(int(to) + (board.side_to_move() == WHITE ? -8 : 8));
 
     Bitboard attackers = board.attackers(WHITE, to, occ) | board.attackers(BLACK, to, occ);
 
@@ -77,9 +79,7 @@ Value see(Position &board, Move move) {
         if (gain[d] < 0)
             break;
 
-        occ &= attackers;
-
-        Bitboard stmAttackers = attackers & occ & board.occ(stm);
+        Bitboard stmAttackers = attackers & board.occ(stm);
         if (!stmAttackers)
             break;
 

search.cpp

@@ -72,6 +72,7 @@ Value qsearch(Position &board, Value alpha, Value beta, search::Session &session
     session.qnodes++;
     session.seldepth = std::max(session.seldepth, ply);
     if (((session.nodes & 2047) == 0 && session.tm.elapsed() >= session.tm.optimum()) ||
+        (session.tc.nodes > 0 && session.nodes >= session.tc.nodes) ||
         stopSearch.load(std::memory_order_relaxed))
         return VALUE_NONE;
 
@@ -187,6 +188,7 @@ Value doSearch(
     if (depth <= 0)
         return qsearch(board, alpha, beta, session, ply);
     if (((session.nodes & 2047) == 0 && session.tm.elapsed() >= session.tm.optimum()) ||
+        (session.tc.nodes > 0 && session.nodes >= session.tc.nodes) ||
         stopSearch.load(std::memory_order_relaxed))
         return VALUE_NONE;
 
@@ -417,7 +419,8 @@ Value doSearch(
             } else if (movesSearched >= 6) {
                 reduction = 1 + movesSearched / 8;
             }
-            reduction = std::clamp(reduction, 1, depth - 2);
+            if (reduction > 0)
+                reduction = std::clamp(reduction, 1, depth - 2);
         }
 
         int ext = 0;
@@ -569,7 +572,10 @@ void search(const chess::Position &board, const timeman::LimitsType timecontrol)
         Position board_ = board;
         Move best = Move::none();
         Value bestScore = -VALUE_INFINITE;
-        Session tmpSession{};
+        double unusedTimeAdjust = -1;
+        Session tmpSession;
+        tmpSession.tc = session.tc;
+        tmpSession.tm.init(session.tc, board.side_to_move(), board.ply(), unusedTimeAdjust);
         for (Move move : moves) {
             if (!session.tc.searchmoves.empty() &&
                 std::find(session.tc.searchmoves.begin(),
@@ -669,7 +675,10 @@ void search(const chess::Position &board, const timeman::LimitsType timecontrol)
                 Position board_ = board;
                 Move best = Move::none();
                 Value bestScore = -VALUE_INFINITE;
-                Session tmpSession{};
+                double unusedTimeAdjust = -1;
+                Session tmpSession;
+                tmpSession.tc = session.tc;
+                tmpSession.tm.init(session.tc, board.side_to_move(), board.ply(), unusedTimeAdjust);
                 for (Move move : moves) {
                     if (!session.tc.searchmoves.empty() &&
                         std::find(session.tc.searchmoves.begin(),

search.h

@@ -10,10 +10,10 @@ struct Session {
     int seldepth = 0;
     uint64_t nodes = 0, qnodes = 0, lmrResearches = 0;
     uint64_t tbHits = 0, ttHits = 0, ttCutoffs = 0, nullCutoffs = 0;
-    chess::Move pv[MAX_PLY][MAX_PLY];
+    chess::Move pv[MAX_PLY][MAX_PLY]{};
     Value historyHeuristic[chess::SQUARE_NB][chess::SQUARE_NB]{};
-    chess::Move killerMoves[MAX_PLY][2];
-    chess::Move counterMoves[4096];
+    chess::Move killerMoves[MAX_PLY][2]{};
+    chess::Move counterMoves[4096]{};
     timeman::TimePoint lastLogTime;
     int depth = 0;
     chess::Color ogcolor;

tb.cpp

@@ -28,9 +28,13 @@ void init(const std::string &path) {
         return;
     }
 
-    tbprobe::syzygy::initialize();
-    tablebase.add_directory(path, true, true);
-    std::cout << "info string Found " << wdl_count() << " WDL and " << dtz_count() << " DTZ tablebase files\n";
+    try {
+        tbprobe::syzygy::initialize();
+        tablebase.add_directory(path, true, true);
+        std::cout << "info string Found " << wdl_count() << " WDL and " << dtz_count() << " DTZ tablebase files\n";
+    } catch (const std::exception &e) {
+        std::cout << "info string Syzygy init failed: " << e.what() << '\n';
+    }
 }
 
 std::size_t wdl_count() { return unique_table_count(tablebase.wdl); }

tt.cpp

@@ -19,8 +19,8 @@ static inline uint64_t index_for_hash(uint64_t hash, uint64_t buckets) {
     __uint128_t prod = (__uint128_t)hash * (__uint128_t)buckets;
     return (uint64_t)(prod >> 64);
 #else
-    uint64_t aL = uint32_t(hash), aH = a >> 32;
-    uint64_t bL = uint32_t(buckets), bH = b >> 32;
+    uint64_t aL = uint32_t(hash), aH = hash >> 32;
+    uint64_t bL = uint32_t(buckets), bH = buckets >> 32;
     uint64_t c1 = (aL * bL) >> 32;
     uint64_t c2 = aH * bL + c1;
     uint64_t c3 = aL * bH + uint32_t(c2);
@@ -56,7 +56,7 @@ void TranspositionTable::store(uint64_t hash, chess::Move best, int16_t score, i
 }
 
 TTEntry *TranspositionTable::lookup(uint64_t hash) {
-    if (buckets == 0)
+    if (buckets == 0 || hash == 0)
         return nullptr;
 
     uint64_t bucket = index_for_hash(hash, buckets);

tt.h

@@ -83,7 +83,7 @@ struct TTEntry {
 };
 class TranspositionTable {
     TTEntry *table;
-    int buckets; // number of buckets (pairs)
+    size_t buckets; // number of buckets (pairs)
     uint32_t time;
 
   public:

tune.cpp

@@ -21,6 +21,7 @@
 #include <algorithm>
 #include <cctype>
 #include <climits>
+#include <cstdlib>
 #include <iostream>
 #include <map>
 #include <optional>
@@ -76,7 +77,7 @@ void Tune::make_option(OptionsMap *opts, const string &n, int v, const SetRange
               << a << ","              //
               << b << ","              //
               << (b - a) / 20.0 << "," //
-              << "0.0020" << std::endl;
+              << "0.0020" << '\n';
 }
 
 string Tune::next(string &names, bool pop) {