Simplify generate_pawn_captures()

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index e623297c53661166f0ab64073f606abfecb779bc..e83c2cc5f94422dec45f4d77d1c0bf99a55190e0 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,10 +28,8 @@
 #include <iostream>
 #include <string>
 
-#include "benchmark.h"
 #include "bitcount.h"
 #include "misc.h"
-#include "uci.h"
 
 #ifdef USE_CALLGRIND
 #include <valgrind/callgrind.h>
@@ -39,12 +37,14 @@
 
 using namespace std;
 
+extern void uci_main_loop();
+extern void benchmark(int argc, char* argv[]);
 
 ////
 //// Functions
 ////
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
 
   // Disable IO buffering
   cout.rdbuf()->pubsetbuf(NULL, 0);
@@ -71,19 +71,12 @@ int main(int argc, char *argv[]) {
   }
   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;
+      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
-      {
-          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);
-      }
+          benchmark(argc, argv);
   }
 
   Application::free_resources();