Split calculating of time limits from SearchBestMove

Make the TC parameters global so they would not have to be passed to
the new SetTimeLimits() via SearchBestMove(), and SetTimeLimits()
can be called also from within search.

diff --git a/hachu.c b/hachu.c
index 2f4a767..a926e65 100644 (file)
--- a/hachu.c
+++ b/hachu.c
@@ -1941,7 +1941,7 @@ typedef Move MOVE;
     void SetMemorySize(int n);              // if n is different from last time, resize all tables to make memory usage below n MB\r
     char *MoveToText(MOVE move, int m);     // converts the move from your internal format to text like e2e2, e1g1, a7a8q.\r
     MOVE ParseMove(char *moveText);         // converts a long-algebraic text move to your internal move format\r
-    int  SearchBestMove(int stm, int timeLeft, int mps, int timeControl, int inc, int timePerMove, MOVE *move, MOVE *ponderMove);\r
+    int  SearchBestMove(MOVE *move, MOVE *ponderMove);\r
     void PonderUntilInput(int stm);         // Search current position for stm, deepening forever until there is input.\r
 \r
 UndoInfo undoInfo;\r
@@ -2200,31 +2200,42 @@ Highlight(char *coords)
   printf("highlight %s\n", buf);\r
 }\r
 \r
-int\r
-SearchBestMove (int stm, int timeLeft, int mps, int timeControl, int inc, int timePerMove, MOVE *move, MOVE *ponderMove)\r
+int timeLeft;                            // timeleft on engine's clock\r
+int mps, timeControl, inc, timePerMove;  // time-control parameters, to be used by Search\r
+char inBuf[8000], command[80], ponderMoveText[20];\r
+\r
+void\r
+SetSearchTimes (int timeLeft)\r
 {\r
-  int score, targetTime, movesLeft = BW*BH/4 + 20;\r
+  int targetTime, movesLeft = BW*BH/4 + 20;\r
   if(mps) movesLeft = mps - (moveNr>>1)%mps;\r
-  targetTime = timeLeft*10 / (movesLeft + 2) + 1000 * inc;\r
+  targetTime = (timeLeft - 1000*inc) / (movesLeft + 2) + 1000 * inc;\r
   if(moveNr < 30) targetTime *= 0.5 + moveNr/60.; // speedup in opening\r
-  if(timePerMove > 0) targetTime = timeLeft * 5;\r
-  startTime = GetTickCount();\r
+  if(timePerMove > 0) targetTime = 0.5*timeLeft, movesLeft = 1;\r
   tlim1 = 0.2*targetTime;\r
   tlim2 = 1.9*targetTime;\r
+}\r
+\r
+int\r
+SearchBestMove (MOVE *move, MOVE *ponderMove)\r
+{\r
+  int score;\r
+  startTime = GetTickCount();\r
   nodes = 0;\r
 MapFromScratch(attacks);\r
   retMove = INVALID; repCnt = 0;\r
   score = Search(-INF-1, INF+1, rootEval, maxDepth, sup1, sup2);\r
   *move = retMove;\r
-  *ponderMove = INVALID;\r
+  *ponderMove = pv[1];\r
   return score;\r
 }\r
 \r
+\r
 void\r
 PonderUntilInput (int stm)\r
 {\r
 }\r
-\r
+ \r
     int TakeBack(int n)\r
     { // reset the game and then replay it to the desired point\r
       int last, stm;\r
@@ -2266,11 +2277,8 @@ printf("# setup done");fflush(stdout);
     main()\r
     {\r
       int engineSide=NONE;                     // side played by engine\r
-      int timeLeft;                            // timeleft on engine's clock\r
-      int mps, timeControl, inc, timePerMove;  // time-control parameters, to be used by Search\r
-      MOVE move, ponderMove;\r
+      MOVE move;\r
       int i, score, curVarNr;\r
-      char inBuf[8000], command[80];\r
 \r
   Init(V_CHU); // Chu\r
 \r
@@ -2283,7 +2291,7 @@ printf("# setup done");fflush(stdout);
         if(stm == engineSide) {         // if it is the engine's turn to move, set it thinking, and let it move\r
      \r
 pboard(board);\r
-          score = SearchBestMove(stm, timeLeft, mps, timeControl, inc, timePerMove, &move, &ponderMove);\r
+          score = SearchBestMove(&move, &ponderMove);\r
 \r
           if(move == INVALID) {         // game apparently ended\r
             int kcapt = 0, xstm = stm ^ WHITE, king, k = p[king=royal[xstm]].pos;\r