X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.cpp;h=8279d15780474d598144d5d1a0c16a0804f9e501;hb=a6017aa728c12c48faf758e6df3b3a1e2b704dad;hp=bb6ba9ac5ee84bebbf2aba40f18bff3766d2ae12;hpb=bbf7a94d76339837a6e8925ded1ea231d51e773d;p=stockfish diff --git a/src/search.cpp b/src/search.cpp index bb6ba9ac..8279d157 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -1162,7 +1162,7 @@ namespace { bool singleReply = (isCheck && mp.number_of_moves() == 1); bool moveIsCheck = pos.move_is_check(move, dcCandidates); - bool moveIsGoodCapture = (mp.current_move_type() == MovePicker::PH_GOOD_CAPTURES); + bool moveIsCapture = pos.move_is_capture(move); bool moveIsPassedPawnPush = pos.move_is_passed_pawn_push(move); movesSearched[moveCount++] = ss[ply].currentMove = move; @@ -1174,7 +1174,7 @@ namespace { // Futility pruning if ( useFutilityPruning && ext == Depth(0) - && !moveIsGoodCapture + && !moveIsCapture && !moveIsPassedPawnPush && !move_promotion(move)) { @@ -1206,7 +1206,7 @@ namespace { if ( depth >= 2*OnePly && ext == Depth(0) && moveCount >= LMRNonPVMoves - && !moveIsGoodCapture + && !moveIsCapture && !move_promotion(move) && !moveIsPassedPawnPush && !move_is_castle(move) @@ -2020,6 +2020,7 @@ namespace { assert(threat == MOVE_NONE || move_is_ok(threat)); assert(!move_promotion(m)); assert(!pos.move_is_check(m)); + assert(!pos.move_is_capture(m)); assert(!pos.move_is_passed_pawn_push(m)); assert(d >= OnePly); @@ -2171,6 +2172,12 @@ namespace { { lastInfoTime = t; lock_grab(&IOLock); + if (dbg_show_mean) + dbg_print_mean(); + + if (dbg_show_hit_rate) + dbg_print_hit_rate(); + std::cout << "info nodes " << nodes_searched() << " nps " << nps() << " time " << t << " hashfull " << TT.full() << std::endl; lock_release(&IOLock);