Retire struct OptionsMap

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 372e8abc58e990442d62a32c218c5f9a03a1b577..e7540f9c68f0169c02a767aacd9a908d46b37ab7 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, 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
@@ -17,75 +17,37 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// To profile with callgrind uncomment following line
-//#define USE_CALLGRIND
-
-
-////
-//// Includes
-////
-
 #include <iostream>
 #include <string>
 
-#include "bitcount.h"
-#include "misc.h"
-
-#ifdef USE_CALLGRIND
-#include <valgrind/callgrind.h>
-#endif
-
-using namespace std;
-
-extern void uci_main_loop();
-extern void benchmark(const std::string& commandLine);
-
-////
-//// Functions
-////
-
-int main(int argc, char *argv[]) {
+#include "bitboard.h"
+#include "evaluate.h"
+#include "position.h"
+#include "search.h"
+#include "thread.h"
+#include "tt.h"
+#include "ucioption.h"
 
-  // Disable IO buffering
-  cout.rdbuf()->pubsetbuf(NULL, 0);
-  cin.rdbuf()->pubsetbuf(NULL, 0);
+void uci_loop(const std::string&);
+void kpk_bitbase_init();
 
-  // Initialization through global resources manager
-  Application::initialize();
+int main(int argc, char* argv[]) {
 
-#ifdef USE_CALLGRIND
-  CALLGRIND_START_INSTRUMENTATION;
-#endif
+  std::cout << engine_info() << std::endl;
 
-  if (argc <= 1)
-  {
-      // Print copyright notice
-      cout << engine_name()
-           << " by Tord Romstad, Marco Costalba, Joona Kiiski" << endl;
+  UCIOptions::init(Options);
+  Bitboards::init();
+  Position::init();
+  kpk_bitbase_init();
+  Search::init();
+  Threads.init();
+  Eval::init();
+  TT.set_size(Options["Hash"]);
 
-      if (CpuHasPOPCNT)
-          cout << "Good! CPU has hardware POPCNT." << endl;
+  std::string args;
 
-      // Enter UCI mode
-      uci_main_loop();
-  }
-  else // Process command line arguments
-  {
-      if (string(argv[1]) != "bench" || argc < 4 || argc > 8)
-          cout << "Usage: stockfish bench <hash size> <threads> "
-               << "[time = 60s] [fen positions file = default] "
-               << "[time, depth, perft or node limited = time] "
-               << "[timing file name = none]" << endl;
-      else
-      {
-          string time = argc > 4 ? argv[4] : "60";
-          string fen  = argc > 5 ? argv[5] : "default";
-          string lim  = argc > 6 ? argv[6] : "time";
-          string tim  = argc > 7 ? argv[7] : "";
-          benchmark(string(argv[2]) + " " + string(argv[3]) + " " + time + " " + fen + " " + lim + " " + tim);
-      }
-  }
+  for (int i = 1; i < argc; i++)
+      args += std::string(argv[i]) + " ";
 
-  Application::free_resources();
-  return 0;
+  uci_loop(args);
 }