Simplify a bit.

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index d0817a3d07b8b3c7c6ab126645af04e71afb2a77..2117497f2436be1173235d5e782039feab59677d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,9 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <deque>
 #include <iostream>
+#include <stack>
 #include <thread>
 
 #include "bitboard.h"
@@ -45,22 +47,24 @@ using namespace hashprobe;
 Status HashProbeImpl::Probe(ServerContext* context,
                             const HashProbeRequest* request,
                            HashProbeResponse *response) {
-       Position pos(request->fen(), /*isChess960=*/false, Threads.main());
+       Position pos;
+       StateInfo st;
+       pos.set(request->fen(), /*isChess960=*/false, &st, Threads.main());
        if (!pos.pos_is_ok()) {
                return Status(StatusCode::INVALID_ARGUMENT, "Invalid FEN");
        }
 
        bool invert = (pos.side_to_move() == BLACK);
-       Search::StateStackPtr setup_states = Search::StateStackPtr(new std::stack<StateInfo>);
+       StateListPtr setup_states = StateListPtr(new std::deque<StateInfo>(1));
 
        ProbeMove(&pos, setup_states.get(), invert, response->mutable_root());
 
        MoveList<LEGAL> moves(pos);
        for (const ExtMove* em = moves.begin(); em != moves.end(); ++em) {
                HashProbeLine *line = response->add_line();
-               FillMove(em->move, line->mutable_move());
-               setup_states->push(StateInfo());
-               pos.do_move(em->move, setup_states->top(), pos.gives_check(em->move, CheckInfo(pos)));
+               FillMove(&pos, em->move, line->mutable_move());
+               setup_states->push_back(StateInfo());
+               pos.do_move(em->move, setup_states->back());
                ProbeMove(&pos, setup_states.get(), !invert, line);
                pos.undo_move(em->move);
        }
@@ -68,7 +72,7 @@ Status HashProbeImpl::Probe(ServerContext* context,
        return Status::OK;
 }
 
-void HashProbeImpl::FillMove(Move move, HashProbeMove* decoded) {
+void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
        if (!is_ok(move)) return;
 
        Square from = from_sq(move);
@@ -84,9 +88,76 @@ void HashProbeImpl::FillMove(Move move, HashProbeMove* decoded) {
        if (type_of(move) == PROMOTION) {
                decoded->set_promotion(std::string() + " PNBRQK"[promotion_type(move)]);
        }
+
+       Piece moved_piece = pos->moved_piece(move);
+       std::string pretty;
+       if (type_of(move) == CASTLING) {
+               if (to > from) {
+                       pretty = "O-O";
+               } else {
+                       pretty = "O-O-O";
+               }
+       } else if (type_of(moved_piece) == PAWN) {
+               if (type_of(move) == ENPASSANT || pos->piece_on(to) != NO_PIECE) {
+                       // Capture.
+                       pretty = char('a' + file_of(from));
+                       pretty += "x";
+               }
+               pretty += UCI::square(to);
+               if (type_of(move) == PROMOTION) {
+                       pretty += "=";
+                       pretty += " PNBRQK"[promotion_type(move)];
+               }
+       } else {
+               pretty = " PNBRQK"[type_of(moved_piece)];
+               Bitboard attackers = pos->attackers_to(to) & pos->pieces(color_of(moved_piece), type_of(moved_piece));
+               if (more_than_one(attackers)) {
+                       // Remove all illegal moves to disambiguate.
+                       Bitboard att_copy = attackers;
+                       while (att_copy) {
+                               Square s = pop_lsb(&att_copy);
+                               Move m = make_move(s, to);
+                               if (!pos->pseudo_legal(m) || !pos->legal(m)) {
+                                       attackers &= ~SquareBB[s];
+                               }
+                       }
+               }
+               if (more_than_one(attackers)) {
+                       // Disambiguate by file if possible.
+                       Bitboard attackers_this_file = attackers & file_bb(file_of(from));
+                       if (attackers != attackers_this_file) {
+                               pretty += char('a' + file_of(from));
+                               attackers = attackers_this_file;
+                       }
+                       if (more_than_one(attackers)) {
+                               // Still ambiguous, so need to disambiguate by rank.
+                               pretty += char('1' + rank_of(from));
+                       }
+               }
+
+               if (type_of(move) == ENPASSANT || pos->piece_on(to) != NO_PIECE) {
+                       pretty += "x";
+               }
+
+               pretty += UCI::square(to);
+       }
+
+       if (pos->gives_check(move)) {
+               // Check if mate.
+               StateInfo si;
+               pos->do_move(move, si, true);
+               if (MoveList<LEGAL>(*pos).size() > 0) {
+                       pretty += "+";
+               } else {
+                       pretty += "#";
+               }
+               pos->undo_move(move);
+       }
+
+       decoded->set_pretty(pretty);
 }
 
-void HashProbeImpl::ProbeMove(Position* pos, std::stack<StateInfo>* setup_states, bool invert, HashProbeLine* response) {
+void HashProbeImpl::ProbeMove(Position* pos, std::deque<StateInfo>* setup_states, bool invert, HashProbeLine* response) {
        bool found;
        TTEntry *entry = TT.probe(pos->key(), found);
        response->set_found(found);
@@ -115,13 +186,15 @@ void HashProbeImpl::ProbeMove(Position* pos, std::stack<StateInfo>* setup_states
                // Follow the PV until we hit an illegal move.
                std::stack<Move> pv;
                std::set<Key> seen;
-               while (found && is_ok(entry->move())) {
-                       FillMove(entry->move(), response->add_pv());
+               while (found && is_ok(entry->move()) &&
+                      pos->pseudo_legal(entry->move()) &&
+                      pos->legal(entry->move())) {
+                       FillMove(pos, entry->move(), response->add_pv());
                        if (seen.count(pos->key())) break;
                        pv.push(entry->move());
                        seen.insert(pos->key());
-                       setup_states->push(StateInfo());
-                       pos->do_move(entry->move(), setup_states->top(), pos->gives_check(entry->move(), CheckInfo(*pos)));
+                       setup_states->push_back(StateInfo());
+                       pos->do_move(entry->move(), setup_states->back());
                        entry = TT.probe(pos->key(), found);
                }