X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=hachu.c;h=ad2904e2c4e239147f738e8975b33b2c57e5d918;hb=fbdf26b9d971d08e990b906d65e27bc463571212;hp=6de0d3961bf1ae0fc8cd8479d77d5b4c12e88f4a;hpb=695036cf734c6a458b1371910eb616cda9f56915;p=hachu.git

diff --git a/hachu.c b/hachu.c
index 6de0d39..ad2904e 100644
--- a/hachu.c
+++ b/hachu.c
@@ -91,12 +91,14 @@ typedef struct {
   char fireMask;
 } UndoInfo;
 
-char *array, *reason;
+char *array, fenArray[4000], *reason;
 int bWidth, bHeight, bsize, zone, currentVariant;
 int stm, xstm, hashKeyH, hashKeyL, framePtr, msp, nonCapts, rootEval, retMSP, retFirst, retDep, pvPtr, level, cnt50, chuFlag=1, tenFlag, mobilityScore;
 int nodes, startTime, tlim1, tlim2, repCnt, comp;
 Move retMove, moveStack[10000], path[100], repStack[300], pv[1000], repeatMove[300];
 
+      int maxDepth;                            // used by search
+
 #define X 36 /* slider              */
 #define R 37 /* jump capture        */
 #define N -1 /* Knight              */
@@ -675,6 +677,8 @@ SetUp(char *array, int var)
   for(i=0; ; i++) {
 //printf("next rank: %s\n", array);
     for(j = BW*i; ; j++) {
+      int pflag=0;
+      if(*array == '+') pflag++, array++;
       c = name[0] = *array++;
       if(!c) goto eos;
       if(c == '.') continue;
@@ -687,9 +691,10 @@ SetUp(char *array, int var)
 	if(name[1]) name[1] += 'A' - 'a';
       } else color = WHITE;
       p1 = LookUp(name, var);
+      if(pflag && p1->promoted) p1 = LookUp(p1->promoted, var); // use promoted piece instead
       n = AddPiece(color, p1);
       p[n].pos = j;
-      if(p1->promoted[0]) {
+      if(p1->promoted[0] && !pflag) {
 	p2 = LookUp(p1->promoted, var);
         m = AddPiece(color, p2);
 	if(m <= n) n += 2;
@@ -1665,7 +1670,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
 	  defer |= PROMOTE;                         // if we started, flag  he cannot do it in reply
 	}
-        if(score == -INF) { moveStack[curMove] = 0; goto abortMove; } // zap illegal moves
+        if(score == -INF) {
+          if(level == 1) repeatMove[repCnt++] = move & 0xFFFFFF | (p[tb.piece].value == 10*LVAL ? 3<<24 : 1 << 24);
+          moveStack[curMove] = 0; // zap illegal moves
+          goto abortMove;
+        }
       }
 #if 1
       score = -Search(-beta, -iterAlpha, -difEval - tb.booty, replyDep, promoSuppress & ~PROMOTE, defer);
@@ -1807,8 +1816,8 @@ pmoves(int start, int end)
     #define INVALID 0
 
     // some parameter of your engine
-    #define MAXMOVES 500  /* maximum game length  */
-    #define MAXPLY   60   /* maximum search depth */
+    #define MAXMOVES 2000 /* maximum game length  */
+    #define MAXPLY   20   /* maximum search depth */
 
     #define OFF 0
     #define ON  1
@@ -1859,13 +1868,55 @@ UnMake2 (MOVE move)
   sup2 = sup1; sup1 = sup0;
 }
 
