X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=bb842dacc6d706bdd2593eade971af7c9b16e736;hb=a470951095b2ab90dbe7c256d42546b60d63299f;hp=d02f86a896fcb493ad58a5e1faef2368e767a327;hpb=ac213a6bde534721fbea5d1cb0c8bf377238edce;p=fairymax.git

diff --git a/fairymax.c b/fairymax.c
index d02f86a..bb842da 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -18,7 +18,7 @@
      /*****************************************************************/
 
 #define MULTIPATH
-#define VERSION "4.8O"
+#define VERSION "4.8P"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -68,10 +68,10 @@ int StartKey;
 #endif
 
 /* make unique integer from engine move representation */
-#define PACK_MOVE 256*K + L;
+#define PACK_MOVE 256*K + L + (PromPiece << 16);
 
 /* convert intger argument back to engine move representation */
-#define UNPACK_MOVE(A) K = (A)>>8 & 255; L = (A) & 255;
+#define UNPACK_MOVE(A) K = (A)>>8 & 255; L = (A) & 255; PromPiece = (A)>>16 & 255;
 
 /* Global variables visible to engine. Normally they */
 /* would be replaced by the names under which these  */
@@ -93,7 +93,7 @@ int Resign;
 int Threshold = 800;
 int Score;
 int makruk;
-int prom;
+int prom, pm;
 char piecename[32], piecetype[32], blacktype[32];
 char selectedFairy[80];
 char *inifile = INI_FILE;
@@ -101,7 +101,7 @@ char *inifile = INI_FILE;
 int Ticks, tlim, Setup, SetupQ;
 
 int GameHistory[1024];
-char HistoryBoards[1024][STATE], setupPosition[131];
+char HistoryBoards[1024][STATE], setupPosition[162];
 int GamePtr, HistPtr;
 
 #define W while
@@ -119,7 +119,7 @@ oo[32],                                        /* initial piece setup      */
 of[256],
 od[16];                                        /* 1st dir. in o[] per piece*/
 
-signed char L,pl[17],
+signed char L,pl[32],
 b[513],                                        /* board: 16x8+dummy, + PST */
 T[4104],                                       /* hash translation table   */
 centr[32],
@@ -137,7 +137,7 @@ pboard()
 D(k,q,l,e,E,z,n)        /* recursive minimax search, k=moving side, n=depth*/
 int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
 {                       /* e=score, z=prev.dest; J,Z=hashkeys; return score*/
- int j,r,m,v,d,h,i,F,G,P,V,f=J,g=Z,C,s,flag,FF,*ps=sp;
+ int j,r,m,v,d,h,i,F,G,P,V,f=J,g=Z,C,s,flag,FF,*ps=sp,kk=S;
  signed char t,p,u,x,y,X,Y,H,B;
  struct _*a=A+(J+(k+S)*E&U-1);                 /* lookup pos. in hash table*/
  *sp++=0;
@@ -181,20 +181,22 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
       if(flag&1+!t)                            /* mode (capt/nonc) allowed?*/
       {if(t&&(t&16)==k)break;                  /* capture own              */
        i=w[t&15]+((t&192)>>sh);                /* value of capt. piece t   */
-       if(i<0)m=I,d=98;                        /* K capture                */
+       if(i<0&&(pl[t&31]<2||                   /* K capture, (of last K),  */
+        t>>3&kk!=H&kk!=S||(kk=H,i=-i,0)))m=I,d=98;/* or duple check: cutoff*/
        if(m>=l&d>1)goto C;                     /* abort on fail high       */
        v=d-1?e:i-p;                            /*** MVV/LVA scoring if d=1**/
        if(d-!t>1)                              /*** all captures if d=2  ***/
        {v=centr[p]?b[x+257]-b[y+257]:0;        /* center positional pts.   */
         if(!(G&S))b[FF]=b[G],v+=50;            /* castling: put R & score  */
         b[G]=b[H]=b[x]=0;b[y]=u|32;            /* do move, set non-virgin  */
+        pl[t&31]-=!!t;                         /* updat victim piece count */
         v-=w[p]>0|R<EG?0:20;                   /*** freeze K in mid-game ***/
         if(p<3)                                /* pawns:                   */
         {v-=9*((x-2&M||b[x-2]-u)+              /* structure, undefended    */
                (x+2&M||b[x+2]-u)               /*        squares plus bias */
               +(w[b[x^16]&15]<0))              /*** cling to magnetic K ***/
               +(R-76>>2);                      /* end-game Pawn-push bonus */
-         b[y]+=V=y+r+1&S?647-p:2*(u&y+16&32);  /* upgrade P or convert to Q*/
+         b[y]+=V=y+r+1&S?647-p|pm:2*(u&y+16&32);/*upgrade P or convert to Q*/
          if(V&makruk)b[y]=u|7,V=480;           /* Makruk promotion on 6th  */
          V>>=sh;                               /* for Shatranj promo to F  */
          i+=V;                                 /* promotion / passer bonus */
@@ -227,7 +229,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
          v=m;                                  /* (prevent fail-lows on    */
         }                                      /*   K-capt. replies)       */
         J=f;Z=g;
-        SHAMAX( pl[k]+=!!t; )
+        SHAMAX( pl[k]+=!!t; ) pl[t&31]+=!!t;
         b[G]=b[FF];b[FF]=b[y]=0;b[x]=u;b[H]=t; /* undo move,G can be dummy */
        }                                       /*          if non-castling */
        if(z&S&&Post&K==I&d>2&v>V&v<l){int *p=ps;char X,Y;
@@ -237,7 +239,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
         while(*p){X=*p>>8;Y=*p++;
         printf(" %c%c%c%c",'a'+(X&15),'8'-(X>>4),'a'+(Y&15),'8'-(Y>>4&7));}
         printf("\n");fflush(stdout);
-       }
+       }
        if(v>m)                                 /* new best, update max,best*/
         m=v,X=x,Y=y|S&F;                       /* mark non-double with S   */
        if(h){h=0;goto A;}                      /* redo after doing old best*/
@@ -248,7 +250,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
          ((b[G=r<0?x&~15:BW-1|x&112]^32)<33    /* no virgin R in corner G, */
          ||b[G^1]|b[G^2]|b[FF=y+v-r])          /* no 2 empty sq. next to R */
         )t+=flag&4;                            /* fake capt. for nonsliding*/
