X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=abb753baea75d118ae41cfecefdf38992050227d;hp=1ec56c2f700a7c2a30bedd371af100fc6a29e9ec;hb=1ceaea701baaa79f378b0842ff0fb5d2a1f53ef7;hpb=1e586288ca4a0ae567c8d9b9b77e804f25fe6719 diff --git a/src/movepick.cpp b/src/movepick.cpp index 1ec56c2f..abb753ba 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -111,11 +111,11 @@ MovePicker::MovePicker(const Position& p, Move ttm, Value th) stage = PROBCUT; - // In ProbCut we generate captures with SEE higher than the given threshold + // In ProbCut we generate captures with SEE higher than or equal to the given threshold ttMove = ttm && pos.pseudo_legal(ttm) && pos.capture(ttm) - && pos.see(ttm) > threshold ? ttm : MOVE_NONE; + && pos.see_ge(ttm, threshold)? ttm : MOVE_NONE; stage += (ttMove == MOVE_NONE); } @@ -201,7 +201,7 @@ Move MovePicker::next_move() { move = pick_best(cur++, endMoves); if (move != ttMove) { - if (pos.see_sign(move) >= VALUE_ZERO) + if (pos.see_ge(move, VALUE_ZERO)) return move; // Losing capture, move it to the beginning of the array @@ -271,8 +271,7 @@ Move MovePicker::next_move() { case EVASIONS_INIT: cur = moves; endMoves = generate(pos, cur); - if (endMoves - cur - (ttMove != MOVE_NONE) > 1) - score(); + score(); ++stage; case ALL_EVASIONS: @@ -295,7 +294,7 @@ Move MovePicker::next_move() { { move = pick_best(cur++, endMoves); if ( move != ttMove - && pos.see(move) > threshold) + && pos.see_ge(move, threshold)) return move; } break;