Improve time management

[hachu.git] / hachu.c

diff --git a/hachu.c b/hachu.c
index ac3ed99..290fbf2 100644 (file)
--- a/hachu.c
+++ b/hachu.c
@@ -799,6 +799,20 @@ Init (int var)
   p[EDGE].qval = 5; // tenjiku jump-capturer sentinel\r
 }\r
 \r
+int\r
+PSTest ()\r
+{\r
+  int r, f, score, tot=0;\r
+  for(r=0; r<BH; r++) for(f=0; f<BH; f++) {\r
+    int s = BW*r+f;\r
+    int piece = board[s];\r
+    if(!piece) continue;\r
+    score = p[piece].value + PST[p[piece].pst + s];\r
+    if(piece & 1) tot += score; else tot -= score;\r
+  }\r
+  return tot;\r
+}\r
+\r
 int flag;\r
 \r
 inline int\r
@@ -1523,7 +1537,7 @@ if(PATH) /*pboard(board),pmap(attacks, BLACK),*/printf("search(%d) {%d,%d} eval=
   nodes++;\r
   pv[pvPtr++] = 0; // start empty PV, directly behind PV of parent\r
 \r
-  firstMove = curMove = sorted = msp += 20; // leave 20 empty slots in front of move list\r
+  firstMove = curMove = sorted = msp += 50; // leave 50 empty slots in front of move list\r
   tb.fireMask = phase = 0; iterDep=1; replyDep = (depth < 1 ? depth : 1) - 1;\r
   do {\r
 if(flag && depth>= 0) printf("iter %d:%d\n", depth,iterDep),fflush(stdout);\r
@@ -1541,7 +1555,7 @@ if(flag && depth>= 0) printf("phase=%d: first/curr/last = %d / %d / %d\n", phase
 #if 0\r
            if(curEval >= beta) {\r
              stm ^= WHITE;\r
-             score = -Search(-beta, -iterAlpha, difEval, depth-3, promoSuppress & SQUARE, ABSENT);\r
+             score = -Search(-beta, -iterAlpha, -difEval, depth-3, promoSuppress & SQUARE, ABSENT);\r
              stm ^= WHITE;\r
              if(score >= beta) { msp = oldMSP; retDep += 3; return score + (score < curEval); }\r
            }\r
@@ -1612,7 +1626,7 @@ if(PATH) printf("%d:%2d:%2d msp=%d\n",level,depth,iterDep,msp);
       // MOVE EXTRACTION\r
     extractMove:\r
 if(flag & depth >= 0) printf("%2d:%d extract %d/%d\n", depth, iterDep, curMove, msp);\r
-      if(curMove < sorted) {\r
+      if(curMove > sorted) {\r
        move = moveStack[sorted=j=curMove];\r
        for(i=curMove+1; i<msp; i++)\r
          if(moveStack[i] > move) move = moveStack[j=i]; // search move with highest priority\r
@@ -1651,7 +1665,11 @@ MapFromScratch(attacks); // for as long as incremental update does not work.
          if(promoSuppress & PROMOTE) score = -INF; // non-Lion captures Lion after opponent did same\r
          defer |= PROMOTE;                         // if we started, flag  he cannot do it in reply\r
        }\r
-        if(score == -INF) { moveStack[curMove] = 0; goto abortMove; } // zap illegal moves\r
+        if(score == -INF) {\r
+          if(level == 1) repeatMove[repCnt++] = move & 0xFFFFFF | (p[tb.piece].value == 10*LVAL ? 3<<24 : 1 << 24);\r
+          moveStack[curMove] = 0; // zap illegal moves\r
+          goto abortMove;\r
+        }\r
       }\r
 #if 1\r
       score = -Search(-beta, -iterAlpha, -difEval - tb.booty, replyDep, promoSuppress & ~PROMOTE, defer);\r
@@ -1704,7 +1722,9 @@ if(PATH) printf("%d:%2d:%d %3d %6x %-10s %6d %6d\n", level, depth, iterDep, curM
         int i;   // WB thinking output\r
        printf("%d %d %d %d", iterDep, bestScore, (GetTickCount() - startTime)/10, nodes);\r
        for(i=0; pv[i]; i++) printf(" %s", MoveToText(pv[i], 0));\r
-       printf("\n"); fflush(stdout);\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
       if(GetTickCount() - startTime > tlim1) break; // do not start iteration we can (most likely) not finish\r
     }\r
@@ -1938,7 +1958,8 @@ printf("# deferral of %d\n", deferred);
       for(i=retFirst; i<retMSP; i++) printf("# %d. %08x %08x %s\n", i-50, moveStack[i], ret, MoveToText(moveStack[i], 0));\r
       reason = NULL;\r
       for(i=0; i<repCnt; i++) {if((repeatMove[i] & 0xFFFFFF) == ret) {\r
-        reason = "Repeats earlier position";\r
+        if(repeatMove[i] & 1<<24) reason = (repeatMove[i] & 1<<25 ? "Distant capture of protected Lion" : "Counterstrike against Lion");\r
+        else reason = "Repeats earlier position";\r
         break;\r
       }\r
  printf("# %d. %08x %08x %s\n", i, repeatMove[i], ret, MoveToText(repeatMove[i], 0));\r
@@ -2008,9 +2029,10 @@ flag=0;
 int\r
 SearchBestMove (int stm, int timeLeft, int mps, int timeControl, int inc, int timePerMove, MOVE *move, MOVE *ponderMove)\r
 {\r
-  int score, targetTime, movesLeft = 50;\r
+  int score, targetTime, movesLeft = BW*BH/4 + 20;\r
   if(mps) movesLeft = mps - (moveNr>>1)%mps;\r
   targetTime = timeLeft*10 / (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
   tlim1 = 0.2*targetTime;\r