From: Marco Costalba <mcostalba@gmail.com>
Date: Tue, 22 Oct 2013 15:27:58 +0000 (+0200)
Subject: Restore behaviour after count<ALL_PIECES> fix
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=35ea39bed28cf6ca6d2f4ace303782b03643348a;ds=sidebyside

Restore behaviour after count<ALL_PIECES> fix

Because pos.count<ALL_PIECES>(Us) was always zero,
rewrite the formula as if this would still be
the case.

bench: 8510004
---

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 71120fde..f3586f96 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -878,9 +878,7 @@ Value do_evaluate(const Position& pos, Value& margin) {
                 ebonus -= ebonus / 4;
         }
 
-        // Increase the bonus if we have more non-pawn pieces
-        if (pos.count<ALL_PIECES>(  Us) - pos.count<PAWN>(  Us) >
-            pos.count<ALL_PIECES>(Them) - pos.count<PAWN>(Them))
+        if (pos.count<PAWN>(Us) < pos.count<PAWN>(Them))
             ebonus += ebonus / 4;
 
         score += make_score(mbonus, ebonus);