do not redundantly evaluate when skip move try2

test r15
dhbloo · Jun 13, 2024 · c86c92c · c86c92c
1 parent fa863d2
commit c86c92c
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/Rapfi/search/ab/search.cpp b/Rapfi/search/ab/search.cpp
@@ -813,7 +813,10 @@ Value search(Board &board, SearchStack *ss, Value alpha, Value beta, Depth depth
             goto moves_loop;
     }
     else if (!RootNode) {
-        if (ttHit) {
+        if (skipMove) {
+            eval = ss->staticEval;
+        }
+        else if (ttHit) {
             // Never assume anything about values stored in TT
             ss->staticEval = eval = ttEval;
             if (eval == VALUE_NONE)
@@ -827,15 +830,14 @@ Value search(Board &board, SearchStack *ss, Value alpha, Value beta, Depth depth
             ss->staticEval = eval = Evaluation::evaluate<Rule>(board, alpha, beta);
 
             // Save static evaluation into transposition table
-            if (!skipMove)
-                TT.store(posKey,
-                         VALUE_NONE,
-                         ss->staticEval,
-                         ss->ttPv,
-                         BOUND_NONE,
-                         Pos::NONE,
-                         (int)DEPTH_NONE,
-                         ss->ply);
+            TT.store(posKey,
+                     VALUE_NONE,
+                     ss->staticEval,
+                     ss->ttPv,
+                     BOUND_NONE,
+                     Pos::NONE,
+                     (int)DEPTH_NONE,
+                     ss->ply);
         }
 
         improvement = ss->staticEval - (ss - 2)->staticEval;