do_move() 改为传2个参数

src/position.cpp

@@ -378,7 +378,7 @@ const string Position::fen() const
 /// to a StateInfo object. The move is assumed to be legal. Pseudo-legal
 /// moves should be filtered out before this function is called.
 
-void Position::do_move(Move m)
+void Position::do_move(Move m, StateInfo &newSt)
 {
     ++st->rule50;
 

src/position.h

@@ -86,7 +86,7 @@ public:
     bool pseudo_legal(const Move m) const;
 
     // Doing and undoing moves
-    void do_move(Move m);
+    void do_move(Move m, StateInfo &newSt);
     void undo_move(Move m);
     void undo_move(Stack<Position> &ss);
     void undo_null_move();

src/search.cpp

@@ -837,7 +837,8 @@ Value search(Position *pos, Stack<Position> &ss, Depth depth, Depth originDepth,
         ss.push(*(pos));
         Color before = pos->sideToMove;
         Move move = mp.moves[i].move;
-        pos->do_move(move);
+        StateInfo st;   // TODO
+        pos->do_move(move, st);
         Color after = pos->sideToMove;
 
         if (gameOptions.getDepthExtension() == true && moveCount == 1) {

src/uci.cpp

@@ -35,54 +35,53 @@
 
 using namespace std;
 
-extern vector<string> setup_bench(Position*, istream&);
+extern vector<string> setup_bench(Position *, istream &);
 
-namespace {
+namespace
+{
 
-  // FEN string of the initial position, normal mill game
+// FEN string of the initial position, normal mill game
-  const char *StartFEN = "oooooooo/oooooooo/oooooooo b p 0 1"; // Chess: "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
+const char *StartFEN = "********/********/******** b p 0 1"; // Chess: "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
 
 
-  // position() is called when engine receives the "position" UCI command.
+// position() is called when engine receives the "position" UCI command.
-  // The function sets up the position described in the given FEN string ("fen")
+// 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
+// or the starting position ("startpos") and then makes the moves given in the
-  // following move list ("moves").
+// following move list ("moves").
 
-  void position(Position* pos, istringstream& is, StateListPtr& states) {
+void position(Position *pos, istringstream &is, StateListPtr &states)
+{
 
     Move m;
     string token, fen;
 
     is >> token;
 
-    if (token == "startpos")
+    if (token == "startpos") {
-    {
         fen = StartFEN;
         is >> token; // Consume "moves" token if any
-    }
+    } else if (token == "fen")
-    else if (token == "fen")
         while (is >> token && token != "moves")
             fen += token + " ";
     else
         return;
 
     states = StateListPtr(new std::deque<StateInfo>(1)); // Drop old and create a new one
-    //pos->set(fen, &states->back(), Threads.main()); // TODO
+    pos->set(fen, &states->back(), Threads.main());
 
     // Parse move list (if any)
-    while (is >> token && (m = UCI::to_move(pos, token)) != MOVE_NONE)
+    while (is >> token && (m = UCI::to_move(pos, token)) != MOVE_NONE) {
-    {
         states->emplace_back();
-        //pos.do_move(m, states->back()); // TODO
+        pos->do_move(m, states->back());
-        pos->do_move(m);
     }
-  }
+}
 
 
-  // setoption() is called when engine receives the "setoption" UCI command. The
+// setoption() is called when engine receives the "setoption" UCI command. The
-  // function updates the UCI option ("name") to the given value ("value").
+// function updates the UCI option ("name") to the given value ("value").
 
-  void setoption(istringstream& is) {
+void setoption(istringstream &is)
+{
 
     string token, name, value;
 
@@ -100,14 +99,15 @@ namespace {
         Options[name] = value;
     else
         sync_cout << "No such option: " << name << sync_endl;
-  }
+}
 
 
-  // go() is called when engine receives the "go" UCI command. The function sets
+// go() is called when engine receives the "go" UCI command. The function sets
-  // the thinking time and other parameters from the input string, then starts
+// the thinking time and other parameters from the input string, then starts
-  // the search.
+// the search.
 
-  void go(Position* pos, istringstream& is, StateListPtr& states) {
+void go(Position *pos, istringstream &is, StateListPtr &states)
+{
 
     Search::LimitsType limits;
     string token;
@@ -133,15 +133,16 @@ namespace {
         else if (token == "infinite")  limits.infinite = 1;
         else if (token == "ponder")    ponderMode = true;
 
-    Threads.start_thinking(pos, states, limits, ponderMode); // TODO
+    Threads.start_thinking(pos, states, limits, ponderMode);
-  }
+}
 
 
-  // bench() is called when engine receives the "bench" command. Firstly
+// bench() is called when engine receives the "bench" command. Firstly
-  // a list of UCI commands is setup according to bench parameters, then
+// a list of UCI commands is setup according to bench parameters, then
-  // it is run one by one printing a summary at the end.
+// it is run one by one printing a summary at the end.
 
-  void bench(Position* pos, istream& args, StateListPtr& states) {
+void bench(Position *pos, istream &args, StateListPtr &states)
+{
 
     string token;
     uint64_t num, nodes = 0, cnt = 1;
@@ -151,26 +152,23 @@ namespace {
 
     TimePoint elapsed = now();
 
-    for (const auto& cmd : list)
+    for (const auto &cmd : list) {
-    {
         istringstream is(cmd);
         is >> skipws >> token;
 
-        if (token == "go" || token == "eval")
+        if (token == "go" || token == "eval") {
-        {
             cerr << "\nPosition: " << cnt++ << '/' << num << endl;
-            if (token == "go")
+            if (token == "go") {
-            {
+                go(pos, is, states);
-               go(pos, is, states);
+                Threads.main()->wait_for_search_finished();
-               Threads.main()->wait_for_search_finished();
+                nodes += Threads.nodes_searched();
-               nodes += Threads.nodes_searched();
+            } else
-            }
+                sync_cout << "\n" << Eval::trace(*pos) << sync_endl;
-            else
+        } else if (token == "setoption")  setoption(is);
-               sync_cout << "\n" << Eval::trace(*pos) << sync_endl;
-        }
-        else if (token == "setoption")  setoption(is);
         else if (token == "position")   position(pos, is, states);
-        else if (token == "ucinewgame") { Search::clear(); elapsed = now(); } // Search::clear() may take some while
+        else if (token == "ucinewgame") {
+            Search::clear(); elapsed = now();
+        } // Search::clear() may take some while
     }
 
     elapsed = now() - elapsed + 1; // Ensure positivity to avoid a 'divide by zero'
@@ -178,10 +176,10 @@ namespace {
     dbg_print(); // Just before exiting
 
     cerr << "\n==========================="
-         << "\nTotal time (ms) : " << elapsed
+        << "\nTotal time (ms) : " << elapsed
-         << "\nNodes searched  : " << nodes
+        << "\nNodes searched  : " << nodes
-         << "\nNodes/second    : " << 1000 * nodes / elapsed << endl;
+        << "\nNodes/second    : " << 1000 * nodes / elapsed << endl;
-  }
+}
 
 } // namespace
 
@@ -192,61 +190,62 @@ namespace {
 /// run 'bench', once the command is executed the function returns immediately.
 /// In addition to the UCI ones, also some additional debug commands are supported.
 
-void UCI::loop(int argc, char* argv[]) {
+void UCI::loop(int argc, char *argv[])
+{
 
-  Position *pos = new Position;
+    Position *pos = new Position;
-  string token, cmd;
+    string token, cmd;
-  StateListPtr states(new std::deque<StateInfo>(1));
+    StateListPtr states(new std::deque<StateInfo>(1));
 
-  //pos.set(StartFEN, &states->back(), Threads.main()); // TODO
+    pos->set(StartFEN, &states->back(), Threads.main());
 
-  for (int i = 1; i < argc; ++i)
+    for (int i = 1; i < argc; ++i)
-      cmd += std::string(argv[i]) + " ";
+        cmd += std::string(argv[i]) + " ";
 
-  do {
+    do {
-      if (argc == 1 && !getline(cin, cmd)) // Block here waiting for input or EOF
+        if (argc == 1 && !getline(cin, cmd)) // Block here waiting for input or EOF
-          cmd = "quit";
+            cmd = "quit";
 
-      istringstream is(cmd);
+        istringstream is(cmd);
 
-      token.clear(); // Avoid a stale if getline() returns empty or blank line
+        token.clear(); // Avoid a stale if getline() returns empty or blank line
-      is >> skipws >> token;
+        is >> skipws >> token;
 
-      if (    token == "quit"
+        if (token == "quit"
-          ||  token == "stop")
+            || token == "stop")
-          Threads.stop = true;
+            Threads.stop = true;
 
-      // The GUI sends 'ponderhit' to tell us the user has played the expected move.
+        // The GUI sends 'ponderhit' to tell us the user has played the expected move.
-      // So 'ponderhit' will be sent if we were told to ponder on the same move the
+        // So 'ponderhit' will be sent if we were told to ponder on the same move the
-      // user has played. We should continue searching but switch from pondering to
+        // user has played. We should continue searching but switch from pondering to
-      // normal search.
+        // normal search.
-      else if (token == "ponderhit")
+        else if (token == "ponderhit")
-          Threads.main()->ponder = false; // Switch to normal search
+            Threads.main()->ponder = false; // Switch to normal search
 
-      else if (token == "uci")
+        else if (token == "uci")
-          sync_cout << "id name " << engine_info(true)
+            sync_cout << "id name " << engine_info(true)
-                    << "\n"       << Options
+            << "\n" << Options
-                    << "\nuciok"  << sync_endl;
+            << "\nuciok" << sync_endl;
 
-      else if (token == "setoption")  setoption(is);
+        else if (token == "setoption")  setoption(is);
-      else if (token == "go")         go(pos, is, states);
+        else if (token == "go")         go(pos, is, states);
-      else if (token == "position")   position(pos, is, states);
+        else if (token == "position")   position(pos, is, states);
-      else if (token == "ucinewgame") Search::clear();
+        else if (token == "ucinewgame") Search::clear();
-      else if (token == "isready")    sync_cout << "readyok" << sync_endl;
+        else if (token == "isready")    sync_cout << "readyok" << sync_endl;
 
-      // Additional custom non-UCI commands, mainly for debugging.
+        // Additional custom non-UCI commands, mainly for debugging.
-      // Do not use these commands during a search!
+        // Do not use these commands during a search!
-      else if (token == "flip")     pos->flip();
+        else if (token == "flip")     pos->flip();
-      else if (token == "bench")    bench(pos, is, states);
+        else if (token == "bench")    bench(pos, is, states);
-      else if (token == "d")        sync_cout << &pos << sync_endl;
+        else if (token == "d")        sync_cout << &pos << sync_endl;
-      else if (token == "eval")     sync_cout << Eval::trace(*pos) << sync_endl;
+        else if (token == "eval")     sync_cout << Eval::trace(*pos) << sync_endl;
-      else if (token == "compiler") sync_cout << compiler_info() << sync_endl;
+        else if (token == "compiler") sync_cout << compiler_info() << sync_endl;
-      else
+        else
-          sync_cout << "Unknown command: " << cmd << sync_endl;
+            sync_cout << "Unknown command: " << cmd << sync_endl;
 
-  } while (token != "quit" && argc == 1); // Command line args are one-shot
+    } while (token != "quit" && argc == 1); // Command line args are one-shot
 
-  delete pos;
+    delete pos;
 }
 
 
@@ -257,25 +256,27 @@ void UCI::loop(int argc, char* argv[]) {
 /// mate <y>  Mate in y moves, not plies. If the engine is getting mated
 ///           use negative values for y.
 
-string UCI::value(Value v) {
+string UCI::value(Value v)
+{
 
-  assert(-VALUE_INFINITE < v && v < VALUE_INFINITE);
+    assert(-VALUE_INFINITE < v &&v < VALUE_INFINITE);
 
-  stringstream ss;
+    stringstream ss;
 
-  if (abs(v) < VALUE_MATE_IN_MAX_PLY)
+    if (abs(v) < VALUE_MATE_IN_MAX_PLY)
-      ss << "cp " << v / StoneValue;
+        ss << "cp " << v / StoneValue;
-  else
+    else
-      ss << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2;
+        ss << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2;
 
-  return ss.str();
+    return ss.str();
 }
 
 
 /// UCI::square() converts a Square to a string in algebraic notation (c1, a7, etc.)
 
-std::string UCI::square(Square s) {
+std::string UCI::square(Square s)
-  return std::string{ char('a' + file_of(s)), char('1' + rank_of(s)) };
+{
+    return std::string{ char('a' + file_of(s)), char('1' + rank_of(s)) };
 }
 
 
@@ -284,34 +285,36 @@ std::string UCI::square(Square s) {
 /// normal chess mode, and in e1h1 notation in chess960 mode. Internally all
 /// castling moves are always encoded as 'king captures rook'.
 
-string UCI::move(Move m) {
+string UCI::move(Move m)
+{
 
-  Square from = from_sq(m);
+    Square from = from_sq(m);
-  Square to = to_sq(m);
+    Square to = to_sq(m);
 
-  if (m == MOVE_NONE)
+    if (m == MOVE_NONE)
-      return "(none)";
+        return "(none)";
 
-  if (m == MOVE_NULL)
+    if (m == MOVE_NULL)
-      return "0000";
+        return "0000";
 
-  string move = UCI::square(from) + UCI::square(to);
+    string move = UCI::square(from) + UCI::square(to);
 
-  return move;
+    return move;
 }
 
 
 /// UCI::to_move() converts a string representing a move in coordinate notation
 /// (g1f3, a7a8q) to the corresponding legal Move, if any.
 
-Move UCI::to_move(Position *pos, string& str) {
+Move UCI::to_move(Position *pos, string &str)
+{
 
-  if (str.length() == 5) // Junior could send promotion piece in uppercase
+    if (str.length() == 5) // Junior could send promotion piece in uppercase
-      str[4] = char(tolower(str[4]));
+        str[4] = char(tolower(str[4]));
 
-  for (const auto& m : MoveList(*pos))
+    for (const auto &m : MoveList(*pos))
-      if (str == UCI::move(m))
+        if (str == UCI::move(m))
-          return m;
+            return m;
 
-  return MOVE_NONE;
+    return MOVE_NONE;
 }