X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=3895c7a1d49aa001535430616d97c58920179697;hp=3cb97b7fafdcc7e8c214a98f2a41a2702371fe05;hb=0a18adb02ac375f7d7fc31ef76b59e13a0263773;hpb=2d63f2157e294cae397e7e78c0396bb3b30c203c

diff --git a/src/uci.cpp b/src/uci.cpp
index 3cb97b7f..3895c7a1 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
@@ -17,318 +17,235 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-////
-//// Includes
-////
-
-#include <cassert>
 #include <iostream>
 #include <sstream>
 #include <string>
 
 #include "evaluate.h"
-#include "misc.h"
-#include "move.h"
-#include "movegen.h"
+#include "notation.h"
 #include "position.h"
-#include "san.h"
 #include "search.h"
+#include "thread.h"
 #include "ucioption.h"
 
 using namespace std;
 
-////
-//// Local definitions:
-////
+extern void benchmark(const Position& pos, istream& is);
 
 namespace {
 
-  // FEN string for the initial position
-  const string StartPositionFEN = "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";
 
-  // UCIParser is a class for parsing UCI input. The class
-  // is actually a string stream built on a given input string.
-  typedef istringstream UCIParser;
+  // Keep track of position keys along the setup moves (from start position to the
+  // position just before to start searching). Needed by repetition draw detection.
+  Search::StateStackPtr SetupStates;
 
-  // Local functions
-  bool handle_command(Position& pos, const string& command);
-  void set_option(UCIParser& uip);
-  void set_position(Position& pos, UCIParser& uip);
-  bool go(Position& pos, UCIParser& uip);
-  void perft(Position& pos, UCIParser& uip);
+  void set_option(istringstream& up);
+  void set_position(Position& pos, istringstream& up);
+  void go(Position& pos, istringstream& up);
 }
 
 
-////
-//// Functions
-////
+/// Wait for a command from the user, parse this text string as an UCI command,
+/// and call the appropriate functions. Also intercepts EOF from stdin to ensure
+/// that we exit gracefully if the GUI dies unexpectedly. In addition to the UCI
+/// commands, the function also supports a few debug commands.
 
