Raise max Hash to 1TB

[stockfish] / src / ucioption.cpp

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index dbab6fc106c833652069b5185b73339f2862db63..5833ef7b067d8bbcf513f1c4f3726f3f0511e40f 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -57,25 +57,12 @@ void init(OptionsMap& o) {
   o["Write Debug Log"]          << Option(false, on_logger);
   o["Write Search Log"]         << Option(false);
   o["Search Log Filename"]      << Option("SearchLog.txt");
-  o["Book File"]                << Option("book.bin");
-  o["Best Book Move"]           << Option(false);
   o["Contempt Factor"]          << Option(0, -50,  50);
-  o["Mobility (Midgame)"]       << Option(100, 0, 200, on_eval);
-  o["Mobility (Endgame)"]       << Option(100, 0, 200, on_eval);
-  o["Pawn Structure (Midgame)"] << Option(100, 0, 200, on_eval);
-  o["Pawn Structure (Endgame)"] << Option(100, 0, 200, on_eval);
-  o["Passed Pawns (Midgame)"]   << Option(100, 0, 200, on_eval);
-  o["Passed Pawns (Endgame)"]   << Option(100, 0, 200, on_eval);
-  o["Space"]                    << Option(100, 0, 200, on_eval);
-  o["Aggressiveness"]           << Option(100, 0, 200, on_eval);
-  o["Cowardice"]                << Option(100, 0, 200, on_eval);
   o["Min Split Depth"]          << Option(0, 0, 12, on_threads);
   o["Threads"]                  << Option(1, 1, MAX_THREADS, on_threads);
-  o["Idle Threads Sleep"]       << Option(true);
-  o["Hash"]                     << Option(32, 1, 16384, on_hash_size);
+  o["Hash"]                     << Option(32, 1, 1024 * 1024, on_hash_size);
   o["Clear Hash"]               << Option(on_clear_hash);
   o["Ponder"]                   << Option(true);
-  o["OwnBook"]                  << Option(false);
   o["MultiPV"]                  << Option(1, 1, 500);
   o["Skill Level"]              << Option(20, 0, 20);
   o["Emergency Move Horizon"]   << Option(40, 0, 50);
@@ -139,13 +126,12 @@ Option::operator std::string() const {
 
 /// operator<<() inits options and assigns idx in the correct printing order
 
-Option& Option::operator<<(const Option& o) {
+void Option::operator<<(const Option& o) {
 
-  static size_t index = 0;
+  static size_t insert_order = 0;
 
   *this = o;
-  idx = index++;
-  return *this;
+  idx = insert_order++;
 }