Extend bench to static evaluations

[stockfish] / src / evaluate.cpp

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 7760f70538d411e445324d2df749f6510c084dee..e42b4f387ccafc533952586f863a221a5ddca908 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -449,14 +449,13 @@ namespace {
                  + 148 * popcount(unsafeChecks)
                  +  98 * popcount(pos.blockers_for_king(Us))
                  +  69 * kingAttacksCount[Them]
                  + 148 * popcount(unsafeChecks)
                  +  98 * popcount(pos.blockers_for_king(Us))
                  +  69 * kingAttacksCount[Them]

-                 +   4 * (kingFlankAttack - kingFlankDefense)

                  +   3 * kingFlankAttack * kingFlankAttack / 8
                  +       mg_value(mobility[Them] - mobility[Us])
                  - 873 * !pos.count<QUEEN>(Them)
                  - 100 * bool(attackedBy[Us][KNIGHT] & attackedBy[Us][KING])
                  +   3 * kingFlankAttack * kingFlankAttack / 8
                  +       mg_value(mobility[Them] - mobility[Us])
                  - 873 * !pos.count<QUEEN>(Them)
                  - 100 * bool(attackedBy[Us][KNIGHT] & attackedBy[Us][KING])

-                 -  35 * bool(attackedBy[Us][BISHOP] & attackedBy[Us][KING])

                  -   6 * mg_value(score) / 8
                  -   6 * mg_value(score) / 8

-                 -   7;
+                 -   4 * kingFlankDefense
+                 +  37;

 
     // Transform the kingDanger units into a Score, and subtract it from the evaluation
     if (kingDanger > 100)
 
     // Transform the kingDanger units into a Score, and subtract it from the evaluation
     if (kingDanger > 100)


@@ -748,7 +747,7 @@ namespace {
     {
         if (   pos.opposite_bishops()
             && pos.non_pawn_material() == 2 * BishopValueMg)
     {
         if (   pos.opposite_bishops()
             && pos.non_pawn_material() == 2 * BishopValueMg)

-            sf = 16 + 4 * pe->passed_count();
+            sf = 22 ;

         else
             sf = std::min(sf, 36 + (pos.opposite_bishops() ? 2 : 7) * pos.count<PAWN>(strongSide));
 
         else
             sf = std::min(sf, 36 + (pos.opposite_bishops() ? 2 : 7) * pos.count<PAWN>(strongSide));
 


@@ -848,6 +847,9 @@ Value Eval::evaluate(const Position& pos) {
 
 std::string Eval::trace(const Position& pos) {
 
 
 std::string Eval::trace(const Position& pos) {
 

+  if (pos.checkers())
+      return "Total evaluation: none (in check)";
+

   std::memset(scores, 0, sizeof(scores));
 
   pos.this_thread()->contempt = SCORE_ZERO; // Reset any dynamic contempt
   std::memset(scores, 0, sizeof(scores));
 
   pos.this_thread()->contempt = SCORE_ZERO; // Reset any dynamic contempt