/// move ordering is at the current node.
MovePicker::MovePicker(const Position& p, bool pv, Move ttm,
- Move mk, Move k1, Move k2, Depth d, EvalInfo* ei) : pos(p) {
+ const SearchStack& ss, Depth d, EvalInfo* ei) : pos(p) {
pvNode = pv;
ttMove = ttm;
- mateKiller = (mk == ttm)? MOVE_NONE : mk;
- killer1 = k1;
- killer2 = k2;
+ mateKiller = (ss.mateKiller == ttm)? MOVE_NONE : ss.mateKiller;
+ killer1 = 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());
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() {