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

Further simplify previous patch

Browse source 
No functional change.
This commit is contained in:
Marco Costalba 2013-05-04 11:42:34 +02:00
parent e00bb13e85
commit 3b92159908
2 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/evaluate.cpp
View file

@ -648,26 +648,14 @@ Value do_evaluate(const Position& pos, Value& margin) {
continue; continue;
ksq = pos.king_square(Us); ksq = pos.king_square(Us);
bool left = file_of(ksq) < FILE_E;
if ( file_of(ksq) >= FILE_E if ( ((left && file_of(s) < file_of(ksq)) || (!left && file_of(s) > file_of(ksq)))
&& file_of(s) > file_of(ksq)
&& (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s)) && (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s))
&& !ei.pi->has_open_file_to_right(Us, file_of(ksq))) && (!ei.pi->has_open_file_on_side(Us, file_of(ksq), left)))
{
// Is there a half-open file between the king and the edge of the board?
score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2 score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2
: (TrappedRookPenalty - mob * 16), 0); : (TrappedRookPenalty - mob * 16), 0);
} }
else if ( file_of(ksq) <= FILE_D
&& file_of(s) < file_of(ksq)
&& (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s))
&& !ei.pi->has_open_file_to_left(Us, file_of(ksq)))
{
// Is there a half-open file between the king and the edge of the board?
score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2
: (TrappedRookPenalty - mob * 16), 0);
}
}
} }
if (Trace) if (Trace)

5
src/pawns.h
View file

@ -38,9 +38,10 @@ struct Entry {
Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; } Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; }
Bitboard passed_pawns(Color c) const { return passedPawns[c]; } Bitboard passed_pawns(Color c) const { return passedPawns[c]; }
int file_is_half_open(Color c, File f) const { return halfOpenFiles[c] & (1 << int(f)); } int file_is_half_open(Color c, File f) const { return halfOpenFiles[c] & (1 << int(f)); }
int has_open_file_to_left(Color c, File f) const { return halfOpenFiles[c] & ((1 << int(f)) - 1); }
int has_open_file_to_right(Color c, File f) const { return halfOpenFiles[c] & ~((1 << int(f+1)) - 1); }
int pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][!!(BlackSquares & s)]; } int pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][!!(BlackSquares & s)]; }
int has_open_file_on_side(Color c, File f, bool left) const {
return halfOpenFiles[c] & (left ? ((1 << int(f)) - 1) : ~((1 << int(f+1)) - 1));
}
template<Color Us> template<Color Us>
Score king_safety(const Position& pos, Square ksq) { Score king_safety(const Position& pos, Square ksq) {