From: Marco Costalba <mcostalba@gmail.com>
Date: Sat, 6 Mar 2010 16:34:36 +0000 (+0100)
Subject: Retire RootMoveNumber and use FirstRootMove instead
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=cc2a249952a93b134e67834b47000e455135e28f

Retire RootMoveNumber and use FirstRootMove instead

It is more clear why we use that global flag.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
---

diff --git a/src/search.cpp b/src/search.cpp
index 515787c1..45c040f7 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -254,10 +254,10 @@ namespace {
   int MultiPV;
 
   // Time managment variables
-  int RootMoveNumber, SearchStartTime, MaxNodes, MaxDepth;
-  int MaxSearchTime, AbsoluteMaxSearchTime, ExtraSearchTime, ExactMaxTime;
+  int SearchStartTime, MaxNodes, MaxDepth, MaxSearchTime;
+  int AbsoluteMaxSearchTime, ExtraSearchTime, ExactMaxTime;
   bool UseTimeManagement, InfiniteSearch, PonderSearch, StopOnPonderhit;
-  bool AbortSearch, Quit, AspirationFailLow;
+  bool FirstRootMove, AbortSearch, Quit, AspirationFailLow;
 
   // Show current line?
   bool ShowCurrentLine;
@@ -828,8 +828,8 @@ namespace {
         // Step 10. Loop through all moves in the root move list
         for (int i = 0; i <  rml.move_count() && !AbortSearch; i++)
         {
-            // This is used by time management and starts from 1
-            RootMoveNumber = i + 1;
+            // This is used by time management
+            FirstRootMove = (i == 0);
 
             // Save the current node count before the move is searched
             nodes = TM.nodes_searched();
@@ -843,7 +843,7 @@ namespace {
 
             if (current_search_time() >= 1000)
                 cout << "info currmove " << move
-                     << " currmovenumber " << RootMoveNumber << endl;
+                     << " currmovenumber " << i + 1 << endl;
 
             moveIsCheck = pos.move_is_check(move);
             captureOrPromotion = pos.move_is_capture_or_promotion(move);
@@ -2480,7 +2480,7 @@ namespace {
     if (PonderSearch)
         return;
 
-    bool stillAtFirstMove =    RootMoveNumber == 1
+    bool stillAtFirstMove =    FirstRootMove
                            && !AspirationFailLow
                            &&  t > MaxSearchTime + ExtraSearchTime;
 
@@ -2503,7 +2503,7 @@ namespace {
     int t = current_search_time();
     PonderSearch = false;
 
-    bool stillAtFirstMove =    RootMoveNumber == 1
+    bool stillAtFirstMove =    FirstRootMove
                            && !AspirationFailLow
                            &&  t > MaxSearchTime + ExtraSearchTime;