X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=1582b7bc01e841468227e6ca3fd1fd4188db6c1a;hp=806a9be135e40237c1865987258b008f48efe19a;hb=72c7595f8ac72c7831ee319b8b0bc46404c5fc27;hpb=683595fee15a1d8ceeb1bbd577d96ed9c0f8aaaa diff --git a/src/search.cpp b/src/search.cpp index 806a9be1..1582b7bc 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -121,9 +121,6 @@ namespace { // Depth limit for selective search: Depth SelectiveDepth = 7*OnePly; - // Use dynamic LMR? - const bool UseDynamicLMR = false; - // Use internal iterative deepening? const bool UseIIDAtPVNodes = true; const bool UseIIDAtNonPVNodes = false; @@ -328,7 +325,6 @@ void SearchStack::init(int ply) { pv[ply] = pv[ply + 1] = MOVE_NONE; currentMove = threatMove = MOVE_NONE; reduction = Depth(0); - currentMoveCaptureValue = Value(0); } void SearchStack::initKillers() { @@ -1018,12 +1014,6 @@ namespace { movesSearched[moveCount++] = ss[ply].currentMove = move; - if (moveIsCapture) - ss[ply].currentMoveCaptureValue = - move_is_ep(move)? PawnValueMidgame : pos.midgame_value_of_piece_on(move_to(move)); - else - ss[ply].currentMoveCaptureValue = Value(0); - // Decide the new search depth bool dangerous; Depth ext = extension(pos, move, true, moveIsCapture, moveIsCheck, singleReply, mateThreat, &dangerous); @@ -1202,7 +1192,7 @@ namespace { StateInfo st; pos.do_null_move(st); - int R = (depth >= 4 * OnePly ? 4 : 3); // Null move dynamic reduction + int R = (depth >= 5 * OnePly ? 4 : 3); // Null move dynamic reduction Value nullValue = -search(pos, ss, -(beta-1), depth-R*OnePly, ply+1, false, threadID); @@ -1335,13 +1325,8 @@ namespace { && !move_is_castle(move) && !move_is_killer(move, ss[ply])) { - // LMR dynamic reduction - Depth R = UseDynamicLMR - && moveCount >= 2 * LMRNonPVMoves - && depth > 7*OnePly ? 2*OnePly : OnePly; - - ss[ply].reduction = R; - value = -search(pos, ss, -(beta-1), newDepth-R, ply+1, true, threadID); + ss[ply].reduction = OnePly; + value = -search(pos, ss, -(beta-1), newDepth-OnePly, ply+1, true, threadID); } else value = beta; // Just to trigger next condition @@ -1729,12 +1714,6 @@ namespace { assert(move_is_ok(move)); - if (moveIsCapture) - ss[sp->ply].currentMoveCaptureValue = - move_is_ep(move)? PawnValueMidgame : pos.midgame_value_of_piece_on(move_to(move)); - else - ss[sp->ply].currentMoveCaptureValue = Value(0); - lock_grab(&(sp->lock)); int moveCount = ++sp->moves; lock_release(&(sp->lock));