-      else F=y;                                /* enable e.p.              */
+      else if(flag&64)t=flag&128?0:t,flag&=63;else F=y; /* enable e.p.     */
       if(s&&flag&8)t=0,flag^=flag>>4&15;       /* hoppers go to next phase */
       if(!(flag&S))                            /* zig-zag piece?           */
        r=v,flag^=flag>>4&15;                   /* alternate vector & mode  */
@@ -364,17 +366,27 @@ InitEngine()
 
 InitGame()
 {
- int i,j;
+ int i,j,k=0;
 
+ Side = WHITE; Q=0; O=S;
+ Fifty = 0; R = 0;
  for(i=0;i<16*BH;i++)b[i]=0;
+ for(i=0;i<32;i++)pl[i]=0;
  K=BW;W(K--)
  {b[K]=oo[K+16]+16;b[K+112]=oo[K];b[K+16]=18;b[K+96]=1; /* initial board setup*/
+  pl[oo[K+16]+16]++;pl[oo[K]]++;pl[18]++;pl[1]++;
+  if(w[oo[K+16]+16] == -1)pl[oo[K+16]+16]=1;
+  if(w[oo[K]] == -1)pl[oo[K]]=1;
   L=8;W(L--)b[16*L+K+257]=(K-BW/2)*(K-BW/2)+(L-3.5)*(L-3.5); /* center-pts table   */
  }                                                   /*(in unused half b[])*/
- Side = WHITE; Q=0; O=S;
- Fifty = 0; R = 0;
- for(i=0; i<BW; i++) if(i!=3) R += (w[oo[i]]/FAC) + (w[oo[i+16]]/FAC);
- UnderProm = -1; pl[WHITE] = pl[BLACK] = 2*BW;
+ for(i=0; i<BW; i++) {
+  R += abs(w[oo[i]])/FAC + abs(w[oo[i+16]])/FAC;
+  Q += abs(w[oo[i]]) - abs(w[oo[i+16]]) + w[1] - w[2];
+  if(w[oo[i]] < 0) k = w[oo[i]];
+ }
+ R -= 2*(-k/FAC);
+ UnderProm = -1; pl[WHITE] = pl[BLACK] = 2*BW; 
+ pm = !pl[BLACK+7] && pl[BLACK+9] && pl[WHITE+7] ? 2 : 0; // Unlike white, black has no 'Q', so promote to 9, which he does have.
 }
 
 void CopyBoard(int s)
