Consolidate pawn storm types

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index e7540f9c68f0169c02a767aacd9a908d46b37ab7..b5067b9b2df725a8f5cd4bac3cf6628d8175f479 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,8 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2015-2018 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
@@ -18,36 +19,37 @@
 */
 
 #include <iostream>
-#include <string>
 
 #include "bitboard.h"
-#include "evaluate.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
 #include "tt.h"
-#include "ucioption.h"
+#include "uci.h"
+#include "syzygy/tbprobe.h"
 
-void uci_loop(const std::string&);
-void kpk_bitbase_init();
+namespace PSQT {
+  void init();
+}
 
 int main(int argc, char* argv[]) {
 
   std::cout << engine_info() << std::endl;
 
-  UCIOptions::init(Options);
+  UCI::init(Options);
+  PSQT::init();
   Bitboards::init();
   Position::init();
-  kpk_bitbase_init();
+  Bitbases::init();
   Search::init();
-  Threads.init();
-  Eval::init();
-  TT.set_size(Options["Hash"]);
-
-  std::string args;
+  Pawns::init();
+  Tablebases::init(Options["SyzygyPath"]); // After Bitboards are set
+  TT.resize(Options["Hash"]);
+  Threads.set(Options["Threads"]);
+  Search::clear(); // After threads are up
 
-  for (int i = 1; i < argc; i++)
-      args += std::string(argv[i]) + " ";
+  UCI::loop(argc, argv);
 
-  uci_loop(args);
+  Threads.set(0);
+  return 0;
 }