Use a set to store SearchMoves

[stockfish] / src / uci.cpp

diff --git a/src/uci.cpp b/src/uci.cpp
index c4d01fa10dbda9b6af3f531acd04af52c2865438..ceb04dc3cf21a9f9ae92c618366c37e9fc085380 100644 (file)
--- 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
@@ -68,10 +68,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 +78,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")
@@ -122,8 +117,7 @@ void uci_loop() {
                << "\npawn key: "     << pos.pawn_key() << endl;
 
       else if (token == "uci")
-          cout << "id name "     << engine_name()
-               << "\nid author " << engine_authors()
+          cout << "id name "     << engine_info(true)
                << "\n"           << Options
                << "\nuciok"      << endl;
       else
@@ -157,7 +151,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 +182,14 @@ namespace {
     while (is >> token)
         value += string(" ", !value.empty()) + token;
 
-    if (Options.count(name))
-        Options[name] = (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 +201,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 +228,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()];