Merge branch 'master' of https://github.com/official-stockfish/Stockfish
authorFabian Fichter <ianfab@users.noreply.github.com>
Sun, 28 Apr 2019 15:55:21 +0000 (17:55 +0200)
committerFabian Fichter <ianfab@users.noreply.github.com>
Sun, 28 Apr 2019 15:55:21 +0000 (17:55 +0200)
bench: 3246425

1  2 
src/Makefile
src/evaluate.cpp
src/search.cpp

diff --cc src/Makefile
Simple merge
@@@ -551,11 -464,12 +551,12 @@@ namespace 
      int kingFlankAttacks = popcount(b1) + popcount(b2);
  
      kingDanger +=        kingAttackersCount[Them] * kingAttackersWeight[Them]
 -                 +  69 * kingAttacksCount[Them]
 -                 + 185 * popcount(kingRing[Us] & weak)
 +                 + 69  * kingAttacksCount[Them] * (1 + 2 * !!pos.max_check_count())
 +                 + 185 * popcount(kingRing[Us] & weak) * (1 + pos.captures_to_hand() + !!pos.max_check_count())
                   - 100 * bool(attackedBy[Us][KNIGHT] & attackedBy[Us][KING])
+                  -  35 * bool(attackedBy[Us][BISHOP] & attackedBy[Us][KING])
                   + 150 * popcount(pos.blockers_for_king(Us) | unsafeChecks)
 -                 - 873 * !pos.count<QUEEN>(Them)
 +                 - 873 * !(pos.count<QUEEN>(Them) || pos.captures_to_hand()) / (1 + !!pos.max_check_count())
                   -   6 * mg_value(score) / 8
                   +       mg_value(mobility[Them] - mobility[Us])
                   +   5 * kingFlankAttacks * kingFlankAttacks / 16
diff --cc src/search.cpp
Simple merge