X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=b2cae94c0e30de30956bfa6d9a92107e1b1e0db1;hp=2193eb6be797805b6aa46a4f510bbc9c14c4a38c;hb=c483ffc773c012b49f4ea2f5bd1d788c1f0dc4ac;hpb=3c6a4bfbed219b220535bcbaaa76636d3f4879e8

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 2193eb6b..b2cae94c 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -167,6 +167,9 @@ namespace {
   // happen in Chess960 games.
   const Score TrappedBishopA1H1Penalty = make_score(100, 100);
 
+  // Penalty for a minor piece that is not defended by anything
+  const Score UndefendedMinorPenalty = make_score(25, 10);
+
   // The SpaceMask[Color] contains the area of the board which is considered
   // by the space evaluation. In the middle game, each side is given a bonus
   // based on how many squares inside this area are safe and available for
@@ -354,13 +357,12 @@ namespace {
 template<bool Trace>
 Value do_evaluate(const Position& pos, Value& margin) {
 
+  assert(!pos.in_check());
+
   EvalInfo ei;
   Value margins[2];
   Score score, mobilityWhite, mobilityBlack;
 
-  assert(pos.thread() >= 0 && pos.thread() < MAX_THREADS);
-  assert(!pos.in_check());
-
   // Initialize score by reading the incrementally updated scores included
   // in the position object (material + piece square tables).
   score = pos.value();
@@ -684,7 +686,8 @@ Value do_evaluate(const Position& pos, Value& margin) {
                          & (pos.pieces(BISHOP) | pos.pieces(KNIGHT))
                          & ~ei.attackedBy[Them][0];
     if (undefended)
-        score += make_score(25, 10) * popcount<Max15>(undefended);
+        score += single_bit(undefended) ? UndefendedMinorPenalty
+                                        : UndefendedMinorPenalty * 2;
 
     // Enemy pieces not defended by a pawn and under our attack
     Bitboard weakEnemies =  pos.pieces(Them)