X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=hachu.c;h=503d06165426f3015d3fe5761ff5d7af984f7153;hb=ffaca03a425220a0ed043bb48ee2a94b86aab60b;hp=0eea758c2942ec64c258a2849546efa1bcc84549;hpb=28f101a78d114364e46e053a84a185895f104750;p=hachu.git

diff --git a/hachu.c b/hachu.c
index 0eea758..503d061 100644
--- a/hachu.c
+++ b/hachu.c
@@ -166,7 +166,7 @@ int retMSP, retFirst, retDep, pvPtr, level, cnt50, mobilityScore;
 int ll, lr, ul, ur; // corner squares
 int nodes, startTime, lastRootMove, lastRootIter, tlim1, tlim2, tlim3, repCnt, comp, abortFlag;
 Move ponderMove;
-Move retMove, moveStack[10000], path[100], repStack[300], pv[1000], repeatMove[300], killer[100][2];
+Move retMove, moveStack[20000], path[100], repStack[300], pv[1000], repeatMove[300], killer[100][2];
 
       int maxDepth;                            // used by search
 
@@ -820,6 +820,7 @@ SetUp(char *array, int var)
   char c, *q, name[3], prince = 0;
   PieceDesc *p1, *p2;
   last[WHITE] = 1; last[BLACK] = 0;
+  royal[WHITE] = royal[BLACK] = 0;
   for(i=0; ; i++) {
 //printf("next rank: %s\n", array);
     for(j = BW*i; ; j++) {
@@ -860,6 +861,9 @@ SetUp(char *array, int var)
     }
   }
  eos:
+  // add dummy Kings if not yet added (needed to set royal[] to valid value!)
+  if(!royal[WHITE]) p[AddPiece(WHITE, LookUp("K", V_CHU))].pos = ABSENT;
+  if(!royal[BLACK]) p[AddPiece(BLACK, LookUp("K", V_CHU))].pos = ABSENT;
   // add dummy Crown Princes if not yet added
   if(!(prince & WHITE+1)) p[AddPiece(WHITE, LookUp("CP", V_CHU))].pos = ABSENT;
   if(!(prince & BLACK+1)) p[AddPiece(BLACK, LookUp("CP", V_CHU))].pos = ABSENT;
@@ -1792,7 +1796,12 @@ if(PATH) /*pboard(board),pmap(attacks, BLACK),*/printf("search(%d) {%d,%d} eval=
     if( k == ABSENT) {
       if((k = p[king + 2].pos) == ABSENT && (!tsume || tsume & stm+1))
         return -INF;   // lose when no King (in tsume only for side to be mated)
-    } else if(p[king + 2].pos != ABSENT) k = ABSENT; // two kings is no king...
+    } else if(p[king + 2].pos != ABSENT) {
+      if(tsume && tsume & stm+1) {
+	retDep = 60; return INF; // we win when not in check
+      }
+      k = ABSENT; // two kings is no king...
+    }
     if( k != ABSENT) { // check is possible
       if(!attacks[2*k + xstm]) {
 	if(tsume && tsume & stm+1) {
@@ -1909,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
 	      if(!attacks[2*to + stm]) continue;      // skip if not attacked
 	      group = p[nextVictim].value;            // remember value of this found victim
-	      if(iterDep <= QSdepth + 1 && 2*group + curEval + 30 < alpha) { resDep = QSdepth + 1; goto cutoff; }
+	      if(iterDep <= QSdepth + 1 && 2*group + curEval + 30 < alpha) {
+		resDep = QSdepth + 1; nextVictim -= 2;
+		if(bestScore < 2*group + curEval + 30) bestScore = 2*group + curEval + 30;
+		goto cutoff;
+	      }
 if(PATH) printf("%d:%2d:%2d group=%d, to=%c%d\n",level,depth,iterDep,group,to%BW+'a',to/BW+ONE);
 	      GenCapts(to, 0);
 if(PATH) printf("%d:%2d:%2d first=%d msp=%d\n",level,depth,iterDep,firstMove,msp);
@@ -1950,6 +1963,7 @@ if(PATH) printf("# autofail end (%d-%d)\n", firstMove, msp);
 	  case 6: // non-captures
 	    nonCapts = msp;
 	    nullMove = GenNonCapts(oldPromo);
+	    if(msp == nonCapts) goto cutoff;
 #ifdef KILLERS
 	    { // swap killers to front
 	      Move h = killer[level][0]; int j = curMove;
@@ -2013,6 +2027,7 @@ if(flag & depth >= 0) printf("%2d:%d found %d/%d %08x %s\n", depth, iterDep, cur
 
 if(flag & depth >= 0) printf("%2d:%d made %d/%d %s\n", depth, iterDep, curMove, msp, MoveToText(moveStack[curMove], 0));
       for(i=2; i<=cnt50; i+=2) if(repStack[level-i+200] == hashKeyH) {
+	retDep = iterDep;
 	if(repDraws) { score = 0; goto repetition; }
 	if(!allowRep) {
 	  moveStack[curMove] = 0;         // erase forbidden move
@@ -2132,7 +2147,7 @@ if(PATH) printf("%d:%2d:%d %3d %6x %-10s %6d %6d  (%d)\n", level, depth, iterDep
 #ifdef HASH
     // hash store
     hashTable[index].lock[hit]  = hashKeyH;
-    hashTable[index].depth[hit] = iterDep;
+    hashTable[index].depth[hit] = resDep;
     hashTable[index].score[hit] = bestScore;
     hashTable[index].flag[hit]  = (bestScore < beta) * H_UPPER;
     if(bestScore > alpha) {
@@ -2224,7 +2239,7 @@ pmoves(int start, int end)
 
     // some parameter of your engine
     #define MAXMOVES 2000 /* maximum game length  */
-    #define MAXPLY   30   /* maximum search depth */
+    #define MAXPLY   60   /* maximum search depth */
 
     #define OFF 0
     #define ON  1