Bench: 4058638

ElbertoOne · Jan 17, 2019 · fd52e39 · fd52e39
1 parent 637b984
commit fd52e39
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/bitboard.h b/src/bitboard.h
@@ -197,6 +197,12 @@ inline Bitboard adjacent_files_bb(File f) {
   return shift<EAST>(FileBB[f]) | shift<WEST>(FileBB[f]);
 }
 
+inline Bitboard wide_adjacent_files_bb(File f) {
+	Bitboard east = shift<EAST>(FileBB[f]);
+	Bitboard west = shift<WEST>(FileBB[f]);
+	return east | west | shift<EAST>(east) | shift<WEST>(west);
+}
+
 
 /// between_bb() returns a bitboard representing all the squares between the two
 /// given ones. For instance, between_bb(SQ_C4, SQ_F7) returns a bitboard with

diff --git a/src/pawns.cpp b/src/pawns.cpp
@@ -135,9 +135,11 @@ namespace {
         {
             score -= Isolated, e->weakUnopposed[Us] += !opposed;
             // extra penalty if the isolated pawn is not on the edge and is facing several opponent pawns.
-            if (!(s & (FileABB | FileHBB)) && more_than_one(theirPawns & (forward_file_bb(Us, s) | adjacent_files_bb(f))))
+            if (   !(s & (FileABB | FileHBB))
+                && !(ourPawns & wide_adjacent_files_bb(f))
+                && more_than_one(theirPawns & forward_ranks_bb(Us, s) & (file_bb(f) | adjacent_files_bb(f))))
                 score -= Isolated;
-		}
+        }
 
         else if (backward)
             score -= Backward, e->weakUnopposed[Us] += !opposed;