-/// uci_main_loop() is the only global function in this file. It is
-/// called immediately after the program has finished initializing.
-/// The program remains in this loop until it receives the "quit" UCI
-/// command. It waits for a command from the user, and passes this
-/// command to handle_command() and also intercepts EOF from stdin,
-/// by translating EOF to the "quit" command. This ensures that Stockfish
-/// exits gracefully if the GUI dies unexpectedly.
+void UCI::loop(const string& args) {
 
-void uci_main_loop() {
+  Position pos(StartFEN, false, Threads.main_thread()); // The root position
+  string cmd, token;
 
-  Position pos(StartPositionFEN, 0); // The root position
-  string command;
+  while (token != "quit")
+  {
+      if (!args.empty())
+          cmd = args;
 
-  do {
-      // Wait for a command from stdin
-      if (!getline(cin, command))
-          command = "quit";
+      else if (!getline(cin, cmd)) // Block here waiting for input
+          cmd = "quit";
 
-  } while (handle_command(pos, command));
-}
+      istringstream is(cmd);
 
+      is >> skipws >> token;
 
-////
-//// Local functions
-////
+      if (token == "quit" || token == "stop")
+      {
+          Search::Signals.stop = true;
+          Threads.wait_for_search_finished(); // Cannot quit while threads are running
+      }
 
-namespace {
+      else if (token == "ponderhit")
+      {
+          // The opponent has played the expected move. GUI sends "ponderhit" if
+          // we were told to ponder on the same move the opponent has played. We
+          // should continue searching but switching from pondering to normal search.
+          Search::Limits.ponder = false;
 
-  // handle_command() takes a string as input, uses a UCIParser
-  // object to parse this text string as a UCI command, and calls
-  // the appropriate functions. In addition to the UCI commands,
-  // the function also supports a few debug commands.
+          if (Search::Signals.stopOnPonderhit)
+          {
+              Search::Signals.stop = true;
+              Threads.main_thread()->wake_up(); // Could be sleeping
+          }
+      }
 
-  bool handle_command(Position& pos, const string& command) {
+      else if (token == "go")
+          go(pos, is);
 
-    UCIParser up(command);
-    string token;
+      else if (token == "ucinewgame")
+      { /* Avoid returning "Unknown command" */ }
 
-    if (!(up >> token)) // operator>>() skips any whitespace
-        return true;
+      else if (token == "isready")
+          sync_cout << "readyok" << sync_endl;
 
-    if (token == "quit")
-        return false;
+      else if (token == "position")
+          set_position(pos, is);
 
-    if (token == "go")
-        return go(pos, up);
+      else if (token == "setoption")
+          set_option(is);
 
-    if (token == "uci")
-    {
-        cout << "id name " << engine_name()
-             << "\nid author Tord Romstad, Marco Costalba, Joona Kiiski\n";
-        print_uci_options();
-        cout << "uciok" << endl;
-    }
-    else if (token == "ucinewgame")
-        pos.from_fen(StartPositionFEN);
+      else if (token == "d")
+          pos.print();
 
-    else if (token == "isready")
-        cout << "readyok" << endl;
+      else if (token == "flip")
+          pos.flip();
 
-    else if (token == "position")
-        set_position(pos, up);
+      else if (token == "eval")
+          sync_cout << Eval::trace(pos) << sync_endl;
 
-    else if (token == "setoption")
-        set_option(up);
+      else if (token == "bench")
+          benchmark(pos, is);
 
-    // The remaining commands are for debugging purposes only
-    else if (token == "d")
-        pos.print();
+      else if (token == "key")
+          sync_cout << "key: " << hex     << pos.key()
+                    << "\nmaterial key: " << pos.material_key()
+                    << "\npawn key: "     << pos.pawn_key() << sync_endl;
 
-    else if (token == "flip")
-    {
-        Position p(pos, pos.thread());
-        pos.flipped_copy(p);
-    }
-    else if (token == "eval")
-    {
-        Value evalMargin;
-        cout << "Incremental mg: "   << mg_value(pos.value())
-             << "\nIncremental eg: " << eg_value(pos.value())
-             << "\nFull eval: "      << evaluate(pos, evalMargin) << endl;
-    }
-    else if (token == "key")
-        cout << "key: " << hex << pos.get_key()
-             << "\nmaterial key: " << pos.get_material_key()
-             << "\npawn key: " << pos.get_pawn_key() << endl;
+      else if (token == "uci")
+          sync_cout << "id name " << engine_info(true)
+                    << "\n"       << Options
+                    << "\nuciok"  << sync_endl;
 
-    else if (token == "perft")
-        perft(pos, up);
+      else if (token == "perft" && (is >> token)) // Read depth
+      {
+          stringstream ss;
 
-    else
-        cout << "Unknown command: " << command << endl;
+          ss << Options["Hash"]    << " "
+             << Options["Threads"] << " " << token << " current perft";
+
+          benchmark(pos, ss);
+      }
 
-    return true;
+      else
+          sync_cout << "Unknown command: " << cmd << sync_endl;
+
+      if (!args.empty()) // Command line arguments have one-shot behaviour
+      {
+          Threads.wait_for_search_finished();
+          break;
+      }
   }
+}
 
 
-  // set_position() is called when Stockfish receives the "position" UCI
-  // command. The input parameter is a UCIParser. It is assumed
-  // that this parser has consumed the first token of the UCI command
-  // ("position"), and is ready to read the second token ("startpos"
-  // or "fen", if the input is well-formed).
+namespace {
 
-  void set_position(Position& pos, UCIParser& up) {
+  // set_position() is called when engine receives the "position" UCI command.
+  // The function sets up the position described in the given fen string ("fen")
+  // or the starting position ("startpos") and then makes the moves given in the
+  // following move list ("moves").
 
-    string token;
+  void set_position(Position& pos, istringstream& is) {
 
-    if (!(up >> token)) // operator>>() skips any whitespace
-        return;
+    Move m;
+    string token, fen;
+
+    is >> token;
 
     if (token == "startpos")
-        pos.from_fen(StartPositionFEN);
-    else if (token == "fen")
     {
-        string fen;
-        while (up >> token && token != "moves")
-        {
-            fen += token;
-            fen += ' ';
-        }
-        pos.from_fen(fen);
+        fen = StartFEN;
+        is >> token; // Consume "moves" token if any
     }
+    else if (token == "fen")
+        while (is >> token && token != "moves")
+            fen += token + " ";
+    else
+        return;
 
-    if (up.good())
+    pos.from_fen(fen, Options["UCI_Chess960"], Threads.main_thread());
+    SetupStates = Search::StateStackPtr(new std::stack<StateInfo>());
+
+    // Parse move list (if any)
+    while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
     {
-        if (token != "moves")
-          up >> token;
-
-        if (token == "moves")
-        {
-            Move move;
-            StateInfo st;
-            while (up >> token)
-            {
-                move = move_from_uci(pos, token);
-                pos.do_move(move, st);
-                if (pos.rule_50_counter() == 0)
-                    pos.reset_game_ply();
-
-                pos.inc_startpos_ply_counter(); //FIXME: make from_fen to support this and rule50
-            }
-            // Our StateInfo st is about going out of scope so copy
-            // its content inside pos before it disappears.
-            pos.detach();
-        }
+        SetupStates->push(StateInfo());
+        pos.do_move(m, SetupStates->top());
     }
   }
 
 
-  // set_option() is called when Stockfish receives the "setoption" UCI
-  // command. The input parameter is a UCIParser. It is assumed
-  // that this parser has consumed the first token of the UCI command
-  // ("setoption"), and is ready to read the second token ("name", if
-  // the input is well-formed).
+  // set_option() is called when engine receives the "setoption" UCI command. The
+  // function updates the UCI option ("name") to the given value ("value").
 
-  void set_option(UCIParser& up) {
+  void set_option(istringstream& is) {
 
     string token, name, value;
 
-    if (!(up >> token) || token != "name") // operator>>() skips any whitespace
-        return;
-
-    if (!(up >> name))
-        return;
+    is >> token; // Consume "name" token
 
-    // Handle names with included spaces
-    while (up >> token && token != "value")
-        name += (" " + token);
+    // Read option name (can contain spaces)
+    while (is >> token && token != "value")
+        name += string(" ", !name.empty()) + token;
 
-    if (Options.find(name) == Options.end())
-    {
-        cout << "No such option: " << name << endl;
-        return;
-    }
+    // Read option value (can contain spaces)
+    while (is >> token)
+        value += string(" ", !value.empty()) + token;
 
-    // Is a button ?
-    if (token != "value")
-    {
-        Options[name].set_value("true");
-        return;
-    }
-
-    if (!(up >> value))
-        return;
-
-    // Handle values with included spaces
-    while (up >> token)
-        value += (" " + token);
-
-    Options[name].set_value(value);
+    if (Options.count(name))
+        Options[name] = value;
+    else
+        sync_cout << "No such option: " << name << sync_endl;
   }
 
 
-  // go() is called when Stockfish receives the "go" UCI command. The
-  // input parameter is a UCIParser. It is assumed that this
-  // parser has consumed the first token of the UCI command ("go"),
-  // and is ready to read the second token. The function sets the
-  // thinking time and other parameters from the input string, and
-  // calls think() (defined in search.cpp) with the appropriate
-  // parameters. Returns false if a quit command is received while
-  // thinking, returns true otherwise.
+  // go() is called when engine receives the "go" UCI command. The function sets
+  // the thinking time and other parameters from the input string, and then starts
+  // the search.
 
-  bool go(Position& pos, UCIParser& up) {
+  void go(Position& pos, istringstream& is) {
 
+    Search::LimitsType limits;
+    vector<Move> searchMoves;
     string token;
 
-    int time[2] = {0, 0}, inc[2] = {0, 0};
-    int movesToGo = 0, depth = 0, nodes = 0, moveTime = 0;
-    bool infinite = false, ponder = false;
-    Move searchMoves[MOVES_MAX];
-
-    searchMoves[0] = MOVE_NONE;
-
-    while (up >> token)
+    while (is >> token)
     {
-        if (token == "infinite")
-            infinite = true;
-        else if (token == "ponder")
-            ponder = true;
-        else if (token == "wtime")
-            up >> time[0];
+        if (token == "wtime")
+            is >> limits.time[WHITE];
         else if (token == "btime")
-            up >> time[1];
+            is >> limits.time[BLACK];
         else if (token == "winc")
-            up >> inc[0];
+            is >> limits.inc[WHITE];
         else if (token == "binc")
-            up >> inc[1];
+            is >> limits.inc[BLACK];
         else if (token == "movestogo")
-            up >> movesToGo;
+            is >> limits.movestogo;
         else if (token == "depth")
-            up >> depth;
+            is >> limits.depth;
         else if (token == "nodes")
-            up >> nodes;
+            is >> limits.nodes;
         else if (token == "movetime")
-            up >> moveTime;
+            is >> limits.movetime;
+        else if (token == "infinite")
+            limits.infinite = true;
+        else if (token == "ponder")
+            limits.ponder = true;
         else if (token == "searchmoves")
-        {
-            int numOfMoves = 0;
-            while (up >> token)
-                searchMoves[numOfMoves++] = move_from_uci(pos, token);
-
-            searchMoves[numOfMoves] = MOVE_NONE;
-        }
+            while (is >> token)
+                searchMoves.push_back(move_from_uci(pos, token));
     }
 
-    assert(pos.is_ok());
-
-    return think(pos, infinite, ponder, time, inc, movesToGo,
-                 depth, nodes, moveTime, searchMoves);
-  }
-
-  void perft(Position& pos, UCIParser& up) {
-
-    int depth, tm, n;
-
-    if (!(up >> depth))
-        return;
-
-    tm = get_system_time();
-
-    n = perft(pos, depth * ONE_PLY);
-
-    tm = get_system_time() - tm;
-    std::cout << "\nNodes " << n
-              << "\nTime (ms) " << tm
-              << "\nNodes/second " << int(n / (tm / 1000.0)) << std::endl;
+    Threads.start_searching(pos, limits, searchMoves, SetupStates);
   }
 }