Fix royalty of Crown Prince in setup positions

[hachu.git] / hachu.c

diff --git a/hachu.c b/hachu.c
index b39efbf..cc462a1 100644 (file)
--- a/hachu.c
+++ b/hachu.c
@@ -12,7 +12,7 @@
 \r
 #define VERSION "0.18"\r
 \r
-//define PATH level==0 /*|| path[0] == 0x3490a &&  (level==1 || path[1] == 0x285b3 && (level == 2 || path[2] == 0x8710f && (level == 3 /*|| path[3] == 0x3e865 && (level == 4 || path[4] == 0x4b865 && (level == 5)))))*/\r
+//define PATH level==0 || path[0] == 0x1103a &&  (level==1 || path[1] == 0x6f0f6 && (level == 2 /*|| path[2] == 0x8710f && (level == 3 /*|| path[3] == 0x3e865 && (level == 4 || path[4] == 0x4b865 && (level == 5)))*/))\r
 #define PATH 0\r
 \r
 #define HASH\r
@@ -140,7 +140,8 @@ typedef struct {
 } UndoInfo;\r
 \r
 char *array, fenArray[4000], startPos[4000], *reason, checkStack[300];\r
-int bWidth, bHeight, bsize, zone, currentVariant, chuFlag, tenFlag, chessFlag, repDraws, stalemate, tsume, pvCuts, allowRep, entryProm, pVal;\r
+int bWidth, bHeight, bsize, zone, currentVariant, chuFlag, tenFlag, chessFlag, repDraws, stalemate;\r
+int tsume, pvCuts, allowRep, entryProm, okazaki, pVal;\r
 int stm, xstm, hashKeyH=1, hashKeyL=1, framePtr, msp, nonCapts, rootEval, filling, promoDelta;\r
 int retMSP, retFirst, retDep, pvPtr, level, cnt50, mobilityScore;\r
 int ll, lr, ul, ur; // corner squares\r
@@ -816,7 +817,7 @@ SetUp(char *array, int var)
        name[0] += 'A' - 'a';\r
        if(name[1]) name[1] += 'A' - 'a';\r
       } else color = WHITE;\r
-      if(!strcmp(name, "CP")) prince |= color+1; // remember if we added Crown Prince\r
+      if(!strcmp(name, "CP") || pflag && !strcmp(name, "DE")) prince |= color+1; // remember if we added Crown Prince\r
       p1 = LookUp(name, var);\r
       if(!p1) printf("tellusererror Unknown piece '%s' in setup\n", name), exit(-1);\r
       if(pflag && p1->promoted) p1 = LookUp(p1->promoted, var); // use promoted piece instead\r
@@ -1622,8 +1623,8 @@ Evaluate (int difEval)
 \r
 #ifdef KINGSAFETY\r
   // basic centralization in end-game (also facilitates bare-King mating)\r
-  wKing = p[royal[WHITE]].pos; if(wKing == ABSENT) wKing = p[royal[WHITE]+1].pos;\r
-  bKing = p[royal[BLACK]].pos; if(bKing == ABSENT) bKing = p[royal[BLACK]+1].pos;\r
+  wKing = p[royal[WHITE]].pos; if(wKing == ABSENT) wKing = p[royal[WHITE]+2].pos;\r
+  bKing = p[royal[BLACK]].pos; if(bKing == ABSENT) bKing = p[royal[BLACK]+2].pos;\r
   if(filling < 32) {\r
     int lead = (stm == WHITE ? difEval : -difEval);\r
     score += (PST[3*BW*BH+wKing] - PST[3*BW*BH+bKing])*(32 - filling) >> 7;\r
@@ -1738,7 +1739,7 @@ if(!level) {for(i=0; i<5; i++)printf("# %d %08x, %d\n", i, repStack[200-i], chec
     }\r
   } else { // he has no king! Test for attacks on Crown Prince\r
     k = p[king + 2].pos;\r
-    if(attacks[2*k + stm]) return INF; // we have attack on Crown Prince\r
+    if(k == ABSENT || attacks[2*k + stm]) return INF; // we have attack on Crown Prince\r
   }\r
 //printf("King safe\n");fflush(stdout);\r
   // EVALUATION & WINDOW SHIFT\r
@@ -1963,7 +1964,9 @@ MapFromScratch(attacks); // for as long as incremental update does not work.
          if(dist[tb.from-tb.to] != 1 && attacks[2*tb.to + stm] && p[tb.epVictim[0]].value <= 50)\r
            score = -INF;                           // our Lion is indeed made vulnerable and can be recaptured\r
        } else {                                    // other x Ln\r
-         if(promoSuppress & PROMOTE) score = -INF; // non-Lion captures Lion after opponent did same\r
+         if(promoSuppress & PROMOTE) {             // non-Lion captures Lion after opponent did same\r
+           if(!okazaki || attacks[2*tb.to + stm]) score = -INF;\r
+         }\r
          defer |= PROMOTE;                         // if we started, flag  he cannot do it in reply\r
        }\r
         if(score == -INF) {\r
@@ -2476,7 +2479,7 @@ printf("# SearchBestMove\n");
 printf("# s=%d\n", startTime);fflush(stdout);\r
 MapFromScratch(attacks);\r
   retMove = INVALID; repCnt = 0;\r
-  score = Search(-INF-1, INF+1, rootEval, maxDepth, 0, sup1, sup2, INF);\r
+  score = Search(-INF-1, INF+1, rootEval, maxDepth + QSdepth, 0, sup1, sup2, INF);\r
   *move = retMove;\r
   *ponderMove = pv[1];\r
 printf("# best=%s\n", MoveToText(pv[0],0));\r
@@ -2642,6 +2645,7 @@ pboard(board);
           printf("feature option=\"Full analysis PV -check 1\"\n"); // example of an engine-defined option\r
           printf("feature option=\"Allow repeats -check 0\"\n");\r
           printf("feature option=\"Promote on entry -check 0\"\n");\r
+          printf("feature option=\"Okazaki rule -check 0\"\n");\r
           printf("feature option=\"Resign -check 0\"\n");           // \r
           printf("feature option=\"Contempt -spin 0 -200 200\"\n"); // and another one\r
           printf("feature option=\"Tsume -combo no /// Sente mates /// Gote mates\"\n");\r
@@ -2653,6 +2657,7 @@ pboard(board);
           if(sscanf(inBuf+7, "Allow repeats=%d", &allowRep)  == 1) continue;\r
           if(sscanf(inBuf+7, "Resign=%d",   &resign)         == 1) continue;\r
           if(sscanf(inBuf+7, "Contempt=%d", &contemptFactor) == 1) continue;\r
+          if(sscanf(inBuf+7, "Okazaki rule=%d", &okazaki)    == 1) continue;\r
           if(sscanf(inBuf+7, "Promote on entry=%d", &entryProm) == 1) continue;\r
           if(sscanf(inBuf+7, "Tsume=%s", command) == 1) {\r
            if(!strcmp(command, "no"))    tsume = 0; else\r
@@ -2664,6 +2669,7 @@ pboard(board);
         }\r
         if(!strcmp(command, "sd"))      { sscanf(inBuf, "sd %d", &maxDepth);    continue; }\r
         if(!strcmp(command, "st"))      { sscanf(inBuf, "st %d", &timePerMove); continue; }\r
+\r
         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