Fix tsume condition when both K and CP present

[hachu.git] / hachu.c

diff --git a/hachu.c b/hachu.c
index 5893196..ffde08b 100644 (file)
--- a/hachu.c
+++ b/hachu.c
@@ -12,7 +12,7 @@
 \r
 #define VERSION "0.19"\r
 \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 level==0 || path[0] == 0x590cb &&  (level==1 || path[1] == 0x4c0c9 && (level == 2 || path[2] == 0x8598ca && (level == 3 /*|| path[3] == 0x3e865 && (level == 4 || path[4] == 0x4b865 && (level == 5))*/)))\r
 #define PATH 0\r
 \r
 #define HASH\r
@@ -820,6 +820,7 @@ SetUp(char *array, int var)
   char c, *q, name[3], prince = 0;\r
   PieceDesc *p1, *p2;\r
   last[WHITE] = 1; last[BLACK] = 0;\r
+  royal[WHITE] = royal[BLACK] = 0;\r
   for(i=0; ; i++) {\r
 //printf("next rank: %s\n", array);\r
     for(j = BW*i; ; j++) {\r
@@ -860,6 +861,9 @@ SetUp(char *array, int var)
     }\r
   }\r
  eos:\r
+  // add dummy Kings if not yet added (needed to set royal[] to valid value!)\r
+  if(!royal[WHITE]) p[AddPiece(WHITE, LookUp("K", V_CHU))].pos = ABSENT;\r
+  if(!royal[BLACK]) p[AddPiece(BLACK, LookUp("K", V_CHU))].pos = ABSENT;\r
   // add dummy Crown Princes if not yet added\r
   if(!(prince & WHITE+1)) p[AddPiece(WHITE, LookUp("CP", V_CHU))].pos = ABSENT;\r
   if(!(prince & BLACK+1)) p[AddPiece(BLACK, LookUp("CP", V_CHU))].pos = ABSENT;\r
@@ -1641,6 +1645,8 @@ Evaluate (int difEval)
 {\r
   int wLion = ABSENT, bLion = ABSENT, wKing, bKing, score=mobilityScore, f, i, j, max=512;\r
 \r
+  if(tsume) return difEval;\r
+\r
   if(p[WHITE+2].value == LVAL) wLion = p[WHITE+2].pos;\r
   if(p[BLACK+2].value == LVAL) bLion = p[BLACK+2].pos;\r
   if(wLion == ABSENT && p[WHITE+4].value == LVAL) wLion = p[WHITE+4].pos;\r
@@ -1787,8 +1793,15 @@ if(PATH) /*pboard(board),pmap(attacks, BLACK),*/printf("search(%d) {%d,%d} eval=
   // in-check test and TSUME filter\r
   {\r
     k = p[king=royal[stm]].pos;\r
-    if( k == ABSENT) k = p[king + 2].pos;\r
-    else if(p[king + 2].pos != ABSENT) k = ABSENT; // two kings is no king...\r
+    if( k == ABSENT) {\r
+      if((k = p[king + 2].pos) == ABSENT && (!tsume || tsume & stm+1))\r
+        return -INF;   // lose when no King (in tsume only for side to be mated)\r
+    } else if(p[king + 2].pos != ABSENT) {\r
+      if(tsume && tsume & stm+1) {\r
+       retDep = 60; return INF; // we win when not in check\r
+      }\r
+      k = ABSENT; // two kings is no king...\r
+    }\r
     if( k != ABSENT) { // check is possible\r
       if(!attacks[2*k + xstm]) {\r
        if(tsume && tsume & stm+1) {\r
@@ -1810,7 +1823,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(k == ABSENT || attacks[2*k + stm]) return INF; // we have attack on Crown Prince\r
+    if(k == ABSENT ? !tsume : 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
@@ -1905,7 +1918,11 @@ if(PATH) printf("%d:%2d:%2d next victim %d/%d\n",level,depth,iterDep,curMove,msp
              if(to == ABSENT) continue;              // ignore if absent\r
              if(!attacks[2*to + stm]) continue;      // skip if not attacked\r
              group = p[nextVictim].value;            // remember value of this found victim\r
-             if(iterDep <= QSdepth + 1 && 2*group + curEval + 30 < alpha) { resDep = QSdepth + 1; goto cutoff; }\r
+             if(iterDep <= QSdepth + 1 && 2*group + curEval + 30 < alpha) {\r
+               resDep = QSdepth + 1; nextVictim -= 2;\r
+               if(bestScore < 2*group + curEval + 30) bestScore = 2*group + curEval + 30;\r
+               goto cutoff;\r
+             }\r
 if(PATH) printf("%d:%2d:%2d group=%d, to=%c%d\n",level,depth,iterDep,group,to%BW+'a',to/BW+ONE);\r
              GenCapts(to, 0);\r
 if(PATH) printf("%d:%2d:%2d first=%d msp=%d\n",level,depth,iterDep,firstMove,msp);\r
@@ -1946,6 +1963,7 @@ if(PATH) printf("# autofail end (%d-%d)\n", firstMove, msp);
          case 6: // non-captures\r
            nonCapts = msp;\r
            nullMove = GenNonCapts(oldPromo);\r
+           if(msp == nonCapts) goto cutoff;\r
 #ifdef KILLERS\r
            { // swap killers to front\r
              Move h = killer[level][0]; int j = curMove;\r
@@ -2314,6 +2332,7 @@ Convert (char *fen)
         *p++ = table[2* (*fen - 'A' - n)+1] + n;\r
       }\r
     } else *p++ = *fen;\r
+    if(!*fen) break;\r
     fen++;\r
   }\r
   printf("# converted FEN '%s'\n", fenArray);\r
@@ -2334,7 +2353,7 @@ Setup2 (char *fen)
   SetUp(array, currentVariant);\r
   strcpy(startPos, array);\r
   sup0 = sup1 = sup2 = ABSENT;\r
-  hashKeyH = hashKeyL = 87620895*currentVariant;\r
+  hashKeyH = hashKeyL = 87620895*currentVariant + !!fen;\r
   return stm;\r
 }\r
 \r