Simplify connected pawn scoring

[stockfish] / src / pawns.cpp

diff --git a/src/pawns.cpp b/src/pawns.cpp
index 1ae65bf181bcb74dac8755704776bf95a31a3a4c..f60411993fcc0877ed83a8a632f25945018aa9db 100644 (file)
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -130,7 +130,7 @@ namespace {
         // Score this pawn
         if (support | phalanx)
         {
-            int v =  Connected[r] * (phalanx ? 3 : 2) / (opposed ? 2 : 1)
+            int v =  Connected[r] * (2 + bool(phalanx) - opposed)
                    + 17 * popcount(support);
 
             score += make_score(v, v * (r - 2) / 4);