Fix PV output in Chess960

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 829e1bbef9bb3155048e72d65e424b8ba7c2eb87..c018cbe3c49b7283d3d64de2f5ce235c79b74864 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -212,7 +212,7 @@ namespace {
   int current_search_time(int set = 0);
   std::string score_to_uci(Value v, Value alpha, Value beta);
   std::string speed_to_uci(int64_t nodes);
-  std::string pv_to_uci(Move pv[], int pvNum);
+  std::string pv_to_uci(Move pv[], int pvNum, bool chess960);
   std::string depth_to_uci(Depth depth);
   void poll(const Position& pos);
   void wait_for_stop_or_ponderhit();
@@ -589,7 +589,7 @@ namespace {
                          << depth_to_uci(depth * ONE_PLY)
                          << score_to_uci(Rml[i].pv_score, alpha, beta)
                          << speed_to_uci(pos.nodes_searched())
-                         << pv_to_uci(Rml[i].pv, i + 1) << endl;
+                         << pv_to_uci(Rml[i].pv, i + 1, pos.is_chess960()) << endl;
 
             // In case of failing high/low increase aspiration window and research,
             // otherwise exit the fail high/low loop.
@@ -633,12 +633,6 @@ namespace {
         // Check for some early stop condition
         if (!StopRequest && Limits.useTimeManagement())
         {
-            // Stop search early when the last two iterations returned a mate score
-            if (   depth >= 5
-                && abs(bestValues[depth])     >= VALUE_MATE_IN_PLY_MAX
-                && abs(bestValues[depth - 1]) >= VALUE_MATE_IN_PLY_MAX)
-                StopRequest = true;
-
             // Stop search early if one move seems to be much better than the
             // others or if there is only a single legal move. Also in the latter
             // case we search up to some depth anyway to get a proper score.
@@ -1549,6 +1543,7 @@ split_point_start: // At split points actual search starts from here
 
     Square f1, t1, f2, t2;
     Piece p1, p2;
+    Square ksq;
 
     assert(m1 && move_is_ok(m1));
     assert(m2 && move_is_ok(m2));
@@ -1577,16 +1572,13 @@ split_point_start: // At split points actual search starts from here
         return true;
 
     // Case 5: Discovered check, checking piece is the piece moved in m1
+    ksq = pos.king_square(pos.side_to_move());
     if (    piece_is_slider(p1)
-        &&  bit_is_set(squares_between(t1, pos.king_square(pos.side_to_move())), f2)
-        && !bit_is_set(squares_between(t1, pos.king_square(pos.side_to_move())), t2))
+        &&  bit_is_set(squares_between(t1, ksq), f2))
     {
-        // discovered_check_candidates() works also if the Position's side to
-        // move is the opposite of the checking piece.
-        Color them = opposite_color(pos.side_to_move());
-        Bitboard dcCandidates = pos.discovered_check_candidates(them);
-
-        if (bit_is_set(dcCandidates, f2))
+        Bitboard occ = pos.occupied_squares();
+        clear_bit(&occ, f2);
+        if (bit_is_set(pos.attacks_from(p1, t1, occ), ksq))
             return true;
     }
     return false;
@@ -1786,11 +1778,11 @@ split_point_start: // At split points actual search starts from here
   // pv_to_uci() returns a string with information on the current PV line
   // formatted according to UCI specification.
 
-  std::string pv_to_uci(Move pv[], int pvNum) {
+  std::string pv_to_uci(Move pv[], int pvNum, bool chess960) {
 
     std::stringstream s;
 
-    s << " multipv " << pvNum << " pv ";
+    s << " multipv " << pvNum << " pv " << set960(chess960);
 
     for ( ; *pv != MOVE_NONE; pv++)
         s << *pv << " ";
@@ -2025,7 +2017,7 @@ split_point_start: // At split points actual search starts from here
     while (   (tte = TT.probe(pos.get_key())) != NULL
            && tte->move() != MOVE_NONE
            && pos.move_is_pl(tte->move())
-           && pos.pl_move_is_legal(tte->move(), pos.pinned_pieces(pos.side_to_move()))
+           && pos.pl_move_is_legal(tte->move(), pos.pinned_pieces())
            && ply < PLY_MAX
            && (!pos.is_draw<false>() || ply < 2))
     {