X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=370889cca3c2ecd6a3196a2374d3dd2854c1b258;hp=9b00b2b7d94ac244e3126909be1ae5fe6340b1b7;hb=3bb1ab34e4f007549fe9836aa167654f8fef39e6;hpb=dadf6a6fe9874fa2efb91f14b5b6456fdd8483b2 diff --git a/src/search.cpp b/src/search.cpp index 9b00b2b7..370889cc 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -34,10 +34,10 @@ #include "evaluate.h" #include "history.h" #include "misc.h" +#include "move.h" #include "movegen.h" #include "movepick.h" #include "lock.h" -#include "san.h" #include "search.h" #include "timeman.h" #include "thread.h" @@ -129,7 +129,7 @@ namespace { void extract_pv_from_tt(Position& pos); void insert_pv_in_tt(Position& pos); - std::string pv_info_to_uci(const Position& pos, Value alpha, Value beta, int pvLine = 0); + std::string pv_info_to_uci(Position& pos, Value alpha, Value beta, int pvLine = 0); int64_t nodes; Value pv_score; @@ -161,13 +161,22 @@ namespace { // operator<<() that will use it to properly format castling moves. enum set960 {}; - std::ostream& operator<< (std::ostream& os, const set960& m) { + std::ostream& operator<< (std::ostream& os, const set960& f) { - os.iword(0) = int(m); + os.iword(0) = int(f); return os; } + // Overload operator << for moves to make it easier to print moves in + // coordinate notation compatible with UCI protocol. + std::ostream& operator<<(std::ostream& os, Move m) { + + bool chess960 = (os.iword(0) != 0); // See set960() + return os << move_to_uci(m, chess960); + } + + /// Adjustments // Step 6. Razoring @@ -304,7 +313,7 @@ namespace { bool connected_threat(const Position& pos, Move m, Move threat); Value refine_eval(const TTEntry* tte, Value defaultEval, int ply); void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount); - void update_killers(Move m, SearchStack* ss); + void update_killers(Move m, Move killers[]); void update_gains(const Position& pos, Move move, Value before, Value after); int current_search_time(); @@ -372,7 +381,7 @@ int64_t perft(Position& pos, Depth depth) int64_t sum = 0; // Generate all legal moves - MoveStack* last = generate_moves(pos, mlist); + MoveStack* last = generate(pos, mlist); // If we are at the last ply we don't need to do and undo // the moves, just to count them. @@ -414,7 +423,7 @@ bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[ // Look for a book move, only during games, not tests if (UseTimeManagement && Options["OwnBook"].value()) { - if (Options["Book File"].value() != OpeningBook.file_name()) + if (Options["Book File"].value() != OpeningBook.name()) OpeningBook.open(Options["Book File"].value()); Move bookMove = OpeningBook.get_move(pos, Options["Best Book Move"].value()); @@ -693,6 +702,7 @@ namespace { // Step 1. Initialize node (polling is omitted at root) ss->currentMove = ss->bestMove = MOVE_NONE; + (ss+2)->killers[0] = (ss+2)->killers[1] = (ss+2)->mateKiller = MOVE_NONE; // Step 2. Check for aborted search (omitted at root) // Step 3. Mate distance pruning (omitted at root) @@ -830,7 +840,7 @@ namespace { if (!pos.move_is_capture_or_promotion(move)) { update_history(pos, move, depth, movesSearched, moveCount); - update_killers(move, ss); + update_killers(move, ss->killers); } // Inform GUI that PV has changed @@ -1398,7 +1408,7 @@ split_point_start: // At split points actual search starts from here && !pos.move_is_capture_or_promotion(move)) { update_history(pos, move, depth, movesSearched, moveCount); - update_killers(move, ss); + update_killers(move, ss->killers); } } @@ -1899,8 +1909,9 @@ split_point_start: // At split points actual search starts from here void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount) { Move m; + Value bonus = Value(int(depth) * int(depth)); - H.success(pos.piece_on(move_from(move)), move_to(move), depth); + H.update(pos.piece_on(move_from(move)), move_to(move), bonus); for (int i = 0; i < moveCount - 1; i++) { @@ -1909,7 +1920,7 @@ split_point_start: // At split points actual search starts from here assert(m != move); if (!pos.move_is_capture_or_promotion(m)) - H.failure(pos.piece_on(move_from(m)), move_to(m), depth); + H.update(pos.piece_on(move_from(m)), move_to(m), -bonus); } } @@ -1917,13 +1928,13 @@ split_point_start: // At split points actual search starts from here // update_killers() add a good move that produced a beta-cutoff // among the killer moves of that ply. - void update_killers(Move m, SearchStack* ss) { + void update_killers(Move m, Move killers[]) { - if (m == ss->killers[0]) + if (m == killers[0]) return; - ss->killers[1] = ss->killers[0]; - ss->killers[0] = m; + killers[1] = killers[0]; + killers[0] = m; } @@ -1937,7 +1948,7 @@ split_point_start: // At split points actual search starts from here && after != VALUE_NONE && pos.captured_piece_type() == PIECE_TYPE_NONE && !move_is_special(m)) - H.set_gain(pos.piece_on(move_to(m)), move_to(m), -(before + after)); + H.update_gain(pos.piece_on(move_to(m)), move_to(m), -(before + after)); } @@ -2007,7 +2018,7 @@ split_point_start: // At split points actual search starts from here int t = current_search_time(); // Poll for input - if (data_available()) + if (input_available()) { // We are line oriented, don't read single chars std::string command; @@ -2624,7 +2635,7 @@ split_point_start: // At split points actual search starts from here // formatted according to UCI specification and eventually writes the info // to a log file. It is called at each iteration or after a new pv is found. - std::string RootMove::pv_info_to_uci(const Position& pos, Value alpha, Value beta, int pvLine) { + std::string RootMove::pv_info_to_uci(Position& pos, Value alpha, Value beta, int pvLine) { std::stringstream s, l; Move* m = pv; @@ -2665,7 +2676,7 @@ split_point_start: // At split points actual search starts from here ss[0].eval = ss[0].evalMargin = VALUE_NONE; // Generate all legal moves - MoveStack* last = generate_moves(pos, mlist); + MoveStack* last = generate(pos, mlist); // Add each move to the RootMoveList's vector for (MoveStack* cur = mlist; cur != last; cur++)