Print static eval with thinking output

[hachu.git] / hachu.c

diff --git a/hachu.c b/hachu.c
index ad1bd20..6de0d39 100644 (file)
--- a/hachu.c
+++ b/hachu.c
@@ -94,7 +94,7 @@ typedef struct {
 char *array, *reason;\r
 int bWidth, bHeight, bsize, zone, currentVariant;\r
 int stm, xstm, hashKeyH, hashKeyL, framePtr, msp, nonCapts, rootEval, retMSP, retFirst, retDep, pvPtr, level, cnt50, chuFlag=1, tenFlag, mobilityScore;\r
-int nodes, startTime, tlim1, tlim2, repCnt;\r
+int nodes, startTime, tlim1, tlim2, repCnt, comp;\r
 Move retMove, moveStack[10000], path[100], repStack[300], pv[1000], repeatMove[300];\r
 \r
 #define X 36 /* slider              */\r
@@ -789,7 +789,8 @@ Init (int var)
 \r
   // piece-square tables\r
   for(i=0; i<BH; i++) for(j=0; j<BH; j++) {\r
-    int s = BW*i + j, d = BH*(BH-2) - (2*i - BH + 1)*(2*i - BH + 1) - (2*j - BH + 1)*(2*j - BH + 1);\r
+    int s = BW*i + j, d = BH*(BH-2) - abs(2*i - BH + 1)*(BH-1) - (2*j - BH + 1)*(2*j - BH + 1);\r
+    PST[s] = 0;\r
     PST[BH+s] = d/4 - (i == 0 || i == BH-1 ? 15 : 0) - (j == 0 || j == BH-1 ? 15 : 0);\r
     PST[BH*BW+s] = d/6;\r
     PST[BH*BW+BH+s] = d/12;\r
@@ -798,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
@@ -1460,7 +1475,7 @@ GenCapts(int sqr, int victimValue)
     for(i=0; i<8; i++) {    // scan all knight jumps to locate source\r
       int x = sqr - nStep[i], attacker = board[x];\r
       if(attacker == EMPTY || (attacker & TYPE) != stm) continue;\r
-      if(p[attacker].range[i] <= N && p[attacker].range[i] >= S && p[attacker].range[i] != J) { // has Knight jump in our direction\r
+      if(p[attacker].range[i] <= L && p[attacker].range[i] >= S || p[attacker].range[i] == N) { // has Knight jump in our direction\r
        NewCapture(x, sqr + victimValue, p[attacker].promoFlag);   // plain jump (as in N)\r
        if(p[attacker].range[i] < N) { // Lion power; generate double captures over two possible intermediates\r
          int v = kStep[i]; // leftish path\r
@@ -1522,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
@@ -1540,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
@@ -1611,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
@@ -1703,7 +1718,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
@@ -2161,7 +2178,10 @@ printf("var %d\n",i);
         if(!strcmp(command, "memory"))  { SetMemorySize(atoi(inBuf+7)); continue; }\r
         if(!strcmp(command, "ping"))    { printf("pong%s", inBuf+4); continue; }\r
     //  if(!strcmp(command, ""))        { sscanf(inBuf, " %d", &); continue; }\r
-        if(!strcmp(command, "new"))     { engineSide = BLACK; Init(V_CHESS); stm = Setup2(DEFAULT_FEN); maxDepth = MAXPLY; randomize = OFF; continue; }\r
+        if(!strcmp(command, "new"))     {\r
+          engineSide = BLACK; Init(V_CHESS); stm = Setup2(DEFAULT_FEN); maxDepth = MAXPLY; randomize = OFF; comp = 0;\r
+          continue;\r
+        }\r
         if(!strcmp(command, "setboard")){ engineSide = NONE;  stm = Setup2(inBuf+9); continue; }\r
         if(!strcmp(command, "easy"))    { ponder = OFF; continue; }\r
         if(!strcmp(command, "hard"))    { ponder = ON;  continue; }\r
@@ -2183,7 +2203,7 @@ printf("var %d\n",i);
         if(!strcmp(command, "l"))       { pplist(); continue; }\r
         // ignored commands:\r
         if(!strcmp(command, "xboard"))  { continue; }\r
-        if(!strcmp(command, "computer")){ continue; }\r
+        if(!strcmp(command, "computer")){ comp = 1; continue; }\r
         if(!strcmp(command, "name"))    { continue; }\r
         if(!strcmp(command, "ics"))     { continue; }\r
         if(!strcmp(command, "accepted")){ continue; }\r
@@ -2195,6 +2215,7 @@ printf("var %d\n",i);
           int move = ParseMove(inBuf+9);\r
           if(move == INVALID) {\r
             if(reason) printf("Illegal move {%s}\n", reason); else printf("%s\n", reason="Illegal move");\r
+            if(comp) PrintResult(stm, -INF); // against computer: claim\r
           } else {\r
             stm = MakeMove2(stm, move);\r
             ponderMove = INVALID;\r