X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=02a3c30c79f5ea338d611f0b399ef796b57b9b53;hp=9948eb62b4114670d826ec7e32c3f9012f53e0e0;hb=0759d8f4302d0ad262a2dabca465f1618677aeba;hpb=81cd417b4584b0e3830940c5cb122c898afde08a

diff --git a/src/uci.cpp b/src/uci.cpp
index 9948eb62..02a3c30c 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -117,14 +117,14 @@ void uci_loop() {
       }
 
       else if (token == "key")
-          cout << "key: " << hex     << pos.get_key()
-               << "\nmaterial key: " << pos.get_material_key()
-               << "\npawn key: "     << pos.get_pawn_key() << endl;
+          cout << "key: " << hex     << pos.key()
+               << "\nmaterial key: " << pos.material_key()
+               << "\npawn key: "     << pos.pawn_key() << endl;
 
       else if (token == "uci")
           cout << "id name "     << engine_name()
                << "\nid author " << engine_authors()
-               << "\n"           << Options.print_all()
+               << "\n"           << Options
                << "\nuciok"      << endl;
       else
           cout << "Unknown command: " << cmd << endl;
@@ -157,7 +157,7 @@ namespace {
     else
         return;
 
-    pos.from_fen(fen, Options["UCI_Chess960"].value<bool>());
+    pos.from_fen(fen, Options["UCI_Chess960"]);
 
     // Parse move list (if any)
     while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
@@ -188,10 +188,14 @@ namespace {
     while (is >> token)
         value += string(" ", !value.empty()) + token;
 
-    if (Options.find(name) != Options.end())
-        Options[name].set_value(value.empty() ? "true" : value); // UCI buttons don't have "value"
-    else
+    if (!Options.count(name))
         cout << "No such option: " << name << endl;
+
+    else if (value.empty()) // UCI buttons don't have a value
+        Options[name] = true;
+
+    else
+        Options[name] = value;
   }
 
 
@@ -233,7 +237,6 @@ namespace {
                 searchMoves.push_back(move_from_uci(pos, token));
     }
 
-    searchMoves.push_back(MOVE_NONE);
     limits.time = time[pos.side_to_move()];
     limits.increment = inc[pos.side_to_move()];
 
@@ -252,11 +255,11 @@ namespace {
     if (!(is >> depth))
         return;
 
-    time = get_system_time();
+    time = system_time();
 
     int64_t n = Search::perft(pos, depth * ONE_PLY);
 
-    time = get_system_time() - time;
+    time = system_time() - time;
 
     std::cout << "\nNodes " << n
               << "\nTime (ms) " << time