Merge pull request #9 from glinscott/master
[stockfish] / src / evaluate.cpp
index c03aa99..6e515d8 100644 (file)
@@ -357,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();
@@ -679,13 +678,13 @@ Value do_evaluate(const Position& pos, Value& margin) {
 
     const Color Them = (Us == WHITE ? BLACK : WHITE);
 
-    Bitboard b;
+    Bitboard b, undefended, undefendedMinors, weakEnemies;
     Score score = SCORE_ZERO;
 
     // Undefended pieces get penalized even if not under attack
-    Bitboard undefended = pos.pieces(Them) & ~ei.attackedBy[Them][0];
-    const Bitboard undefendedMinors = undefended & (pos.pieces(BISHOP) | pos.pieces(KNIGHT));
-    
+    undefended = pos.pieces(Them) & ~ei.attackedBy[Them][0];
+    undefendedMinors = undefended & (pos.pieces(BISHOP) | pos.pieces(KNIGHT));
+
     if (undefendedMinors)
         score += single_bit(undefendedMinors) ? UndefendedPiecePenalty
                                               : UndefendedPiecePenalty * 2;
@@ -693,9 +692,10 @@ Value do_evaluate(const Position& pos, Value& margin) {
         score += UndefendedPiecePenalty;
 
     // Enemy pieces not defended by a pawn and under our attack
-    Bitboard weakEnemies =  pos.pieces(Them)
-                          & ~ei.attackedBy[Them][PAWN]
-                          & ei.attackedBy[Us][0];
+    weakEnemies =  pos.pieces(Them)
+                 & ~ei.attackedBy[Them][PAWN]
+                 & ei.attackedBy[Us][0];
+
     if (!weakEnemies)
         return score;