HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-19 08:36:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Don't prune discovered checks"

Browse Source 
Both Lucas re-test and Jean-Francois confirrm it
is a regression.

Here Jean-Francois's results after 3600 games :
Score of 96d3b1c92b vs 3b87314: 690 - 729 - 2181 [0.495] 3600
ELO: -3.86 +- 99%: 14.94 95%: 11.35
LOS: 15.03%
Wins: 690 Losses: 729 Draws: 2181 Total: 3600

Bench: 5404066
This commit is contained in:
Marco Costalba
2012-11-11 11:04:58 +01:00
parent 96d3b1c92b
commit c45a4e0b48
4 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/position.cpp
View File

@@ -657,7 +657,7 @@ bool Position::is_pseudo_legal(const Move m) const {
/// Position::move_gives_check() tests whether a pseudo-legal move gives a check
CheckType Position::move_gives_check(Move m, const CheckInfo& ci) const {
bool Position::move_gives_check(Move m, const CheckInfo& ci) const {
assert(is_ok(m));
assert(ci.dcCandidates == discovered_check_candidates());
@@ -669,7 +669,7 @@ CheckType Position::move_gives_check(Move m, const CheckInfo& ci) const {
// Direct check ?
if (ci.checkSq[pt] & to)
return DIRECT_CHECK;
return true;
// Discovery check ?
if (ci.dcCandidates && (ci.dcCandidates & from))
@@ -677,19 +677,19 @@ CheckType Position::move_gives_check(Move m, const CheckInfo& ci) const {
// For pawn and king moves we need to verify also direction
if ( (pt != PAWN && pt != KING)
|| !squares_aligned(from, to, king_square(~sideToMove)))
return DISCO_CHECK;
return true;
}
// Can we skip the ugly special cases ?
if (type_of(m) == NORMAL)
return NO_CHECK;
return false;
Color us = sideToMove;
Square ksq = king_square(~us);
// Promotion with check ?
if (type_of(m) == PROMOTION)
return attacks_from(Piece(promotion_type(m)), to, pieces() ^ from) & ksq ? DIRECT_CHECK : NO_CHECK;
return attacks_from(Piece(promotion_type(m)), to, pieces() ^ from) & ksq;
// En passant capture with check ? We have already handled the case
// of direct checks and ordinary discovered check, the only case we
@@ -701,7 +701,7 @@ CheckType Position::move_gives_check(Move m, const CheckInfo& ci) const {
Bitboard b = (pieces() ^ from ^ capsq) | to;
return (attacks_bb< ROOK>(ksq, b) & pieces(us, QUEEN, ROOK))
| (attacks_bb<BISHOP>(ksq, b) & pieces(us, QUEEN, BISHOP)) ? DISCO_CHECK : NO_CHECK;
| (attacks_bb<BISHOP>(ksq, b) & pieces(us, QUEEN, BISHOP));
}
// Castling with check ?
@@ -713,10 +713,10 @@ CheckType Position::move_gives_check(Move m, const CheckInfo& ci) const {
Square rto = relative_square(us, rfrom > kfrom ? SQ_F1 : SQ_D1);
Bitboard b = (pieces() ^ kfrom ^ rfrom) | rto | kto;
return attacks_bb<ROOK>(rto, b) & ksq ? DIRECT_CHECK : NO_CHECK;
return attacks_bb<ROOK>(rto, b) & ksq;
}
return NO_CHECK;
return false;
}