X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=hachu.c;h=0bb028a8786645988f883deef76105f4cf6f46d7;hb=ed73ce0ee193d411590d1e2a4251fd612aa7ce2c;hp=a926e65f92fe0e16325ea63aed5d5673298bc5af;hpb=44d0328d67fa43295e79fe4fc99c997453d8f450;p=hachu.git

diff --git a/hachu.c b/hachu.c
index a926e65..0bb028a 100644
--- 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))*/)
 //define PATH 0
 
-#define HASH
-#define KILLERS
-#define NULLMOVE
+#define XHASH
+#define XKILLERS
+#define XNULLMOVE
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,8 +29,25 @@
 
 #ifdef WIN32 
 #    include <windows.h>
+     int InputWaiting()
+     {  // checks for waiting input in pipe
+	static int pipe, init;
+	static HANDLE inp;
+	DWORD cnt;
+
+	if(!init) inp = GetStdHandle(STD_INPUT_HANDLE);
+	if(!PeekNamedPipe(inp, NULL, 0, NULL, &cnt, NULL)) return 1;
+	return cnt;
+    }
 #else
 #    include <sys/time.h>
+#    include <sys/ioctl.h>
+     int InputWaiting()
+     {
+	int cnt;
+	if(ioctl(0, FIONREAD, &cnt)) return 1;
+	return cnt;
+     }
      int GetTickCount() // with thanks to Tord
      {	struct timeval t;
 	gettimeofday(&t, NULL);
@@ -114,7 +131,8 @@ typedef struct {
 char *array, fenArray[4000], *reason;
 int bWidth, bHeight, bsize, zone, currentVariant, chuFlag, tenFlag, chessFlag, repDraws;
 int stm, xstm, hashKeyH, hashKeyL, framePtr, msp, nonCapts, rootEval, retMSP, retFirst, retDep, pvPtr, level, cnt50, mobilityScore;
-int nodes, startTime, tlim1, tlim2, repCnt, comp;
+int nodes, startTime, tlim1, tlim2, tlim3, repCnt, comp, abortFlag;
+Move ponderMove;
 Move retMove, moveStack[10000], path[100], repStack[300], pv[1000], repeatMove[300], killer[100][2];
 
       int maxDepth;                            // used by search
@@ -1482,6 +1500,7 @@ GenCapts(int sqr, int victimValue)
 		    NewCapture(x, SPECIAL + 8*(i-1&7) + (i+1&7) + victimValue - SORTKEY(attacker), p[attacker].promoFlag);
 		  v = kStep[i+1];
 		  if((board[x+v] & TYPE) == xstm && board[x+v] > board[sqr])
+
 		    NewCapture(x, SPECIAL + 8*(i+1&7) + (i-1&7) + victimValue - SORTKEY(attacker), p[attacker].promoFlag);
 		}
 	      } else { // primary victim on first ring
@@ -1565,6 +1584,8 @@ FireSet (UndoInfo *tb)
     if(p[i].pos != ABSENT) tb->fireMask |= fireFlags[i-2];
 }
 
+void TerminationCheck();
+
 #define QSdepth 0
 
 int
