mirror of
https://github.com/sockspls/badfish
synced 2025-04-30 00:33:09 +00:00
Retire pawn span
Retire pawn span and replace with pawn count in evaluate_scale_factor. STC: LLR: 2.95 (-2.94,2.94) [-3.00,1.00] Total: 26482 W: 4929 L: 4818 D: 16735 LTC: LLR: 2.95 (-2.94,2.94) [-3.00,1.00] Total: 61938 W: 8400 L: 8335 D: 45203 Bench: 7662861
This commit is contained in:
parent
7396c08b79
commit
9585f8ef58
3 changed files with 2 additions and 6 deletions
|
@ -758,9 +758,9 @@ namespace {
|
||||||
// Endings where weaker side can place his king in front of the opponent's
|
// Endings where weaker side can place his king in front of the opponent's
|
||||||
// pawns are drawish.
|
// pawns are drawish.
|
||||||
else if ( abs(eg) <= BishopValueEg
|
else if ( abs(eg) <= BishopValueEg
|
||||||
&& ei.pi->pawn_span(strongSide) <= 1
|
&& pos.count<PAWN>(strongSide) <= 2
|
||||||
&& !pos.pawn_passed(~strongSide, pos.square<KING>(~strongSide)))
|
&& !pos.pawn_passed(~strongSide, pos.square<KING>(~strongSide)))
|
||||||
sf = ei.pi->pawn_span(strongSide) ? ScaleFactor(51) : ScaleFactor(37);
|
sf = ScaleFactor(37 + 7 * pos.count<PAWN>(strongSide));
|
||||||
}
|
}
|
||||||
|
|
||||||
return sf;
|
return sf;
|
||||||
|
|
|
@ -173,8 +173,6 @@ namespace {
|
||||||
}
|
}
|
||||||
|
|
||||||
b = e->semiopenFiles[Us] ^ 0xFF;
|
b = e->semiopenFiles[Us] ^ 0xFF;
|
||||||
e->pawnSpan[Us] = b ? int(msb(b) - lsb(b)) : 0;
|
|
||||||
|
|
||||||
return score;
|
return score;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,6 @@ 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]; }
|
||||||
Bitboard pawn_attacks_span(Color c) const { return pawnAttacksSpan[c]; }
|
Bitboard pawn_attacks_span(Color c) const { return pawnAttacksSpan[c]; }
|
||||||
int pawn_span(Color c) const { return pawnSpan[c]; }
|
|
||||||
int pawn_asymmetry() const { return asymmetry; }
|
int pawn_asymmetry() const { return asymmetry; }
|
||||||
|
|
||||||
int semiopen_file(Color c, File f) const {
|
int semiopen_file(Color c, File f) const {
|
||||||
|
@ -73,7 +72,6 @@ struct Entry {
|
||||||
Score kingSafety[COLOR_NB];
|
Score kingSafety[COLOR_NB];
|
||||||
int castlingRights[COLOR_NB];
|
int castlingRights[COLOR_NB];
|
||||||
int semiopenFiles[COLOR_NB];
|
int semiopenFiles[COLOR_NB];
|
||||||
int pawnSpan[COLOR_NB];
|
|
||||||
int pawnsOnSquares[COLOR_NB][COLOR_NB]; // [color][light/dark squares]
|
int pawnsOnSquares[COLOR_NB][COLOR_NB]; // [color][light/dark squares]
|
||||||
int asymmetry;
|
int asymmetry;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue