X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=e8548ac1a451bdb4c4204ec5a4e0df315397c4ed;hp=e80d066dfdad353082fea62dc017b3e9f15be7bf;hb=HEAD;hpb=62ae6157a36e926c087b0303973e404a05e6de09

diff --git a/src/main.cpp b/src/main.cpp
index e80d066d..fbd6a7c9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,8 +1,6 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
-  Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
-  Copyright (C) 2015-2019 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+  Copyright (C) 2004-2023 The Stockfish developers (see AUTHORS file)
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,22 +16,28 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <deque>
+#include <cstddef>
 #include <iostream>
+#include <stack>
 #include <thread>
 
 #include "bitboard.h"
+#include "evaluate.h"
+#include "misc.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
-#include "tt.h"
+#include "tune.h"
+#include "types.h"
 #include "uci.h"
-#include "syzygy/tbprobe.h"
 
 #include <grpc/grpc.h>
 #include <grpc++/server.h>
 #include <grpc++/server_builder.h>
 #include "hashprobe.h"
 #include "hashprobe.grpc.pb.h"
+#include "tt.h"
 
 using grpc::Server;
 using grpc::ServerBuilder;
@@ -41,26 +45,29 @@ using grpc::ServerContext;
 using grpc::Status;
 using grpc::StatusCode;
 using namespace hashprobe;
+using namespace Stockfish;
 
 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 +75,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);
@@ -77,23 +84,84 @@ void HashProbeImpl::FillMove(Move move, HashProbeMove* decoded) {
 	if (type_of(move) == CASTLING) {
 		to = make_square(to > from ? FILE_G : FILE_C, rank_of(from));
 	}
-		
-	decoded->set_from_sq(UCI::square(from));
-	decoded->set_to_sq(UCI::square(to));
 
-	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) == EN_PASSANT || 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 &= ~square_bb(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) == EN_PASSANT || 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);
 	if (found) {
-		Value value = entry->value();
-		Value eval = entry->eval();
-		Bound bound = entry->bound();
+		TTEntry entry_copy = *entry;
+		Value value = entry_copy.value();
+		Value eval = entry_copy.eval();
+		Bound bound = entry_copy.bound();
 
 		if (invert) {
 			value = -value;
@@ -105,9 +173,9 @@ void HashProbeImpl::ProbeMove(Position* pos, std::stack<StateInfo>* setup_states
 			}
 		}
 
-		response->set_depth(entry->depth());
+		response->set_depth(entry_copy.depth());
 		FillValue(eval, response->mutable_eval());
-		if (entry->depth() > DEPTH_NONE) {
+		if (entry_copy.depth() > DEPTH_NONE) {
 			FillValue(value, response->mutable_value());
 		}
 		response->set_bound(HashProbeLine::ValueBound(bound));
@@ -115,14 +183,20 @@ 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 (is_ok(entry_copy.move()) &&
+		       pos->pseudo_legal(entry_copy.move()) &&
+		       pos->legal(entry_copy.move())) {
+			FillMove(pos, entry_copy.move(), response->add_pv());
 			if (seen.count(pos->key())) break;
-			pv.push(entry->move());
+			pv.push(entry_copy.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_copy.move(), setup_states->back());
 			entry = TT.probe(pos->key(), found);
+			if (!found) {
+				break;
+			}
+			entry_copy = *entry;
 		}
 
 		// Unroll the PV back again, so the Position object remains unchanged.
@@ -136,7 +210,7 @@ void HashProbeImpl::ProbeMove(Position* pos, std::stack<StateInfo>* setup_states
 void HashProbeImpl::FillValue(Value value, HashProbeScore* score) {
 	if (abs(value) < VALUE_MATE - MAX_PLY) {
 		score->set_score_type(HashProbeScore::SCORE_CP);
-		score->set_score_cp(value * 100 / PawnValueEg);
+		score->set_score_cp(value * 100 / UCI::NormalizeToPawnValue);
 	} else {
 		score->set_score_type(HashProbeScore::SCORE_MATE);
 		score->set_score_mate((value > 0 ? VALUE_MATE - value + 1 : -VALUE_MATE - value) / 2);
@@ -155,28 +229,21 @@ void HashProbeThread::Shutdown() {
 	server->Shutdown();
 }
 
-namespace PSQT {
-  void init();
-}
-
 int main(int argc, char* argv[]) {
 
-  std::cout << engine_info() << std::endl;
-
-  UCI::init(Options);
-  PSQT::init();
-  Bitboards::init();
-  Position::init();
-  Bitbases::init();
-  Search::init();
-  Pawns::init();
-  Threads.set(Options["Threads"]);
-  Search::clear(); // After threads are up
+    std::cout << engine_info() << std::endl;
 
-  HashProbeThread thr("0.0.0.0:50051");
+    CommandLine::init(argc, argv);
+    UCI::init(Options);
+    Tune::init();
+    Bitboards::init();
+    Position::init();
+    Threads.set(size_t(Options["Threads"]));
+    Search::clear();  // After threads are up
+    Eval::NNUE::init();
 
-  UCI::loop(argc, argv);
+    UCI::loop(argc, argv);
 
-  Threads.set(0);
-  return 0;
+    Threads.set(0);
+    return 0;
 }