+char fenNames[] = "RV....DKDEFL..DHGB......SMLNKN..FK....BT..VM..PH...."; // pairs of char
+char fenPromo[] = "WLDHSMSECPB R HFDE....WHFB..LNG ..DKVMFS..FO..FK...."; // pairs of char
+
+char *
+Convert (char *fen)
+{
+  char *p = fenArray, *q, *rows[36], tmp[4000];
+  int n=0;
+  printf("# convert FEN '%s'\n", fen);
+  q = strchr(fen, ' '); if(q) *q = 0; q = fen;
+  do { rows[n++] = q; q = strchr(q, '/'); if(!q) break; *q++ = 0; } while(1);
+  *tmp = 0;
+  while(--n >= 0) { strcat(tmp, rows[n]); if(n) strcat(tmp, "/"); }
+  fen = tmp;
+  printf("# flipped FEN '%s'\n", fen);
+  while(*fen) {
+    if(*fen == ' ') { *p = 0; break; }
+    if(n=atoi(fen)) fen++; // digits read
+    if(n > 9) fen++; // double digit
+    while(n-- > 0) *p++ = '.'; // expand to empty squares
+    if(isalpha(*fen)) {
+      char *table = fenNames;
+      n = *fen > 'Z' ? 'a' - 'A' : 0;
+      if(table[2* (*fen - 'A' - n)] == '.') *p++ = *fen; else {
+        *p++ = ':';
+        *p++ = table[2* (*fen - 'A' - n)] + n;
+        *p++ = table[2* (*fen - 'A' - n)+1] + n;
+      }
+    } else *p++ = *fen;
+    fen++;
+  }
+  printf("# converted FEN '%s'\n", fenArray);
+  return fenArray;
+}
+
 int
 Setup2 (char *fen)
 {
+  int stm = WHITE;
+  if(fen) {
+    char *q = strchr(fen, '\n');
+    if(q) *q = 0;
+    if(q = strchr(fen, ' ')) stm = (q[1] == 'b' ? BLACK : WHITE); // fen contains color field
+    if(strchr(fen, '.') || strchr(fen, ':')) array = fen; else array = Convert(fen);
+  }
   SetUp(array, currentVariant);
   sup0 = sup1 = sup2 = ABSENT;
-  rootEval = cnt50 = hashKeyH = hashKeyL = 0;
-  return WHITE;
+  rootEval = cnt50 = hashKeyH = hashKeyL = moveNr = 0;
+  return stm;
 }
 
 void
@@ -1954,7 +2005,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));
       reason = NULL;
       for(i=0; i<repCnt; i++) {if((repeatMove[i] & 0xFFFFFF) == ret) {
-        reason = "Repeats earlier position";
+        if(repeatMove[i] & 1<<24) reason = (repeatMove[i] & 1<<25 ? "Distant capture of protected Lion" : "Counterstrike against Lion");
+        else reason = "Repeats earlier position";
         break;
       }
  printf("# %d. %08x %08x %s\n", i, repeatMove[i], ret, MoveToText(repeatMove[i], 0));
@@ -2024,9 +2076,10 @@ flag=0;
 int
 SearchBestMove (int stm, int timeLeft, int mps, int timeControl, int inc, int timePerMove, MOVE *move, MOVE *ponderMove)
 {
-  int score, targetTime, movesLeft = 50;
+  int score, targetTime, movesLeft = BW*BH/4 + 20;
   if(mps) movesLeft = mps - (moveNr>>1)%mps;
   targetTime = timeLeft*10 / (movesLeft + 2) + 1000 * inc;
+  if(moveNr < 30) targetTime *= 0.5 + moveNr/60.; // speedup in opening
   if(timePerMove > 0) targetTime = timeLeft * 5;
   startTime = GetTickCount();
   tlim1 = 0.2*targetTime;
@@ -2034,7 +2087,7 @@ SearchBestMove (int stm, int timeLeft, int mps, int timeControl, int inc, int ti
   nodes = 0;
 MapFromScratch(attacks);
   retMove = INVALID; repCnt = 0;
-  score = Search(-INF-1, INF+1, rootEval, 20, sup1, sup2);
+  score = Search(-INF-1, INF+1, rootEval, maxDepth, sup1, sup2);
   *move = retMove;
   *ponderMove = INVALID;
   return score;
@@ -2069,7 +2122,6 @@ printf("# setup done");fflush(stdout);
       int engineSide=NONE;                     // side played by engine
       int timeLeft;                            // timeleft on engine's clock
       int mps, timeControl, inc, timePerMove;  // time-control parameters, to be used by Search
-      int maxDepth;                            // used by search
       MOVE move, ponderMove;
       int i, score;
       char inBuf[8000], command[80];