From 268c53ac51d32b912cff5a2d6e7ecd79e22e7625 Mon Sep 17 00:00:00 2001 From: Joona Kiiski Date: Mon, 24 Aug 2009 17:46:03 +0300 Subject: [PATCH] Create useNullMove local variable No functional change. Signed-off-by: Marco Costalba --- src/search.cpp | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/search.cpp b/src/search.cpp index 23fe8ce7..704cf720 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -1281,13 +1281,15 @@ namespace { bool mateThreat = false; bool isCheck = pos.is_check(); + bool useNullMove = ( allowNullmove + && depth > OnePly + && !isCheck + && !value_is_mate(beta) + && ok_to_do_nullmove(pos) + && approximateEval >= beta - NullMoveMargin); + // Null move search - if ( allowNullmove - && depth > OnePly - && !isCheck - && !value_is_mate(beta) - && ok_to_do_nullmove(pos) - && approximateEval >= beta - NullMoveMargin) + if (useNullMove) { ss[ply].currentMove = MOVE_NULL; @@ -1326,12 +1328,13 @@ namespace { } } // Null move search not allowed, try razoring - else if ( !value_is_mate(beta) - && depth < RazorDepth - && approximateEval < beta - RazorApprMargins[int(depth) - 2] - && ss[ply - 1].currentMove != MOVE_NULL - && ttMove == MOVE_NONE - && !pos.has_pawn_on_7th(pos.side_to_move())) + if ( !useNullMove + && !value_is_mate(beta) + && depth < RazorDepth + && approximateEval < beta - RazorApprMargins[int(depth) - 2] + && ss[ply - 1].currentMove != MOVE_NULL + && ttMove == MOVE_NONE + && !pos.has_pawn_on_7th(pos.side_to_move())) { Value v = qsearch(pos, ss, beta-1, beta, Depth(0), ply, threadID); if (v < beta - RazorMargins[int(depth) - 2]) -- 2.39.2