ttMove = ttm;
mateKiller = (ss.mateKiller == ttm)? MOVE_NONE : ss.mateKiller;
killer1 = ss.killers[0];
- killer2 = ss.killers[0];
+ killer2 = ss.killers[1];
depth = d;
movesPicked = 0;
numOfMoves = 0;
numOfBadCaptures = 0;
// With EvalInfo we are able to know how many captures are possible before
- // generating them. So avoid generating them in case we know are zero.
+ // generating them. So avoid generating in case we know are zero.
Color us = pos.side_to_move();
Color them = opposite_color(us);
- bool noAttacks = ei && (ei->attackedBy[us][0] & pos.pieces_of_color(them)) == 0;
- bool noCaptures = noAttacks && (pos.ep_square() == SQ_NONE) && !pos.has_pawn_on_7th(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
phaseIndex = (noCaptures ? NoMovesPhaseIndex : QsearchWithoutChecksPhaseIndex);
-
dc = p.discovered_check_candidates(us);
pinned = p.pinned_pieces(p.side_to_move());
// to the badCaptures[] array.
Move m;
int seeValue;
+ Square from, to;
for (int i = 0; i < numOfMoves; i++)
{
m = moves[i].move;
- seeValue = pos.see(m);
+ from = move_from(m);
+ to = move_to(m);
+
+ bool hxl = ( int(pos.midgame_value_of_piece_on(from))
+ -int(pos.midgame_value_of_piece_on(to)) > 0)
+ || pos.type_of_piece_on(from) == KING;
+
+ // Avoid calling see() for LxH and equal captures because
+ // SEE is always >= 0 and we order for MVV/LVA anyway.
+ seeValue = (hxl ? pos.see(m) : 0);
+
if (seeValue >= 0)
{
if (move_promotion(m))
moves[i].score = QueenValueMidgame;
else
- moves[i].score = int(pos.midgame_value_of_piece_on(move_to(m)))
- -int(pos.type_of_piece_on(move_from(m)));
+ moves[i].score = int(pos.midgame_value_of_piece_on(to))
+ -int(pos.type_of_piece_on(from));
}
else
{
else
hs = H.move_ordering_score(pos.piece_on(move_from(m)), m);
- // Ensure moves in history are always sorted as first
+ // Ensure history is always preferred to pst
if (hs > 0)
hs += 1000;
+ // pst based scoring
moves[i].score = hs + pos.mg_pst_delta(m);
}
}
} else
moves[i].score = H.move_ordering_score(pos.piece_on(move_from(m)), m);
}
- // FIXME try psqt also here
}
void MovePicker::score_qcaptures() {