Store in TT with depth == -OnePly instead of -1

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 20681108c0bd7ca8e3db1c94254dcd3b10d96236..ad5a8cc8c2e80637c3aed47020760a5b9db59e38 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -90,16 +90,16 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
 
   if (p.is_check())
       phasePtr = EvasionsPhaseTable;
-  else if (d > Depth(0))
+  else if (d > DEPTH_ZERO)
   {
       // Consider sligtly negative captures as good if at low
       // depth and far from beta.
-      if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * OnePly)
+      if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY)
           badCaptureThreshold = -PawnValueMidgame;
 
       phasePtr = MainSearchPhaseTable;
   }
-  else if (d == Depth(0))
+  else if (d == DEPTH_ZERO)
       phasePtr = QsearchWithChecksPhaseTable;
   else
   {
@@ -228,7 +228,7 @@ void MovePicker::score_noncaptures() {
       from = move_from(m);
       to = move_to(m);
       piece = pos.piece_on(from);
-      cur->score = H.move_ordering_score(piece, to);
+      cur->score = H.value(piece, to) + H.gain(piece, to);
   }
 }
 
@@ -253,7 +253,7 @@ void MovePicker::score_evasions_or_checks() {
           cur->score =  pos.midgame_value_of_piece_on(move_to(m))
                       - pos.type_of_piece_on(move_from(m)) + HistoryMax;
       else
-          cur->score = H.move_ordering_score(pos.piece_on(move_from(m)), move_to(m));
+          cur->score = H.value(pos.piece_on(move_from(m)), move_to(m));
   }
 }