Fix incorrect draw detection

[stockfish] / src / uci.cpp

diff --git a/src/uci.cpp b/src/uci.cpp
index b7127b758153c9fd008563f2f7412a5802ebdfad..a9811a9af7352ae74308979a4751721b6bfcc042 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -2,6 +2,7 @@
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
   Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
   Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad

+  Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, 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
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by


@@ -26,7 +27,7 @@
 #include "position.h"
 #include "search.h"
 #include "thread.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"

-#include "tt.h"
+#include "timeman.h"

 #include "uci.h"
 
 using namespace std;
 #include "uci.h"
 
 using namespace std;


@@ -38,10 +39,10 @@ namespace {
   // FEN string of the initial position, normal chess
   const char* StartFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
 
   // FEN string of the initial position, normal chess
   const char* StartFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
 

-  // Stack to keep track of the position states along the setup moves (from the
+  // A list to keep track of the position states along the setup moves (from the

   // start position to the position just before the search starts). Needed by
   // 'draw by repetition' detection.
   // start position to the position just before the search starts). Needed by
   // 'draw by repetition' detection.

-  Search::StateStackPtr SetupStates;
+  StateListPtr States(new std::deque<StateInfo>(1));

 
 
   // position() is called when engine receives the "position" UCI command.
 
 
   // position() is called when engine receives the "position" UCI command.


@@ -67,14 +68,14 @@ namespace {
     else
         return;
 
     else
         return;
 

-    pos.set(fen, Options["UCI_Chess960"], Threads.main());
-    SetupStates = Search::StateStackPtr(new std::stack<StateInfo>());
+    States = StateListPtr(new std::deque<StateInfo>(1));
+    pos.set(fen, Options["UCI_Chess960"], &States->back(), Threads.main());

 
     // Parse move list (if any)
     while (is >> token && (m = UCI::to_move(pos, token)) != MOVE_NONE)
     {
 
     // Parse move list (if any)
     while (is >> token && (m = UCI::to_move(pos, token)) != MOVE_NONE)
     {

-        SetupStates->push(StateInfo());
-        pos.do_move(m, SetupStates->top(), pos.gives_check(m, CheckInfo(pos)));
+        States->push_back(StateInfo());
+        pos.do_move(m, States->back(), pos.gives_check(m, CheckInfo(pos)));

     }
   }
 
     }
   }
 


@@ -90,11 +91,11 @@ namespace {
 
     // Read option name (can contain spaces)
     while (is >> token && token != "value")
 
     // Read option name (can contain spaces)
     while (is >> token && token != "value")

-        name += string(" ", !name.empty()) + token;
+        name += string(" ", name.empty() ? 0 : 1) + token;

 
     // Read option value (can contain spaces)
     while (is >> token)
 
     // Read option value (can contain spaces)
     while (is >> token)

-        value += string(" ", !value.empty()) + token;
+        value += string(" ", value.empty() ? 0 : 1) + token;

 
     if (Options.count(name))
         Options[name] = value;
 
     if (Options.count(name))
         Options[name] = value;


@@ -112,6 +113,8 @@ namespace {
     Search::LimitsType limits;
     string token;
 
     Search::LimitsType limits;
     string token;
 

+    limits.startTime = now(); // As early as possible!
+

     while (is >> token)
         if (token == "searchmoves")
             while (is >> token)
     while (is >> token)
         if (token == "searchmoves")
             while (is >> token)


@@ -126,10 +129,10 @@ namespace {
         else if (token == "nodes")     is >> limits.nodes;
         else if (token == "movetime")  is >> limits.movetime;
         else if (token == "mate")      is >> limits.mate;
         else if (token == "nodes")     is >> limits.nodes;
         else if (token == "movetime")  is >> limits.movetime;
         else if (token == "mate")      is >> limits.mate;

-        else if (token == "infinite")  limits.infinite = true;
-        else if (token == "ponder")    limits.ponder = true;
+        else if (token == "infinite")  limits.infinite = 1;
+        else if (token == "ponder")    limits.ponder = 1;

 
 

-    Threads.start_thinking(pos, limits, SetupStates);
+    Threads.start_thinking(pos, States, limits);

   }
 
 } // namespace
   }
 
 } // namespace


@@ -143,9 +146,11 @@ namespace {
 
 void UCI::loop(int argc, char* argv[]) {
 
 
 void UCI::loop(int argc, char* argv[]) {
 

-  Position pos(StartFEN, false, Threads.main()); // The root position
+  Position pos;

   string token, cmd;
 
   string token, cmd;
 

+  pos.set(StartFEN, false, &States->back(), Threads.main());
+

   for (int i = 1; i < argc; ++i)
       cmd += std::string(argv[i]) + " ";
 
   for (int i = 1; i < argc; ++i)
       cmd += std::string(argv[i]) + " ";
 


@@ -168,18 +173,22 @@ void UCI::loop(int argc, char* argv[]) {
           || (token == "ponderhit" && Search::Signals.stopOnPonderhit))
       {
           Search::Signals.stop = true;
           || (token == "ponderhit" && Search::Signals.stopOnPonderhit))
       {
           Search::Signals.stop = true;

-          Threads.main()->notify_one(); // Could be sleeping
+          Threads.main()->start_searching(true); // Could be sleeping

       }
       else if (token == "ponderhit")
       }
       else if (token == "ponderhit")

-          Search::Limits.ponder = false; // Switch to normal search
+          Search::Limits.ponder = 0; // Switch to normal search

 
       else if (token == "uci")
           sync_cout << "id name " << engine_info(true)
                     << "\n"       << Options
                     << "\nuciok"  << sync_endl;
 
 
       else if (token == "uci")
           sync_cout << "id name " << engine_info(true)
                     << "\n"       << Options
                     << "\nuciok"  << sync_endl;
 

+      else if (token == "ucinewgame")
+      {
+          Search::clear();
+          Time.availableNodes = 0;
+      }

       else if (token == "isready")    sync_cout << "readyok" << sync_endl;
       else if (token == "isready")    sync_cout << "readyok" << sync_endl;

-      else if (token == "ucinewgame") TT.clear();

       else if (token == "go")         go(pos, is);
       else if (token == "position")   position(pos, is);
       else if (token == "setoption")  setoption(is);
       else if (token == "go")         go(pos, is);
       else if (token == "position")   position(pos, is);
       else if (token == "setoption")  setoption(is);


@@ -205,7 +214,7 @@ void UCI::loop(int argc, char* argv[]) {
 
   } while (token != "quit" && argc == 1); // Passed args have one-shot behaviour
 
 
   } while (token != "quit" && argc == 1); // Passed args have one-shot behaviour
 

-  Threads.wait_for_think_finished(); // Cannot quit whilst the search is running
+  Threads.main()->wait_for_search_finished();

 }
 
 
 }