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

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 2117497f2436be1173235d5e782039feab59677d..e8548ac1a451bdb4c4204ec5a4e0df315397c4ed 100644 (file)
--- 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-2020 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
@@ -24,6 +22,7 @@
 #include <thread>
 
 #include "bitboard.h"
+#include "endgame.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
@@ -36,6 +35,7 @@
 #include <grpc++/server_builder.h>
 #include "hashprobe.h"
 #include "hashprobe.grpc.pb.h"
+#include "tt.h"
 
 using grpc::Server;
 using grpc::ServerBuilder;
@@ -81,13 +81,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;
@@ -236,15 +229,17 @@ int main(int argc, char* argv[]) {
 
   std::cout << engine_info() << std::endl;
 
+  CommandLine::init(argc, argv);
   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
+  Eval::NNUE::init();
 
   UCI::loop(argc, argv);