X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=c44c23fa12af2b505a72f762f4b7a979daaa53f3;hp=559f8788ec12129a1df2a25d030b52d1e839f333;hb=ea5616785e7cc35808d75897282109c51e823caa;hpb=4e59c5c2746741e7aedd451ea16b792d1568e5c4

diff --git a/src/uci.cpp b/src/uci.cpp
index 559f8788..c44c23fa 100644
--- a/src/uci.cpp
+++ b/src/uci.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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 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
@@ -20,7 +20,6 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <vector>
 
 #include "evaluate.h"
 #include "misc.h"
@@ -68,10 +67,7 @@ void uci_loop() {
       is >> skipws >> token;
 
       if (token == "quit" || token == "stop")
-      {
-          Search::Signals.stop = true;
-          Threads[0].wake_up(); // In case is waiting for stop or ponderhit
-      }
+          Threads.stop_thinking();
 
       else if (token == "ponderhit")
       {
@@ -81,9 +77,7 @@ void uci_loop() {
           Search::Limits.ponder = false;
 
           if (Search::Signals.stopOnPonderhit)
-              Search::Signals.stop = true;
-
-          Threads[0].wake_up(); // In case is waiting for stop or ponderhit
+              Threads.stop_thinking();
       }
 
       else if (token == "go")
@@ -117,14 +111,13 @@ 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()
+          cout << "id name "     << engine_info(true)
+               << "\n"           << Options
                << "\nuciok"      << endl;
       else
           cout << "Unknown command: " << cmd << endl;
@@ -157,7 +150,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 +181,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;
   }
 
 
@@ -203,7 +200,7 @@ namespace {
 
     string token;
     Search::LimitsType limits;
-    std::vector<Move> searchMoves;
+    std::set<Move> searchMoves;
     int time[] = { 0, 0 }, inc[] = { 0, 0 };
 
     while (is >> token)
@@ -230,7 +227,7 @@ namespace {
             is >> limits.maxTime;
         else if (token == "searchmoves")
             while (is >> token)
-                searchMoves.push_back(move_from_uci(pos, token));
+                searchMoves.insert(move_from_uci(pos, token));
     }
 
     limits.time = time[pos.side_to_move()];
@@ -251,11 +248,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