Retire InitialDepth

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 6d75cc3de34b7ee44021fd6b78b330791a8fb807..8cdd7a21323033bd46706ef5264bb1911eb4a385 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -233,11 +233,6 @@ namespace {
   template <NodeType PV>
   inline Depth reduction(Depth d, int mn) { return (Depth) ReductionMatrix[PV][Min(d / 2, 63)][Min(mn, 63)]; }
 
-  // Common adjustments
-
-  // Search depth at iteration 1
-  const Depth InitialDepth = ONE_PLY;
-
   // Easy move margin. An easy move candidate must be at least this much
   // better than the second best move.
   const Value EasyMoveMargin = Value(0x200);
@@ -329,8 +324,8 @@ namespace {
   // before to search them.
   template<> struct MovePickerExt<false, true> : public MovePicker {
 
-    MovePickerExt(const Position& p, Move, Depth d, const History& h, SearchStack* ss, Value b)
-                 : MovePicker(p, Rml[0].pv[0], d, h, ss, b), firstCall(true) {
+    MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value b)
+                 : MovePicker(p, ttm, d, h, ss, b), firstCall(true) {
       Move move;
       Value score = VALUE_ZERO;
 
@@ -656,7 +651,7 @@ namespace {
         cout << "info depth " << iteration << endl;
 
         Rml.bestMoveChanges = researchCountFL = researchCountFH = 0;
-        depth = (iteration - 2) * ONE_PLY + InitialDepth;
+        depth = (iteration - 1) * ONE_PLY;
 
         // Calculate dynamic aspiration window based on previous iterations
         if (MultiPV == 1 && iteration >= 6 && abs(bestValues[iteration - 1]) < VALUE_KNOWN_WIN)
@@ -793,7 +788,7 @@ namespace {
     Value refinedValue, nullValue, futilityBase, futilityValueScaled; // Non-PV specific
     bool isPvMove, isCheck, singleEvasion, singularExtensionNode, moveIsCheck, captureOrPromotion, dangerous;
     bool mateThreat = false;
-    int moveCount = 0;
+    int moveCount = 0, playedMoveCount = 0;
     int threadID = pos.thread();
     SplitPoint* sp = NULL;
 
@@ -1027,7 +1022,7 @@ split_point_start: // At split points actual search starts from here
       else if (move == excludedMove)
           continue;
       else
-          movesSearched[moveCount++] = move;
+          moveCount++;
 
       if (Root)
       {
@@ -1142,6 +1137,9 @@ split_point_start: // At split points actual search starts from here
       // Step 13. Make the move
       pos.do_move(move, st, ci, moveIsCheck);
 
+      if (!SpNode && !captureOrPromotion)
+          movesSearched[playedMoveCount++] = move;
+
       // Step extra. pv search (only in PV nodes)
       // The first move in list is the expected PV
       if (isPvMove)
@@ -1321,7 +1319,7 @@ split_point_start: // At split points actual search starts from here
         if (    bestValue >= beta
             && !pos.move_is_capture_or_promotion(move))
         {
-            update_history(pos, move, depth, movesSearched, moveCount);
+            update_history(pos, move, depth, movesSearched, playedMoveCount);
             update_killers(move, ss->killers);
         }
     }
@@ -1833,8 +1831,7 @@ split_point_start: // At split points actual search starts from here
 
         assert(m != move);
 
-        if (!pos.move_is_capture_or_promotion(m))
-            H.update(pos.piece_on(move_from(m)), move_to(m), -bonus);
+        H.update(pos.piece_on(move_from(m)), move_to(m), -bonus);
     }
   }
 
@@ -1844,11 +1841,11 @@ split_point_start: // At split points actual search starts from here
 
   void update_killers(Move m, Move killers[]) {
 
-    if (m == killers[0])
-        return;
-
-    killers[1] = killers[0];
-    killers[0] = m;
+    if (m != killers[0])
+    {
+        killers[1] = killers[0];
+        killers[0] = m;
+    }
   }