From 8991a6f0057ff8e9abf8989426f97753405bb301 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sun, 26 Aug 2012 18:07:54 +0200 Subject: [PATCH] Use std::deque to store setup states --- src/uci.cpp | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/uci.cpp b/src/uci.cpp index 7e2f7ddf..ac58b43c 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -17,6 +17,7 @@ along with this program. If not, see . */ +#include #include #include #include @@ -38,11 +39,6 @@ namespace { // FEN string of the initial position, normal chess const char* StartFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; - // Keep track of position keys along the setup moves (from start position to the - // position just before to start searching). This is needed by draw detection - // where, due to 50 moves rule, we need to check at most 100 plies back. - StateInfo StateRingBuf[102], *SetupState = StateRingBuf; - void set_option(istringstream& up); void set_position(Position& pos, istringstream& up); void go(Position& pos, istringstream& up); @@ -152,13 +148,17 @@ void UCI::loop(const string& args) { namespace { - // 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"). + // 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"). void set_position(Position& pos, istringstream& is) { + // 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. + static std::deque st; + Move m; string token, fen; @@ -176,15 +176,13 @@ namespace { return; pos.from_fen(fen, Options["UCI_Chess960"], Threads.main_thread()); + st.clear(); // Parse move list (if any) while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE) { - pos.do_move(m, *SetupState); - - // Increment pointer to StateRingBuf circular buffer - if (++SetupState - StateRingBuf >= 102) - SetupState = StateRingBuf; + st.push_back(StateInfo()); + pos.do_move(m, st.back()); } } -- 2.39.2