kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 01:03:09 +00:00
Code Issues Releases Wiki Activity

Rename yields_to_threat and prevents_threat

Browse source 
Follow Lucas suggestions and better name these
two functions.

No functional change.
This commit is contained in:
Marco Costalba 2012-12-26 12:15:55 +01:00
parent 894c43a1d6
commit db097921bc
1 changed files with 52 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
src/search.cpp
View file

@ -99,8 +99,8 @@ namespace {
Value value_to_tt(Value v, int ply); Value value_to_tt(Value v, int ply);
Value value_from_tt(Value v, int ply); Value value_from_tt(Value v, int ply);
bool check_is_dangerous(Position& pos, Move move, Value futilityBase, Value beta); bool check_is_dangerous(Position& pos, Move move, Value futilityBase, Value beta);
bool yields_to_threat(const Position& pos, Move move, Move threat); bool allows_move(const Position& pos, Move first, Move second);
bool prevents_threat(const Position& pos, Move move, Move threat); bool prevents_move(const Position& pos, Move first, Move second);
string uci_pv(const Position& pos, int depth, Value alpha, Value beta); string uci_pv(const Position& pos, int depth, Value alpha, Value beta);
struct Skill { struct Skill {
@ -683,7 +683,7 @@ namespace {
if ( depth < 5 * ONE_PLY if ( depth < 5 * ONE_PLY
&& (ss-1)->reduction && (ss-1)->reduction
&& threatMove != MOVE_NONE && threatMove != MOVE_NONE
&& yields_to_threat(pos, (ss-1)->currentMove, threatMove)) && allows_move(pos, (ss-1)->currentMove, threatMove))
threatExtension = true; threatExtension = true;
} }
} }
@ -802,7 +802,7 @@ split_point_start: // At split points actual search starts from here
if (PvNode && dangerous) if (PvNode && dangerous)
ext = ONE_PLY; ext = ONE_PLY;
else if (threatExtension && prevents_threat(pos, move, threatMove)) else if (threatExtension && prevents_move(pos, move, threatMove))
ext = ONE_PLY; ext = ONE_PLY;
else if (givesCheck && pos.see_sign(move) >= 0) else if (givesCheck && pos.see_sign(move) >= 0)
@ -847,7 +847,7 @@ split_point_start: // At split points actual search starts from here
// Move count based pruning // Move count based pruning
if ( depth < 16 * ONE_PLY if ( depth < 16 * ONE_PLY
&& moveCount >= FutilityMoveCounts[depth] && moveCount >= FutilityMoveCounts[depth]
&& (!threatMove || !prevents_threat(pos, move, threatMove))) && (!threatMove || !prevents_move(pos, move, threatMove)))
{ {
if (SpNode) if (SpNode)
sp->mutex.lock(); sp->mutex.lock();
@ -1346,39 +1346,40 @@ split_point_start: // At split points actual search starts from here
} }
// yields_to_threat() tests whether the move at previous ply yields to the so // allows_move() tests whether the move at previous ply (first) somehow makes a
// called threat move (the best move returned from a null search that fails // second move possible, for instance if the moving piece is the same in both
// low). Here 'yields to' means that the move somehow made the threat possible // moves. Normally the second move is the threat move (the best move returned
// for instance if the moving piece is the same in both moves. // from a null search that fails low).
bool yields_to_threat(const Position& pos, Move move, Move threat) { bool allows_move(const Position& pos, Move first, Move second) {
assert(is_ok(move)); assert(is_ok(first));
assert(is_ok(threat)); assert(is_ok(second));
assert(color_of(pos.piece_on(from_sq(threat))) == ~pos.side_to_move()); assert(color_of(pos.piece_on(from_sq(second))) == ~pos.side_to_move());
assert(color_of(pos.piece_on(to_sq(first))) == ~pos.side_to_move());
Square mfrom = from_sq(move); Square m1from = from_sq(first);
Square mto = to_sq(move); Square m2from = from_sq(second);
Square tfrom = from_sq(threat); Square m1to = to_sq(first);
Square tto = to_sq(threat); Square m2to = to_sq(second);
// The piece is the same or threat's destination was vacated by the move // The piece is the same or second's destination was vacated by the first move
if (mto == tfrom || tto == mfrom) if (m1to == m2from || m2to == m1from)
return true; return true;
// Threat moves through the vacated square // Second one moves through the square vacated by first one
if (between_bb(tfrom, tto) & mfrom) if (between_bb(m2from, m2to) & m1from)
return true; return true;
// Threat's destination is defended by the move's piece // Second's destination is defended by the first move's piece
Bitboard matt = pos.attacks_from(pos.piece_on(mto), mto, pos.pieces() ^ tfrom); Bitboard m1att = pos.attacks_from(pos.piece_on(m1to), m1to, pos.pieces() ^ m2from);
if (matt & tto) if (m1att & m2to)
return true; return true;
// Threat gives a discovered check through the move's checking piece // Second move gives a discovered check through the first's checking piece
if (matt & pos.king_square(pos.side_to_move())) if (m1att & pos.king_square(pos.side_to_move()))
{ {
assert(between_bb(mto, pos.king_square(pos.side_to_move())) & tfrom); assert(between_bb(m1to, pos.king_square(pos.side_to_move())) & m2from);
return true; return true;
} }
@ -1386,51 +1387,52 @@ split_point_start: // At split points actual search starts from here
} }
// prevents_threat() tests whether a move is able to defend against the so // prevents_move() tests whether a move (first) is able to defend against an
// called threat move (the best move returned from a null search that fails // opponent's move (second). In this case will not be pruned. Normally the
// low). In this case will not be pruned. // second move is the threat move (the best move returned from a null search
// that fails low).
bool prevents_threat(const Position& pos, Move move, Move threat) { bool prevents_move(const Position& pos, Move first, Move second) {
assert(is_ok(move)); assert(is_ok(first));
assert(is_ok(threat)); assert(is_ok(second));
assert(!pos.is_capture_or_promotion(move)); assert(!pos.is_capture_or_promotion(first));
assert(!pos.is_passed_pawn_push(move)); assert(!pos.is_passed_pawn_push(first));
Square mfrom = from_sq(move); Square m1from = from_sq(first);
Square mto = to_sq(move); Square m2from = from_sq(second);
Square tfrom = from_sq(threat); Square m1to = to_sq(first);
Square tto = to_sq(threat); Square m2to = to_sq(second);
// Don't prune moves of the threatened piece // Don't prune moves of the threatened piece
if (mfrom == tto) if (m1from == m2to)
return true; return true;
// If the threatened piece has value less than or equal to the value of the // If the threatened piece has value less than or equal to the value of the
// threat piece, don't prune moves which defend it. // threat piece, don't prune moves which defend it.
if ( pos.is_capture(threat) if ( pos.is_capture(second)
&& ( PieceValue[MG][pos.piece_on(tfrom)] >= PieceValue[MG][pos.piece_on(tto)] && ( PieceValue[MG][pos.piece_on(m2from)] >= PieceValue[MG][pos.piece_on(m2to)]
|| type_of(pos.piece_on(tfrom)) == KING)) || type_of(pos.piece_on(m2from)) == KING))
{ {
// Update occupancy as if the piece and the threat are moving // Update occupancy as if the piece and the threat are moving
Bitboard occ = pos.pieces() ^ mfrom ^ mto ^ tfrom; Bitboard occ = pos.pieces() ^ m1from ^ m1to ^ m2from;
Piece piece = pos.piece_on(mfrom); Piece piece = pos.piece_on(m1from);
// The moved piece attacks the square 'tto' ? // The moved piece attacks the square 'tto' ?
if (pos.attacks_from(piece, mto, occ) & tto) if (pos.attacks_from(piece, m1to, occ) & m2to)
return true; return true;
// Scan for possible X-ray attackers behind the moved piece // Scan for possible X-ray attackers behind the moved piece
Bitboard xray = (attacks_bb< ROOK>(tto, occ) & pos.pieces(color_of(piece), QUEEN, ROOK)) Bitboard xray = (attacks_bb< ROOK>(m2to, occ) & pos.pieces(color_of(piece), QUEEN, ROOK))
| (attacks_bb<BISHOP>(tto, occ) & pos.pieces(color_of(piece), QUEEN, BISHOP)); | (attacks_bb<BISHOP>(m2to, occ) & pos.pieces(color_of(piece), QUEEN, BISHOP));
// Verify attackers are triggered by our move and not already existing // Verify attackers are triggered by our move and not already existing
if (xray && (xray ^ (xray & pos.attacks_from<QUEEN>(tto)))) if (xray && (xray ^ (xray & pos.attacks_from<QUEEN>(m2to))))
return true; return true;
} }
// Don't prune safe moves which block the threat path // Don't prune safe moves which block the threat path
if ((between_bb(tfrom, tto) & mto) && pos.see_sign(move) >= 0) if ((between_bb(m2from, m2to) & m1to) && pos.see_sign(first) >= 0)
return true; return true;
return false; return false;