@@ -428,7 +440,7 @@ void PrintOptions()
                                          
 int LoadGame(char *name)
 {
-        int i, j, count=0; char c, buf[80];
+        int i, j, ptc, count=0; char c, buf[80], pieceToChar[80];
         static int currentVariant;
         FILE *f;
 
@@ -443,7 +455,7 @@ int LoadGame(char *name)
         if(name != NULL)
         {  /* search for game name in definition file */
            if(!strcmp(name, "fairy")) name = selectedFairy;
-           while(fscanf(f, "Game: %s", buf)!=1 || strcmp(name, buf) ) {
+           while((ptc=fscanf(f, "Game: %s # %s", buf, pieceToChar))==0 || strcmp(name, buf) ) {
                while((c = fgetc(f)) != EOF && c != '\n');
                count++;
                if(c == EOF) {
@@ -481,6 +493,14 @@ int LoadGame(char *name)
         fclose(f);
 	sh = w[7] < 250 ? 3 : 0;
 	makruk = w[7]==181 ? 64 : 0; // w[7] is used as kludge to enable makruk promotions
+        if(name == selectedFairy) {
+            printf(ptc == 1 ? "setup " : "setup (%s) ", pieceToChar); // setup board in GUI
+            for(i=0; i<BW; i++) printf("%c", piecename[oo[i+16]]+'`'); printf("/");
+            for(i=0; i<BW; i++) printf("%c", piecename[2]+'`'); printf("/");
+            for(i=2; i<BH-2; i++) printf("%d/", BW);
+            for(i=0; i<BW; i++) printf("%c", piecename[1]+'@'); printf("/");
+            for(i=0; i<BW; i++) printf("%c", piecename[oo[i]]+'@'); printf(" w KQkq - 0 1\n");
+        }
 }
 
 int main(int argc, char **argv)
@@ -735,9 +755,9 @@ int main(int argc, char **argv)
                         InitGame();
 			if(Setup) {
 			    for(i=0; i<128; i++) b[i] = setupPosition[i];
+			    for(i=0; i<32; i++) pl[i] = setupPosition[i+130];
 			    Side = setupPosition[128]; Q = SetupQ;
-			    pl[WHITE] = setupPosition[129];
-			    pl[BLACK] = setupPosition[130];
+			    R = setupPosition[129];
 			}
 			for(i=0; i<=U; i++) A[i].D = A[i].K = 0; // clear hash table
                         for(nr=0; nr<GamePtr; nr++) {
@@ -769,6 +789,7 @@ int main(int argc, char **argv)
                                 if(m=='.') break;
                                 if(m=='#') {
                                         for(i=0; i<128; i++) b[i]=0;
+                                        for(i=0; i<32; i++) pl[i]=0;
                                         Q=0; R=0; O=S;
                                         pl[WHITE]=pl[BLACK]=0;
                                         continue;
@@ -794,17 +815,20 @@ int main(int argc, char **argv)
                                             break;
                                         default:
                                             b[m]=p+color+32; // assume non-virgin
-                                            if(w[p]<0) { // Royal piece on original square: virgin
+                                            if(w[p]<0) { // Royal piece on original square: virgin
 					        if(color==BLACK && m<0x10 && p==oo[m+16] ||
-                                                   color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;
-					    } else { Q+=w[p]; R+=w[p]/FAC; }
+                                                   color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;
+                                                Q-=w[p]; // assume value was flipped to indicate royalty
+                                                if(pl[p+color])R-=w[p]/FAC; // capturable King, add to material
+					    } else { Q+=w[p]; R+=w[p]/FAC; }
                                             if((m==0x00 || m==BW-1   ) && color==BLACK && p==oo[m+16] ||
                                                (m==0x70 || m==0x6F+BW) && color==WHITE && p==oo[m-0x70])
                                                 b[m] &= ~32; // corner piece as in original setup: virgin
 					case 0: // undefined piece, ignore
                                             break;
                                         }
-                                        pl[BLACK+WHITE-color]++;
+                                        pl[BLACK+WHITE-color]++;pl[p+color]++;
+                                        if(w[p+color] == -1)pl[p+color]=1; // fake we have one if value = -1, to thwart extinction condition
                                         continue;
                                 }
                         }
@@ -812,16 +836,17 @@ int main(int argc, char **argv)
 			GamePtr = HistPtr = 0; Setup = 1; SetupQ = Q; // start anew
 			for(i=0; i<128; i++) setupPosition[i] = b[i]; // remember position
 			setupPosition[128] = Side;
-			setupPosition[129] = pl[WHITE];
-			setupPosition[130] = pl[BLACK];
+			setupPosition[129] = R;
+			for(i=0; i<32; i++) setupPosition[i+130] = pl[i];
+			Computer = EMPTY; // after edit: force mode!
 			continue;
 		}
                 /* command not recognized, assume input move */
                 m = line[0]<'a' | line[0]>='a'+BW | line[1]<'1' | line[1]>='1'+BH |
                     line[2]<'a' | line[2]>='a'+BW | line[3]<'1' | line[3]>='1'+BH;
-                if(line[4] == '\n') line[4] = piecename[7];
-                PromPiece = 7 - (Side == WHITE ? piecetype : blacktype)[line[4]&31];
-		    if(PromPiece == 7) PromPiece = 0;
+                if(line[4] == '\n') line[4] = 0;
+                PromPiece = (Side == WHITE ? piecetype : blacktype)[line[4]&31];
+                if(PromPiece) PromPiece = (Side == WHITE ? 7 : 7+pm) - PromPiece;
                 {char *c=line; K=c[0]-16*c[1]+799;L=c[2]-16*c[3]+799; }
                 if (m)
                         /* doesn't have move syntax */