X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=1778c7182a52f56de7209e19a79af8b90cc17feb;hp=a229027970b73bfdbf2e844331b4ac16843b9596;hb=950c8436edc50857b83eb3e0cbaca06407764655;hpb=c15b132f033881b7bc0e8c76698d928798dff921

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index a2290279..1778c718 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.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-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 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
@@ -22,11 +22,11 @@
 #include <cstdlib>
 #include <sstream>
 
-#include "evaluate.h"
 #include "misc.h"
 #include "thread.h"
 #include "tt.h"
-#include "ucioption.h"
+#include "uci.h"
+#include "syzygy/tbprobe.h"
 
 using std::string;
 
@@ -35,11 +35,11 @@ UCI::OptionsMap Options; // Global object
 namespace UCI {
 
 /// 'On change' actions, triggered by an option's value change
+void on_clear_hash(const Option&) { TT.clear(); }
+void on_hash_size(const Option& o) { TT.resize(o); }
 void on_logger(const Option& o) { start_logger(o); }
-void on_eval(const Option&) { Eval::init(); }
 void on_threads(const Option&) { Threads.read_uci_options(); }
-void on_hash_size(const Option& o) { TT.resize(o); }
-void on_clear_hash(const Option&) { TT.clear(); }
+void on_tb_path(const Option& o) { Tablebases::init(o); }
 
 
 /// Our case insensitive less() function as required by UCI protocol
@@ -54,36 +54,25 @@ bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const
 
 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["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);
-  o["Emergency Base Time"]      << Option(60, 0, 30000);
-  o["Emergency Move Time"]      << Option(30, 0, 5000);
-  o["Minimum Thinking Time"]    << Option(20, 0, 5000);
-  o["Slow Mover"]               << Option(80, 10, 1000);
-  o["UCI_Chess960"]             << Option(false);
+  const int MaxHashMB = Is64Bit ? 1024 * 1024 : 2048;
+
+  o["Write Debug Log"]       << Option(false, on_logger);
+  o["Contempt"]              << Option(0, -100, 100);
+  o["Min Split Depth"]       << Option(0, 0, 12, on_threads);
+  o["Threads"]               << Option(1, 1, MAX_THREADS, on_threads);
+  o["Hash"]                  << Option(16, 1, MaxHashMB, on_hash_size);
+  o["Clear Hash"]            << Option(on_clear_hash);
+  o["Ponder"]                << Option(true);
+  o["MultiPV"]               << Option(1, 1, 500);
+  o["Skill Level"]           << Option(20, 0, 20);
+  o["Move Overhead"]         << Option(30, 0, 5000);
+  o["Minimum Thinking Time"] << Option(20, 0, 5000);
+  o["Slow Mover"]            << Option(80, 10, 1000);
+  o["UCI_Chess960"]          << Option(false);
+  o["SyzygyPath"]            << Option("<empty>", on_tb_path);
+  o["SyzygyProbeDepth"]      << Option(1, 1, 100);
+  o["Syzygy50MoveRule"]      << Option(true);
+  o["SyzygyProbeLimit"]      << Option(6, 0, 6);
 }
 
 
@@ -141,10 +130,10 @@ Option::operator std::string() const {
 
 void Option::operator<<(const Option& o) {
 
-  static size_t index = 0;
+  static size_t insert_order = 0;
 
   *this = o;
-  idx = index++;
+  idx = insert_order++;
 }