Small touches to book.cpp

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index d75350b17f7ea1f43413754318c6754c73cf48ae..b2cb0745cd0343cbe2d20e852b8084942973bd0d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,6 +28,7 @@
 #include "evaluate.h"
 #include "position.h"
 #include "thread.h"
+#include "search.h"
 #include "ucioption.h"
 
 #ifdef USE_CALLGRIND
@@ -36,9 +37,9 @@
 
 using namespace std;
 
-extern bool execute_uci_command(const string& cmd);
+extern void uci_loop();
 extern void benchmark(int argc, char* argv[]);
-extern void init_kpk_bitbase();
+extern void kpk_bitbase_init();
 
 int main(int argc, char* argv[]) {
 
@@ -50,12 +51,10 @@ int main(int argc, char* argv[]) {
 
   // Startup initializations
   init_bitboards();
-  init_uci_options();
-  Position::init_zobrist();
-  Position::init_piece_square_tables();
-  init_eval(1);
-  init_kpk_bitbase();
-  init_threads();
+  Position::init();
+  kpk_bitbase_init();
+  init_search();
+  Threads.init();
 
 #ifdef USE_CALLGRIND
   CALLGRIND_START_INSTRUMENTATION;
@@ -64,25 +63,21 @@ int main(int argc, char* argv[]) {
   if (argc < 2)
   {
       // Print copyright notice
-      cout << engine_name() << " by " << engine_author() << endl;
+      cout << engine_name() << " by " << engine_authors() << endl;
 
       if (CpuHasPOPCNT)
           cout << "Good! CPU has hardware POPCNT." << endl;
 
-      // Wait for a command from the user, and passes this command to
-      // execute_uci_command() and also intercepts EOF from stdin to
-      // ensure that we exit gracefully if the GUI dies unexpectedly.
-      string cmd;
-      while (getline(cin, cmd) && execute_uci_command(cmd)) {}
+      // Enter the UCI loop waiting for input
+      uci_loop();
   }
   else if (string(argv[1]) == "bench" && argc < 8)
       benchmark(argc, argv);
   else
       cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
            << "[limit = 12] [fen positions file = default] "
-           << "[depth, time, perft or node limited = depth]" << endl;
+           << "[limited by depth, time, nodes or perft = depth]" << endl;
 
-  exit_threads();
-  quit_eval();
+  Threads.exit();
   return 0;
 }