mirror of
https://github.com/sockspls/badfish
synced 2025-07-11 19:49:14 +00:00
Simplify Weak Lever
This is a simplification that integrated WeakLever into doubled pawns. Since we already check for !support for Doubled pawns, it is trivial to check for weak lever by just checking more_than_one(lever). We also introduce the Score * bool operation overload to remove some casts in the code. STC LLR: 2.95 (-2.94,2.94) [-3.00,1.00] Total: 26757 W: 5842 L: 5731 D: 15184 http://tests.stockfishchess.org/tests/view/5d77ee220ebc5902d384e5a4 Closes https://github.com/official-stockfish/Stockfish/pull/2295 No functional change
This commit is contained in:
parent
61f44ce578
commit
270b241ec1
2 changed files with 12 additions and 11 deletions
|
@ -71,10 +71,10 @@ namespace {
|
||||||
constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
|
constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
|
||||||
constexpr Direction Up = (Us == WHITE ? NORTH : SOUTH);
|
constexpr Direction Up = (Us == WHITE ? NORTH : SOUTH);
|
||||||
|
|
||||||
Bitboard neighbours, stoppers, doubled, support, phalanx;
|
Bitboard neighbours, stoppers, support, phalanx;
|
||||||
Bitboard lever, leverPush;
|
Bitboard lever, leverPush;
|
||||||
Square s;
|
Square s;
|
||||||
bool opposed, backward, passed;
|
bool opposed, backward, passed, doubled;
|
||||||
Score score = SCORE_ZERO;
|
Score score = SCORE_ZERO;
|
||||||
const Square* pl = pos.squares<PAWN>(Us);
|
const Square* pl = pos.squares<PAWN>(Us);
|
||||||
|
|
||||||
|
@ -137,20 +137,16 @@ namespace {
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (!neighbours)
|
else if (!neighbours)
|
||||||
score -= Isolated + WeakUnopposed * int(!opposed);
|
score -= Isolated + WeakUnopposed * !opposed;
|
||||||
|
|
||||||
else if (backward)
|
else if (backward)
|
||||||
score -= Backward + WeakUnopposed * int(!opposed);
|
score -= Backward + WeakUnopposed * !opposed;
|
||||||
|
|
||||||
if (doubled && !support)
|
if (!support)
|
||||||
score -= Doubled;
|
score -= Doubled * doubled
|
||||||
|
+ WeakLever * more_than_one(lever);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Penalize our unsupported pawns attacked twice by enemy pawns
|
|
||||||
score -= WeakLever * popcount( ourPawns
|
|
||||||
& doubleAttackThem
|
|
||||||
& ~e->pawnAttacks[Us]);
|
|
||||||
|
|
||||||
return score;
|
return score;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -345,6 +345,11 @@ inline Score operator*(Score s, int i) {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Multiplication of a Score by an boolean
|
||||||
|
inline Score operator*(Score s, bool b) {
|
||||||
|
return Score(int(s) * int(b));
|
||||||
|
}
|
||||||
|
|
||||||
constexpr Color operator~(Color c) {
|
constexpr Color operator~(Color c) {
|
||||||
return Color(c ^ BLACK); // Toggle color
|
return Color(c ^ BLACK); // Toggle color
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue