/*****************************************************************/\r
\r
#define MULTIPATH\r
-#define VERSION "4.8O"\r
+#define VERSION "4.8P"\r
\r
#include <stdio.h>\r
#include <stdlib.h>\r
int Threshold = 800;\r
int Score;\r
int makruk;\r
-int prom;\r
+int prom, pm;\r
char piecename[32], piecetype[32], blacktype[32];\r
char selectedFairy[80];\r
char *inifile = INI_FILE;\r
int Ticks, tlim, Setup, SetupQ;\r
\r
int GameHistory[1024];\r
-char HistoryBoards[1024][STATE], setupPosition[131];\r
+char HistoryBoards[1024][STATE], setupPosition[162];\r
int GamePtr, HistPtr;\r
\r
#define W while\r
of[256],\r
od[16]; /* 1st dir. in o[] per piece*/\r
\r
-signed char L,pl[17],\r
+signed char L,pl[32],\r
b[513], /* board: 16x8+dummy, + PST */\r
T[4104], /* hash translation table */\r
centr[32],\r
D(k,q,l,e,E,z,n) /* recursive minimax search, k=moving side, n=depth*/\r
int k,q,l,e,E,z,n; /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/\r
{ /* e=score, z=prev.dest; J,Z=hashkeys; return score*/\r
- int j,r,m,v,d,h,i,F,G,P,V,f=J,g=Z,C,s,flag,FF,*ps=sp;\r
+ int j,r,m,v,d,h,i,F,G,P,V,f=J,g=Z,C,s,flag,FF,*ps=sp,kk=S;\r
signed char t,p,u,x,y,X,Y,H,B;\r
struct _*a=A+(J+(k+S)*E&U-1); /* lookup pos. in hash table*/\r
*sp++=0;\r
if(flag&1+!t) /* mode (capt/nonc) allowed?*/\r
{if(t&&(t&16)==k)break; /* capture own */\r
i=w[t&15]+((t&192)>>sh); /* value of capt. piece t */\r
- if(i<0)m=I,d=98; /* K capture */\r
+ if(i<0&&(pl[t&31]<2|| /* K capture, (of last K), */\r
+ t>>3&kk!=H&kk!=S||(kk=H,i=-i,0)))m=I,d=98;/* or duple check: cutoff*/\r
if(m>=l&d>1)goto C; /* abort on fail high */\r
v=d-1?e:i-p; /*** MVV/LVA scoring if d=1**/\r
if(d-!t>1) /*** all captures if d=2 ***/\r
{v=centr[p]?b[x+257]-b[y+257]:0; /* center positional pts. */\r
if(!(G&S))b[FF]=b[G],v+=50; /* castling: put R & score */\r
b[G]=b[H]=b[x]=0;b[y]=u|32; /* do move, set non-virgin */\r
+ pl[t&31]-=!!t; /* updat victim piece count */\r
v-=w[p]>0|R<EG?0:20; /*** freeze K in mid-game ***/\r
if(p<3) /* pawns: */\r
{v-=9*((x-2&M||b[x-2]-u)+ /* structure, undefended */\r
(x+2&M||b[x+2]-u) /* squares plus bias */\r
+(w[b[x^16]&15]<0)) /*** cling to magnetic K ***/\r
+(R-76>>2); /* end-game Pawn-push bonus */\r
- b[y]+=V=y+r+1&S?647-p:2*(u&y+16&32); /* upgrade P or convert to Q*/\r
+ b[y]+=V=y+r+1&S?647-p|pm:2*(u&y+16&32);/*upgrade P or convert to Q*/\r
if(V&makruk)b[y]=u|7,V=480; /* Makruk promotion on 6th */\r
V>>=sh; /* for Shatranj promo to F */\r
i+=V; /* promotion / passer bonus */\r
v=m; /* (prevent fail-lows on */\r
} /* K-capt. replies) */\r
J=f;Z=g;\r
- SHAMAX( pl[k]+=!!t; )\r
+ SHAMAX( pl[k]+=!!t; ) pl[t&31]+=!!t;\r
b[G]=b[FF];b[FF]=b[y]=0;b[x]=u;b[H]=t; /* undo move,G can be dummy */\r
} /* if non-castling */\r
if(z&S&&Post&K==I&d>2&v>V&v<l){int *p=ps;char X,Y;\r
while(*p){X=*p>>8;Y=*p++;\r
printf(" %c%c%c%c",'a'+(X&15),'8'-(X>>4),'a'+(Y&15),'8'-(Y>>4&7));}\r
printf("\n");fflush(stdout);\r
- }
+ }\r
if(v>m) /* new best, update max,best*/\r
m=v,X=x,Y=y|S&F; /* mark non-double with S */\r
if(h){h=0;goto A;} /* redo after doing old best*/\r
int i,j;\r
\r
for(i=0;i<16*BH;i++)b[i]=0;\r
+ for(i=0;i<32;i++)pl[i]=0;\r
K=BW;W(K--)\r
{b[K]=oo[K+16]+16;b[K+112]=oo[K];b[K+16]=18;b[K+96]=1; /* initial board setup*/\r
+ pl[oo[K+16]+16]++;pl[oo[K]]++;pl[18]++;pl[1]++;\r
+ if(w[oo[K+16]+16] == -1)pl[oo[K+16]+16]=1;\r
+ if(w[oo[K]] == -1)pl[oo[K]]=1;\r
L=8;W(L--)b[16*L+K+257]=(K-BW/2)*(K-BW/2)+(L-3.5)*(L-3.5); /* center-pts table */\r
} /*(in unused half b[])*/\r
Side = WHITE; Q=0; O=S;\r
Fifty = 0; R = 0;\r
for(i=0; i<BW; i++) if(i!=3) R += (w[oo[i]]/FAC) + (w[oo[i+16]]/FAC);\r
UnderProm = -1; pl[WHITE] = pl[BLACK] = 2*BW;\r
+ 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.\r
}\r
\r
void CopyBoard(int s)\r
\r
int LoadGame(char *name)\r
{\r
- int i, j, count=0; char c, buf[80];\r
+ int i, j, ptc, count=0; char c, buf[80], pieceToChar[80];\r
static int currentVariant;\r
FILE *f;\r
\r
if(name != NULL)\r
{ /* search for game name in definition file */\r
if(!strcmp(name, "fairy")) name = selectedFairy;\r
- while(fscanf(f, "Game: %s", buf)!=1 || strcmp(name, buf) ) {\r
+ while((ptc=fscanf(f, "Game: %s # %s", buf, pieceToChar))==0 || strcmp(name, buf) ) {\r
while((c = fgetc(f)) != EOF && c != '\n');\r
count++;\r
if(c == EOF) {\r
fclose(f);\r
sh = w[7] < 250 ? 3 : 0;\r
makruk = w[7]==181 ? 64 : 0; // w[7] is used as kludge to enable makruk promotions\r
+ if(name == selectedFairy) {\r
+ printf(ptc == 1 ? "setup " : "setup (%s) ", pieceToChar); // setup board in GUI\r
+ for(i=0; i<BW; i++) printf("%c", piecename[oo[i+16]]+'`'); printf("/");\r
+ for(i=0; i<BW; i++) printf("%c", piecename[2]+'`'); printf("/");\r
+ for(i=2; i<BH-2; i++) printf("%d/", BW);\r
+ for(i=0; i<BW; i++) printf("%c", piecename[1]+'@'); printf("/");\r
+ for(i=0; i<BW; i++) printf("%c", piecename[oo[i]]+'@'); printf(" w KQkq - 0 1\n");\r
+ }\r
}\r
\r
int main(int argc, char **argv)\r
InitGame();\r
if(Setup) {\r
for(i=0; i<128; i++) b[i] = setupPosition[i];\r
+ for(i=0; i<32; i++) pl[i] = setupPosition[i+130];\r
Side = setupPosition[128]; Q = SetupQ;\r
- pl[WHITE] = setupPosition[129];\r
- pl[BLACK] = setupPosition[130];\r
+ R = setupPosition[129];\r
}\r
for(i=0; i<=U; i++) A[i].D = A[i].K = 0; // clear hash table\r
for(nr=0; nr<GamePtr; nr++) {\r
if(m=='.') break;\r
if(m=='#') {\r
for(i=0; i<128; i++) b[i]=0;\r
+ for(i=0; i<32; i++) pl[i]=0;\r
Q=0; R=0; O=S;\r
pl[WHITE]=pl[BLACK]=0;\r
continue;\r
break;\r
default:\r
b[m]=p+color+32; // assume non-virgin\r
- if(w[p]<0) { // Royal piece on original square: virgin
+ if(w[p]<0) { // Royal piece on original square: virgin\r
if(color==BLACK && m<0x10 && p==oo[m+16] ||\r
- 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;\r
+ Q-=w[p]; // assume value was flipped to indicate royalty\r
+ if(pl[p+color])R-=w[p]/FAC; // capturable King, add to material\r
+ } else { Q+=w[p]; R+=w[p]/FAC; }\r
if((m==0x00 || m==BW-1 ) && color==BLACK && p==oo[m+16] ||\r
(m==0x70 || m==0x6F+BW) && color==WHITE && p==oo[m-0x70])\r
b[m] &= ~32; // corner piece as in original setup: virgin\r
case 0: // undefined piece, ignore\r
break;\r
}\r
- pl[BLACK+WHITE-color]++;\r
+ pl[BLACK+WHITE-color]++;pl[p+color]++;\r
+ if(w[p+color] == -1)pl[p+color]=1; // fake we have one if value = -1, to thwart extinction condition\r
continue;\r
}\r
}\r
GamePtr = HistPtr = 0; Setup = 1; SetupQ = Q; // start anew\r
for(i=0; i<128; i++) setupPosition[i] = b[i]; // remember position\r
setupPosition[128] = Side;\r
- setupPosition[129] = pl[WHITE];\r
- setupPosition[130] = pl[BLACK];\r
+ setupPosition[129] = R;\r
+ for(i=0; i<32; i++) setupPosition[i+130] = pl[i];\r
continue;\r
}\r
/* command not recognized, assume input move */\r
m = line[0]<'a' | line[0]>='a'+BW | line[1]<'1' | line[1]>='1'+BH |\r
line[2]<'a' | line[2]>='a'+BW | line[3]<'1' | line[3]>='1'+BH;\r
- if(line[4] == '\n') line[4] = piecename[7];\r
- PromPiece = 7 - (Side == WHITE ? piecetype : blacktype)[line[4]&31];\r
- if(PromPiece == 7) PromPiece = 0;\r
+ if(line[4] == '\n') line[4] = 0;\r
+ PromPiece = (Side == WHITE ? piecetype : blacktype)[line[4]&31];\r
+ if(PromPiece) PromPiece = (Side == WHITE ? 7 : 7+pm) - PromPiece;\r
{char *c=line; K=c[0]-16*c[1]+799;L=c[2]-16*c[3]+799; }\r
if (m)\r
/* doesn't have move syntax */\r
projects / fairymax.git / blobdiff