@@ -1573,7 +1594,7 @@ Search (int alpha, int beta, int difEval, int depth, int oldPromo, int promoSupp
   int i, j, k, firstMove, oldMSP = msp, curMove, sorted, bad, phase, king, iterDep, replyDep, nextVictim, to, defer, dubious, bestMoveNr;
   int resDep;
   int myPV = pvPtr;
-  int score, bestScore, curEval, iterAlpha;
+  int score, bestScore, oldBest, curEval, iterAlpha;
   Move move, nullMove;
   UndoInfo tb;
 #ifdef HASH
@@ -1598,7 +1619,7 @@ if(PATH) /*pboard(board),pmap(attacks, BLACK),*/printf("search(%d) {%d,%d} eval=
   alpha -= (alpha < curEval);
   beta  -= (beta <= curEval);
 
-  nodes++;
+  if(!(nodes++ & 4095)) TerminationCheck();
   pv[pvPtr++] = 0; // start empty PV, directly behind PV of parent
 
 
@@ -1620,8 +1641,8 @@ if(PATH) /*pboard(board),pmap(attacks, BLACK),*/printf("search(%d) {%d,%d} eval=
   }
 #endif
 
-  replyDep = (depth < 1 ? depth : iterDep < 1 ? 1 : iterDep);
-  while(++iterDep <= depth) {
+  replyDep = (depth < 1 ? depth-1 : iterDep);
+  while(++iterDep <= depth || iterDep == 1) {
 if(flag && depth>= 0) printf("iter %d:%d\n", depth,iterDep),fflush(stdout);
     iterAlpha = alpha; bestScore = -INF; bestMoveNr = 0; resDep = 60;
     for(curMove = firstMove; ; curMove++) { // loop over moves
@@ -1779,6 +1800,11 @@ level--;
     repetition:
       UnMake(&tb);
       xstm = stm; stm ^= WHITE;
+      if(abortFlag > 0) { // unwind search
+printf("# abort (%d) @ %d\n", abortFlag, level);
+        if(curMove == firstMove) bestScore = oldBest, bestMoveNr = firstMove; // none searched yet
+        goto leave;
+      }
 #if 1
 if(PATH) printf("%d:%2d:%d %3d %6x %-10s %6d %6d\n", level, depth, iterDep, curMove, moveStack[curMove], MoveToText(moveStack[curMove], 0), score, bestScore);
 
@@ -1828,7 +1854,8 @@ if(PATH) printf("%d:%2d:%d %3d %6x %-10s %6d %6d\n", level, depth, iterDep, curM
 	printf("\n");
         fflush(stdout);
       }
-      if(GetTickCount() - startTime > tlim1) break; // do not start iteration we can (most likely) not finish
+printf("# s=%d t=%d 1=%d 3=%d f=%d\n",startTime,GetTickCount(),tlim1,tlim3,abortFlag);
+      if(!(abortFlag & 1) && GetTickCount() - startTime > tlim1) break; // do not start iteration we can (most likely) not finish
     }
     replyDep = iterDep;
 #ifdef HASH
@@ -1842,6 +1869,7 @@ if(PATH) printf("%d:%2d:%d %3d %6x %-10s %6d %6d\n", level, depth, iterDep, curM
     } else hashTable[index].move[hit] = 0;
 #endif
   } // next depth
+leave:
   retMSP = msp;
   retFirst = firstMove;
   msp = oldMSP; // pop move list
@@ -2088,7 +2116,7 @@ ListMoves ()
   int i;
   for(i=0; i< BSIZE; i++) boardCopy[i] = !!board[i];
 MapFromScratch(attacks);
-  postThinking--; repCnt = 0; tlim1 = tlim2 = 1e8; msp = 0;
+  postThinking--; repCnt = 0; tlim1 = tlim2 = tlim3 = 1e8; abortFlag = msp = 0;
   Search(-INF-1, INF+1, 0, 1, sup1 & ~PROMOTE, sup2);
   postThinking++;
   listStart = retFirst; listEnd = msp = retMSP;
@@ -2214,6 +2242,7 @@ SetSearchTimes (int timeLeft)
   if(timePerMove > 0) targetTime = 0.5*timeLeft, movesLeft = 1;
   tlim1 = 0.2*targetTime;
   tlim2 = 1.9*targetTime;
+  tlim3 = 5*timeLeft / (movesLeft + 4.1);
 }
 
 int
@@ -2234,6 +2263,9 @@ MapFromScratch(attacks);
 void
 PonderUntilInput (int stm)
 {
+MapFromScratch(attacks);
+  repCnt = 0; abortFlag = -1;
+  Search(-INF-1, INF+1, rootEval, maxDepth, sup1, sup2);
 }
  
     int TakeBack(int n)
@@ -2265,15 +2297,27 @@ printf("# setup done");fflush(stdout);
 
         // extract the first word
         sscanf(inBuf, "%s", command);
+printf("# in (mode = %d,%d): %s\n", root, abortFlag, command);
         if(!strcmp(command, "otim"))    { continue; } // do not start pondering after receiving time commands, as move will follow immediately
         if(!strcmp(command, "time"))    { sscanf(inBuf, "time %d", &timeLeft); continue; }
         if(!strcmp(command, "put"))     { ReadSquare(inBuf+4, &lastPut); continue; }  // ditto
         if(!strcmp(command, "."))       { inBuf[0] = 0; return; } // ignore for now
         if(!strcmp(command, "lift"))    { inBuf[0] = 0; Highlight(inBuf+5); return; } // treat here
+        abortFlag = 1;
         return;
       }
     }
 
+    void
+    TerminationCheck()
+    {
+      if(abortFlag < 0) { // check for input
+        if(InputWaiting()) GetLine(0); // read & examine input command
+      } else {        // check for time
+        if(GetTickCount() - startTime > tlim3) abortFlag = 2;
+      }
+    }
+
     main()
     {
       int engineSide=NONE;                     // side played by engine
@@ -2281,16 +2325,20 @@ printf("# setup done");fflush(stdout);
       int i, score, curVarNr;
 
   Init(V_CHU); // Chu
+      listEnd = 1;
 
       while(1) { // infinite loop
 
         fflush(stdout);                 // make sure everything is printed before we do something that might take time
+        *inBuf = 0;
 
         if(listEnd == 0) ListMoves();   // always maintain a list of legal moves in root position
 
+        abortFlag = 0;
         if(stm == engineSide) {         // if it is the engine's turn to move, set it thinking, and let it move
      
 pboard(board);
+          SetSearchTimes(10*timeLeft);
           score = SearchBestMove(&move, &ponderMove);
 
           if(move == INVALID) {         // game apparently ended