Merge remote-tracking branch 'upstream/master' into HEAD

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 5eb1b1f0f632c5fcc50681c85b79c4108bd33dfd..98cbfc978f45142b0ae8638491c478ceb2684939 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,7 +2,7 @@
   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) 2015-2020 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 #include <thread>
 
 #include "bitboard.h"
+#include "endgame.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
@@ -36,6 +37,7 @@
 #include <grpc++/server_builder.h>
 #include "hashprobe.h"
 #include "hashprobe.grpc.pb.h"
+#include "tt.h"
 
 using grpc::Server;
 using grpc::ServerBuilder;
@@ -64,7 +66,7 @@ Status HashProbeImpl::Probe(ServerContext* context,
                HashProbeLine *line = response->add_line();
                FillMove(&pos, em->move, line->mutable_move());
                setup_states->push_back(StateInfo());
-               pos.do_move(em->move, setup_states->back(), pos.gives_check(em->move));
+               pos.do_move(em->move, setup_states->back());
                ProbeMove(&pos, setup_states.get(), !invert, line);
                pos.undo_move(em->move);
        }
@@ -81,13 +83,6 @@ void HashProbeImpl::FillMove(Position *pos, 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;
@@ -194,7 +189,7 @@ void HashProbeImpl::ProbeMove(Position* pos, std::deque<StateInfo>* setup_states
                        pv.push(entry->move());
                        seen.insert(pos->key());
                        setup_states->push_back(StateInfo());
-                       pos->do_move(entry->move(), setup_states->back(), pos->gives_check(entry->move()));
+                       pos->do_move(entry->move(), setup_states->back());
                        entry = TT.probe(pos->key(), found);
                }
 
@@ -237,13 +232,13 @@ int main(int argc, char* argv[]) {
   std::cout << engine_info() << std::endl;
 
   UCI::init(Options);
+  Tune::init();
   PSQT::init();
   Bitboards::init();
   Position::init();
   Bitbases::init();
-  Search::init();
-  Pawns::init();
-  Threads.set(Options["Threads"]);
+  Endgames::init();
+  Threads.set(size_t(Options["Threads"]));
   Search::clear(); // After threads are up
 
   UCI::loop(argc, argv);