Retire struct OptionsMap

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index fcb7e40c25118bf81f35a2361fd77d4d69840d33..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,51 +17,37 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cstdio>
 #include <iostream>
 #include <string>
 
 #include "bitboard.h"
 #include "evaluate.h"
 #include "position.h"
-#include "thread.h"
 #include "search.h"
+#include "thread.h"
+#include "tt.h"
 #include "ucioption.h"
 
-using namespace std;
-
-extern void uci_loop();
-extern void benchmark(int argc, char* argv[]);
-extern void kpk_bitbase_init();
+void uci_loop(const std::string&);
+void kpk_bitbase_init();
 
 int main(int argc, char* argv[]) {
 
-  // Disable output buffering: printf() does not work correctly otherwise
-  setvbuf(stdout, NULL, _IONBF, 0);
+  std::cout << engine_info() << std::endl;
 
-  bitboards_init();
+  UCIOptions::init(Options);
+  Bitboards::init();
   Position::init();
   kpk_bitbase_init();
   Search::init();
   Threads.init();
+  Eval::init();
+  TT.set_size(Options["Hash"]);
 
-  if (argc < 2)
-  {
-      cout << engine_name() << " by " << engine_authors() << endl;
-
-      if (CpuHasPOPCNT)
-          cout << "Good! CPU has hardware POPCNT." << endl;
-
-      uci_loop(); // Enter the UCI loop and wait for user input
-  }
-  else if (string(argv[1]) == "bench")
-      benchmark(argc, argv);
+  std::string args;
 
-  else
-      cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
-           << "[limit = 12] [fen positions file = default] "
-           << "[limited by depth, time, nodes or perft = depth]" << endl;
+  for (int i = 1; i < argc; i++)
+      args += std::string(argv[i]) + " ";
 
-  Threads.exit();
-  return 0;
+  uci_loop(args);
 }