Move pawn and material tables under Thread class

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 86c7558c7f81fd1b54e34617d860b699b6bc1889..0e1690440dc1e498febec0d769519af4406a37c9 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
@@ -38,7 +39,7 @@ using namespace std;
 
 extern bool execute_uci_command(const string& cmd);
 extern void benchmark(int argc, char* argv[]);
-extern void init_bitbases();
+extern void init_kpk_bitbase();
 
 int main(int argc, char* argv[]) {
 
@@ -50,13 +51,11 @@ 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_bitbases();
+  init_kpk_bitbase();
   init_search();
-  init_threads();
+  ThreadsMgr.init_threads();
 
 #ifdef USE_CALLGRIND
   CALLGRIND_START_INSTRUMENTATION;
@@ -65,7 +64,7 @@ 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;
@@ -83,7 +82,6 @@ int main(int argc, char* argv[]) {
            << "[limit = 12] [fen positions file = default] "
            << "[depth, time, perft or node limited = depth]" << endl;
 
-  exit_threads();
-  quit_eval();
+  ThreadsMgr.exit_threads();
   return 0;
 }