if (p.is_check())
phasePtr = EvasionsPhaseTable;
- else if (d > Depth(0))
+ else if (d > DEPTH_ZERO)
{
// Consider sligtly negative captures as good if at low
// depth and far from beta.
- if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * OnePly)
+ if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY)
badCaptureThreshold = -PawnValueMidgame;
phasePtr = MainSearchPhaseTable;
}
- else if (d == Depth(0))
+ else if (d == DEPTH_ZERO)
phasePtr = QsearchWithChecksPhaseTable;
else
{
case PH_EVASIONS:
assert(pos.is_check());
lastMove = generate_evasions(pos, moves);
- score_evasions_or_checks();
+ score_evasions();
return;
case PH_QCAPTURES:
case PH_QCHECKS:
lastMove = generate_non_capture_checks(pos, moves);
- score_evasions_or_checks();
return;
case PH_STOP:
from = move_from(m);
to = move_to(m);
piece = pos.piece_on(from);
- cur->score = H.move_ordering_score(piece, to);
+ cur->score = H.value(piece, to) + H.gain(piece, to);
}
}
-void MovePicker::score_evasions_or_checks() {
+void MovePicker::score_evasions() {
// Try good captures ordered by MVV/LVA, then non-captures if
// destination square is not under attack, ordered by history
// value, and at the end bad-captures and non-captures with a
cur->score = pos.midgame_value_of_piece_on(move_to(m))
- pos.type_of_piece_on(move_from(m)) + HistoryMax;
else
- cur->score = H.move_ordering_score(pos.piece_on(move_from(m)), move_to(m));
+ cur->score = H.value(pos.piece_on(move_from(m)), move_to(m));
}
}