mirror of
https://github.com/sockspls/badfish
synced 2025-04-30 08:43:09 +00:00
Fix candidate passed pawn definition
A pawn is candidate to be passed if doesn't have enemy pawns in just front of him, not also behind ! Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
parent
a9fa1fc7f7
commit
c23cd4d90a
1 changed files with 3 additions and 2 deletions
|
@ -183,7 +183,7 @@ Score PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns,
|
||||||
Square s;
|
Square s;
|
||||||
File f;
|
File f;
|
||||||
Rank r;
|
Rank r;
|
||||||
bool passed, isolated, doubled, chain, backward, candidate;
|
bool passed, isolated, doubled, opposed, chain, backward, candidate;
|
||||||
int bonus;
|
int bonus;
|
||||||
Score value = make_score(0, 0);
|
Score value = make_score(0, 0);
|
||||||
const Square* ptr = pos.piece_list_begin(Us, PAWN);
|
const Square* ptr = pos.piece_list_begin(Us, PAWN);
|
||||||
|
@ -209,6 +209,7 @@ Score PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns,
|
||||||
passed = !(theirPawns & passed_pawn_mask(Us, s));
|
passed = !(theirPawns & passed_pawn_mask(Us, s));
|
||||||
isolated = !(ourPawns & neighboring_files_bb(s));
|
isolated = !(ourPawns & neighboring_files_bb(s));
|
||||||
doubled = ourPawns & squares_behind(Us, s);
|
doubled = ourPawns & squares_behind(Us, s);
|
||||||
|
opposed = theirPawns & squares_in_front_of(Us, s);
|
||||||
|
|
||||||
// We calculate kingside and queenside pawn storm
|
// We calculate kingside and queenside pawn storm
|
||||||
// scores for both colors. These are used when evaluating
|
// scores for both colors. These are used when evaluating
|
||||||
|
@ -299,7 +300,7 @@ Score PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns,
|
||||||
|
|
||||||
// Test for candidate passed pawn
|
// Test for candidate passed pawn
|
||||||
candidate = !passed
|
candidate = !passed
|
||||||
&& !(theirPawns & file_bb(f))
|
&& !opposed
|
||||||
&& ( count_1s_max_15(neighboring_files_bb(f) & (behind_bb(Us, r) | rank_bb(r)) & ourPawns)
|
&& ( count_1s_max_15(neighboring_files_bb(f) & (behind_bb(Us, r) | rank_bb(r)) & ourPawns)
|
||||||
- count_1s_max_15(neighboring_files_bb(f) & in_front_bb(Us, r) & theirPawns)
|
- count_1s_max_15(neighboring_files_bb(f) & in_front_bb(Us, r) & theirPawns)
|
||||||
>= 0);
|
>= 0);
|
||||||
|
|
Loading…
Add table
Reference in a new issue