Process usermove in ponder input

[hachu.git] / hachu.c

diff --git a/hachu.c b/hachu.c
index 7838313..609f05e 100644 (file)
--- a/hachu.c
+++ b/hachu.c
@@ -16,9 +16,9 @@
 #define PATH level==0 || path[0] == 0xc4028 &&  (level==1 /*|| path[1] == 0x75967 && (level == 2 || path[2] == 0x3400b && (level == 3))*/)\r
 //define PATH 0\r
 \r
-#define HASH\r
-#define KILLERS\r
-#define NULLMOVE\r
+#define XHASH\r
+#define XKILLERS\r
+#define XNULLMOVE\r
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
@@ -131,7 +131,7 @@ typedef struct {
 char *array, fenArray[4000], *reason;\r
 int bWidth, bHeight, bsize, zone, currentVariant, chuFlag, tenFlag, chessFlag, repDraws;\r
 int stm, xstm, hashKeyH, hashKeyL, framePtr, msp, nonCapts, rootEval, retMSP, retFirst, retDep, pvPtr, level, cnt50, mobilityScore;\r
-int nodes, startTime, tlim1, tlim2, tlim3, repCnt, comp, abortFlag;\r
+int nodes, startTime, lastRootMove, lastRootIter, tlim1, tlim2, tlim3, repCnt, comp, abortFlag;\r
 Move ponderMove;\r
 Move retMove, moveStack[10000], path[100], repStack[300], pv[1000], repeatMove[300], killer[100][2];\r
 \r
@@ -1500,6 +1500,7 @@ GenCapts(int sqr, int victimValue)
                    NewCapture(x, SPECIAL + 8*(i-1&7) + (i+1&7) + victimValue - SORTKEY(attacker), p[attacker].promoFlag);\r
                  v = kStep[i+1];\r
                  if((board[x+v] & TYPE) == xstm && board[x+v] > board[sqr])\r
+\r
                    NewCapture(x, SPECIAL + 8*(i+1&7) + (i-1&7) + victimValue - SORTKEY(attacker), p[attacker].promoFlag);\r
                }\r
              } else { // primary victim on first ring\r
@@ -1640,9 +1641,10 @@ if(PATH) /*pboard(board),pmap(attacks, BLACK),*/printf("search(%d) {%d,%d} eval=
   }\r
 #endif\r
 \r
-  replyDep = (depth < 1 ? depth : iterDep < 1 ? 1 : iterDep);\r
-  while(++iterDep <= depth) {\r
+  replyDep = (depth < 1 ? depth-1 : iterDep);\r
+  while(++iterDep <= depth || iterDep == 1) {\r
 if(flag && depth>= 0) printf("iter %d:%d\n", depth,iterDep),fflush(stdout);\r
+    oldBest = bestScore;\r
     iterAlpha = alpha; bestScore = -INF; bestMoveNr = 0; resDep = 60;\r
     for(curMove = firstMove; ; curMove++) { // loop over moves\r
 if(flag && depth>= 0) printf("phase=%d: first/curr/last = %d / %d / %d\n", phase, firstMove, curMove, msp);fflush(stdout);\r
@@ -1845,14 +1847,17 @@ if(PATH) printf("%d:%2d:%d %3d %6x %-10s %6d %6d\n", level, depth, iterDep, curM
     } // next move\r
   cutoff:\r
     if(!level) { // root node\r
+      lastRootIter = GetTickCount() - startTime;\r
       if(postThinking > 0) {\r
         int i;   // WB thinking output\r
-       printf("%d %d %d %d", iterDep, bestScore, (GetTickCount() - startTime)/10, nodes);\r
+       printf("%d %d %d %d", iterDep, bestScore, lastRootIter/10, nodes);\r
+        if(ponderMove) printf(" (%s)", MoveToText(ponderMove, 0));\r
        for(i=0; pv[i]; i++) printf(" %s", MoveToText(pv[i], 0));\r
         if(iterDep == 1) printf(" { root eval = %4.2f dif = %4.2f; abs = %4.2f}", curEval/100., difEval/100., PSTest()/100.);\r
        printf("\n");\r
         fflush(stdout);\r
       }\r
+printf("# s=%d t=%d 1=%d 3=%d f=%d\n",startTime,GetTickCount(),tlim1,tlim3,abortFlag);\r
       if(!(abortFlag & 1) && GetTickCount() - startTime > tlim1) break; // do not start iteration we can (most likely) not finish\r
     }\r
     replyDep = iterDep;\r
@@ -2301,6 +2306,15 @@ printf("# in (mode = %d,%d): %s\n", root, abortFlag, command);
         if(!strcmp(command, "put"))     { ReadSquare(inBuf+4, &lastPut); continue; }  // ditto\r
         if(!strcmp(command, "."))       { inBuf[0] = 0; return; } // ignore for now\r
         if(!strcmp(command, "lift"))    { inBuf[0] = 0; Highlight(inBuf+5); return; } // treat here\r
+        if(!root && !strcmp(command, "usermove")) {\r
+          abortFlag = !!strcmp(inBuf+9, ponderMoveText);\r
+          if(!abortFlag) { // ponder hit, continue as time-based search\r
+            SetSearchTimes(10*timeLeft + GetTickCount() - startTime); // add time we already have been pondering to total\r
+            if(lastRootIter > tlim1) abortFlag = 2; // abort instantly if we are in iteration we should not have started\r
+            inBuf[0] = 0; ponderMove = INVALID;\r
+            return;\r
+          }\r
+        }\r
         abortFlag = 1;\r
         return;\r
       }\r
@@ -2336,6 +2350,7 @@ printf("# in (mode = %d,%d): %s\n", root, abortFlag, command);
         if(stm == engineSide) {         // if it is the engine's turn to move, set it thinking, and let it move\r
      \r
 pboard(board);\r
+          SetSearchTimes(10*timeLeft);\r
           score = SearchBestMove(&move, &ponderMove);\r
 \r
           if(move == INVALID) {         // game apparently ended\r
@@ -2357,9 +2372,10 @@ pboard(board);
             PrintResult(stm, score);\r
           } else {\r
             stm = MakeMove2(stm, move);  // assumes MakeMove returns new side to move\r
-            gameMove[moveNr++] = move;  // remember game\r
+            gameMove[moveNr++] = move;   // remember game\r
             printf("move %s\n", MoveToText(move, 1));\r
             listEnd = 0;\r
+            continue;\r
           }\r
         }\r
 \r
@@ -2450,6 +2466,7 @@ pboard(board);
           }\r
           continue;\r
         }\r
+        ponderMove = INVALID; // the following commands change the position, invalidating ponder move\r
         listEnd = 0;\r
         if(!strcmp(command, "new"))     {\r
           engineSide = BLACK; Init(V_CHESS); stm = Setup2(NULL); maxDepth = MAXPLY; randomize = OFF; curVarNr = comp = 0;\r