Merge pull request official-stockfish#429 from ianfab/zh_asym1

ddugovic · web-flow · commit e758572ddbb3 · 2017-11-04T02:37:32.000-05:00
Asymmetric king safety evaluation for crazyhouse
diff --git a/src/evaluate.cpp b/src/evaluate.cpp
@@ -1071,6 +1071,8 @@ namespace {
 #endif
             int v = kingDanger * kingDanger / 4096;
 #ifdef CRAZYHOUSE
+            if (pos.is_house() && Us == pos.side_to_move())
+                v -= v / 10;
             if (pos.is_house() && v > QueenValueMg)
                 v = QueenValueMg;
 #endif
diff --git a/src/search.cpp b/src/search.cpp
@@ -904,7 +904,11 @@ namespace {
     else
     {
         eval = ss->staticEval =
+#ifdef CRAZYHOUSE
+        (ss-1)->currentMove != MOVE_NULL || pos.is_house() ? evaluate(pos)
+#else
         (ss-1)->currentMove != MOVE_NULL ? evaluate(pos)
+#endif
                                          : -(ss-1)->staticEval + 2 * Eval::Tempo[pos.variant()];
 
         tte->save(posKey, VALUE_NONE, BOUND_NONE, DEPTH_NONE, MOVE_NONE,
@@ -1511,7 +1515,11 @@ namespace {
         }
         else
             ss->staticEval = bestValue =
+#ifdef CRAZYHOUSE
+            (ss-1)->currentMove != MOVE_NULL || pos.is_house() ? evaluate(pos)
+#else
             (ss-1)->currentMove != MOVE_NULL ? evaluate(pos)
+#endif
                                              : -(ss-1)->staticEval + 2 * Eval::Tempo[pos.variant()];
 
         // Stand pat. Return immediately if static value is at least beta
