// Use the cached evaluation score if possible
assert(ei.futilityMargin == Value(0));
- staticValue = tte->value() + ply;
+ staticValue = tte->value() + 7;
}
else
- staticValue = evaluate(pos, ei, threadID) + ply;
+ staticValue = evaluate(pos, ei, threadID) + 7;
if (ply == PLY_MAX - 1)
return evaluate(pos, ei, threadID);
{
// Store the score to avoid a future costly evaluation() call
if (!isCheck && !tte && ei.futilityMargin == 0)
- TT.store(pos.get_key(), bestValue - ply, VALUE_TYPE_EVAL, Depth(-127*OnePly), MOVE_NONE);
+ TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_EVAL, Depth(-127*OnePly), MOVE_NONE);
return bestValue;
}
// the second move is assumed to be a move from the current position.
bool connected_moves(const Position& pos, Move m1, Move m2) {
+
Square f1, t1, f2, t2;
+ Piece p;
assert(move_is_ok(m1));
assert(move_is_ok(m2));
return true;
// Case 4: The destination square for m2 is attacked by the moving piece in m1
- if (pos.piece_attacks_square(pos.piece_on(t1), t1, t2))
+ p = pos.piece_on(t1);
+ if (bit_is_set(pos.attacks_from(p, t1), t2))
return true;
// Case 5: Discovered check, checking piece is the piece moved in m1
- if ( piece_is_slider(pos.piece_on(t1))
+ if ( piece_is_slider(p)
&& bit_is_set(squares_between(t1, pos.king_square(pos.side_to_move())), f2)
&& !bit_is_set(squares_between(t1, pos.king_square(pos.side_to_move())), t2))
{
Color us = pos.side_to_move();
Square ksq = pos.king_square(us);
clear_bit(&occ, f2);
- if (pos.type_of_piece_on(t1) == BISHOP)
+ if (type_of_piece(p) == BISHOP)
{
if (bit_is_set(bishop_attacks_bb(ksq, occ), t1))
return true;
}
- else if (pos.type_of_piece_on(t1) == ROOK)
+ else if (type_of_piece(p) == ROOK)
{
if (bit_is_set(rook_attacks_bb(ksq, occ), t1))
return true;
}
else
{
- assert(pos.type_of_piece_on(t1) == QUEEN);
+ assert(type_of_piece(p) == QUEEN);
if (bit_is_set(queen_attacks_bb(ksq, occ), t1))
return true;
}
n = Slowdown;
for (i = 0; i < n; i++) {
Square s = Square(i&63);
- if (count_1s(pos.attacks_to(s)) > 63)
- std::cout << "This can't happen, but I put this string here anyway, in order to prevent the compiler from optimizing away the useless computation." << std::endl;
+ if (count_1s(pos.attackers_to(s)) > 63)
+ std::cout << "This can't happen, but I put this string here anyway, in order to "
+ "prevent the compiler from optimizing away the useless computation." << std::endl;
}
}