int MainSearchPhaseIndex;
int EvasionsPhaseIndex;
int QsearchWithChecksPhaseIndex;
- int QsearchNoCapturesPhaseIndex;
int QsearchWithoutChecksPhaseIndex;
- int NoMovesPhaseIndex;
}
/// move ordering is at the current node.
MovePicker::MovePicker(const Position& p, bool pv, Move ttm,
- const SearchStack& ss, Depth d, EvalInfo* ei) : pos(p) {
+ const SearchStack& ss, Depth d) : pos(p) {
pvNode = pv;
ttMove = ttm;
mateKiller = (ss.mateKiller == ttm)? MOVE_NONE : ss.mateKiller;
numOfMoves = 0;
numOfBadCaptures = 0;
- // With EvalInfo we are able to know how many captures are possible before
- // generating them. So avoid generating in case we know are zero.
- Color us = pos.side_to_move();
- Color them = opposite_color(us);
- bool noCaptures = ei
- && (ei->attackedBy[us][0] & pos.pieces_of_color(them)) == 0
- && !ei->mi->specialized_eval_exists()
- && (pos.ep_square() == SQ_NONE)
- && !pos.has_pawn_on_7th(us);
-
if (p.is_check())
phaseIndex = EvasionsPhaseIndex;
else if (depth > Depth(0))
phaseIndex = MainSearchPhaseIndex;
else if (depth == Depth(0))
- phaseIndex = (noCaptures ? QsearchNoCapturesPhaseIndex : QsearchWithChecksPhaseIndex);
+ phaseIndex = QsearchWithChecksPhaseIndex;
else
- phaseIndex = (noCaptures ? NoMovesPhaseIndex : QsearchWithoutChecksPhaseIndex);
+ phaseIndex = QsearchWithoutChecksPhaseIndex;
+
+ Color us = pos.side_to_move();
+
+ dc = p.discovered_check_candidates(us);
+ pinned = p.pinned_pieces(us);
finished = false;
}
if (ttMove != MOVE_NONE)
{
assert(move_is_ok(ttMove));
- if (move_is_legal(pos, ttMove))
+ if (move_is_legal(pos, ttMove, pinned))
return ttMove;
}
break;
if (mateKiller != MOVE_NONE)
{
assert(move_is_ok(mateKiller));
- if (move_is_legal(pos, mateKiller))
+ if (move_is_legal(pos, mateKiller, pinned))
return mateKiller;
- }
- break;
+ }
+ break;
case PH_GOOD_CAPTURES:
numOfMoves = generate_captures(pos, moves);
case PH_EVASIONS:
assert(pos.is_check());
- numOfMoves = generate_evasions(pos, moves);
+ numOfMoves = generate_evasions(pos, moves, pinned);
score_evasions();
movesPicked = 0;
break;
break;
case PH_QCHECKS:
- numOfMoves = generate_checks(pos, moves);
+ numOfMoves = generate_checks(pos, moves, dc);
movesPicked = 0;
break;
moves[bestIndex] = moves[movesPicked++];
if ( move != ttMove
&& move != mateKiller
- && pos.pl_move_is_legal(move))
+ && pos.pl_move_is_legal(move, pinned))
return move;
}
break;
moves[bestIndex] = moves[movesPicked++];
if ( move != ttMove
&& move != mateKiller
- && pos.pl_move_is_legal(move))
+ && pos.pl_move_is_legal(move, pinned))
return move;
}
break;
move = badCaptures[movesPicked++].move;
if ( move != ttMove
&& move != mateKiller
- && pos.pl_move_is_legal(move))
+ && pos.pl_move_is_legal(move, pinned))
return move;
}
break;
moves[bestIndex] = moves[movesPicked++];
// Remember to change the line below if we decide to hash the qsearch!
// Maybe also postpone the legality check until after futility pruning?
- if (/* move != ttMove && */ pos.pl_move_is_legal(move))
+ if (/* move != ttMove && */ pos.pl_move_is_legal(move, pinned))
return move;
}
break;
{
move = moves[movesPicked++].move;
// Remember to change the line below if we decide to hash the qsearch!
- if (/* move != ttMove && */ pos.pl_move_is_legal(move))
+ if (/* move != ttMove && */ pos.pl_move_is_legal(move, pinned))
return move;
}
break;
PhaseTable[i++] = PH_QCHECKS;
PhaseTable[i++] = PH_STOP;
- // Quiescence search with checks only and no captures
- QsearchNoCapturesPhaseIndex = i - 1;
- PhaseTable[i++] = PH_QCHECKS;
- PhaseTable[i++] = PH_STOP;
-
// Quiescence search without checks
QsearchWithoutChecksPhaseIndex = i - 1;
PhaseTable[i++] = PH_QCAPTURES;
PhaseTable[i++] = PH_STOP;
- // Do not generate any move
- NoMovesPhaseIndex = i - 1;
- PhaseTable[i++] = PH_STOP;
}