// Initialize pawn storm scores by giving bonuses for open files
for (File f = FILE_A; f <= FILE_H; f++)
- if (pos.file_is_half_open(us, f))
+ if (Position::file_is_half_open(ourPawns, f))
{
pi->ksStormValue[us] += KStormOpenFileBonus[f];
pi->qsStormValue[us] += QStormOpenFileBonus[f];
pi->halfOpenFiles[us] &= ~(1 << f);
// Passed, isolated or doubled pawn?
- passed = pos.pawn_is_passed(us, s);
- isolated = pos.pawn_is_isolated(us, s);
- doubled = pos.pawn_is_doubled(us, s);
+ passed = Position::pawn_is_passed(theirPawns, us, s);
+ isolated = Position::pawn_is_isolated(ourPawns, s);
+ doubled = Position::pawn_is_doubled(ourPawns, us, s);
// We calculate kingside and queenside pawn storm
// scores for both colors. These are used when evaluating
// Test for candidate passed pawn
candidate = !passed
- && pos.file_is_half_open(them, f)
+ && Position::file_is_half_open(theirPawns, f)
&& ( 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)
>= 0);
{
mv -= IsolatedPawnMidgamePenalty[f];
ev -= IsolatedPawnEndgamePenalty[f];
- if (pos.file_is_half_open(them, f))
+ if (Position::file_is_half_open(theirPawns, f))
{
mv -= IsolatedPawnMidgamePenalty[f] / 2;
ev -= IsolatedPawnEndgamePenalty[f] / 2;
{
mv -= BackwardPawnMidgamePenalty[f];
ev -= BackwardPawnEndgamePenalty[f];
- if (pos.file_is_half_open(them, f))
+ if (Position::file_is_half_open(theirPawns, f))
{
mv -= BackwardPawnMidgamePenalty[f] / 2;
ev -= BackwardPawnEndgamePenalty[f] / 2;
// Information about pawns
bool pawn_is_passed(Color c, Square s) const;
- bool pawn_is_isolated(Color c, Square s) const;
- bool pawn_is_doubled(Color c, Square s) const;
+ static bool pawn_is_passed(Bitboard theirPawns, Color c, Square s);
+ static bool pawn_is_isolated(Bitboard ourPawns, Square s);
+ static bool pawn_is_doubled(Bitboard ourPawns, Color c, Square s);
// Open and half-open files
- bool file_is_open(File f) const;
- bool file_is_half_open(Color c, File f) const;
+ static bool file_is_open(Bitboard pawns, File f);
+ static bool file_is_half_open(Bitboard pawns, File f);
// Weak squares
bool square_is_weak(Square s, Color c) const;
return !(pawns(opposite_color(c)) & passed_pawn_mask(c, s));
}
-inline bool Position::pawn_is_isolated(Color c, Square s) const {
- return !(pawns(c) & neighboring_files_bb(s));
+inline bool Position::pawn_is_passed(Bitboard theirPawns, Color c, Square s) {
+ return !(theirPawns & passed_pawn_mask(c, s));
}
-inline bool Position::pawn_is_doubled(Color c, Square s) const {
- return pawns(c) & squares_behind(c, s);
+inline bool Position::pawn_is_isolated(Bitboard ourPawns, Square s) {
+ return !(ourPawns & neighboring_files_bb(s));
}
-inline bool Position::file_is_open(File f) const {
- return !(pawns() & file_bb(f));
+inline bool Position::pawn_is_doubled(Bitboard ourPawns, Color c, Square s) {
+ return ourPawns & squares_behind(c, s);
}
-inline bool Position::file_is_half_open(Color c, File f) const {
- return !(pawns(c) & file_bb(f));
+inline bool Position::file_is_open(Bitboard pawns, File f) {
+ return !(pawns & file_bb(f));
+}
+
+inline bool Position::file_is_half_open(Bitboard pawns, File f) {
+ return !(pawns & file_bb(f));
}
inline bool Position::square_is_weak(Square s, Color c) const {