Assorted code style and comments in search.cpp

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 0f7d0e783b369c7118e842ce04b5e278cd462ba4..d75350b17f7ea1f43413754318c6754c73cf48ae 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,23 +20,13 @@
 // To profile with callgrind uncomment following line
 //#define USE_CALLGRIND
 
-
-////
-//// Includes
-////
-
 #include <cstdio>
 #include <iostream>
 #include <string>
 
 #include "bitboard.h"
-#include "bitcount.h"
-#include "endgame.h"
 #include "evaluate.h"
-#include "material.h"
-#include "misc.h"
 #include "position.h"
-#include "search.h"
 #include "thread.h"
 #include "ucioption.h"
 
@@ -48,10 +38,7 @@ using namespace std;
 
 extern bool execute_uci_command(const string& cmd);
 extern void benchmark(int argc, char* argv[]);
-
-////
-//// Functions
-////
+extern void init_kpk_bitbase();
 
 int main(int argc, char* argv[]) {
 
@@ -67,15 +54,14 @@ int main(int argc, char* argv[]) {
   Position::init_zobrist();
   Position::init_piece_square_tables();
   init_eval(1);
-  init_bitbases();
-  init_search();
+  init_kpk_bitbase();
   init_threads();
 
 #ifdef USE_CALLGRIND
   CALLGRIND_START_INSTRUMENTATION;
 #endif
 
-  if (argc <= 1)
+  if (argc < 2)
   {
       // Print copyright notice
       cout << engine_name() << " by " << engine_author() << endl;
@@ -84,27 +70,17 @@ int main(int argc, char* argv[]) {
           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, by
-      // translating EOF to the "quit" command. This ensures that we
-      // exit gracefully if the GUI dies unexpectedly.
+      // execute_uci_command() and also intercepts EOF from stdin to
+      // ensure that we exit gracefully if the GUI dies unexpectedly.
       string cmd;
-
-      do {
-          // Wait for a command from stdin
-          if (!getline(cin, cmd))
-              cmd = "quit";
-
-      } while (execute_uci_command(cmd));
-  }
-  else // Process command line arguments
-  {
-      if (string(argv[1]) != "bench" || argc > 7)
-          cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
-               << "[limit = 12] [fen positions file = default] "
-               << "[depth, time, perft or node limited = depth]" << endl;
-      else
-          benchmark(argc, argv);
+      while (getline(cin, cmd) && execute_uci_command(cmd)) {}
   }
+  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;
 
   exit_threads();
   quit_eval();