X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=7e338dbf62de586ec2e14fa0346eaab44c36b875;hp=8089345546a1f1c58c31a8f3365fe0f2cf388c24;hb=b088f0aefd658261e9231b556382acf532920513;hpb=a5d699d62fb625fba23b23bdeff2a68807ef6438 diff --git a/src/movepick.cpp b/src/movepick.cpp index 80893455..7e338dbf 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -45,6 +45,7 @@ namespace { CACHE_LINE_ALIGNMENT const MovegenPhaseT MainSearchPhaseTable[] = { PH_STOP, PH_NULL_MOVE, PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP}; const MovegenPhaseT MainSearchNoNullPhaseTable[] = { PH_STOP, PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP}; + const MovegenPhaseT LowSearchPhaseTable[] = { PH_STOP, PH_TT_MOVES, PH_GOOD_CAPTURES, PH_NULL_MOVE, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP}; const MovegenPhaseT EvasionsPhaseTable[] = { PH_STOP, PH_EVASIONS, PH_STOP}; const MovegenPhaseT QsearchWithChecksPhaseTable[] = { PH_STOP, PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP}; const MovegenPhaseT QsearchWithoutChecksPhaseTable[] = { PH_STOP, PH_TT_MOVES, PH_QCAPTURES, PH_STOP}; @@ -79,8 +80,10 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, if (p.is_check()) phasePtr = EvasionsPhaseTable; - else if (d > Depth(0)) + else if (d >= Depth(3 * OnePly)) phasePtr = useNullMove ? MainSearchPhaseTable : MainSearchNoNullPhaseTable; + else if (d > Depth(0)) + phasePtr = useNullMove ? LowSearchPhaseTable : MainSearchNoNullPhaseTable; else if (d == Depth(0)) phasePtr = QsearchWithChecksPhaseTable; else