/*****************************************************************/\r
\r
#define MULTIPATH\r
-#define VERSION "4.8S"\r
+#define VERSION "4.8T"\r
\r
#include <stdio.h>\r
#include <stdlib.h>\r
int Fifty;\r
int GameNr;\r
int Resign;\r
-int Cambodian;\r
+char Cambodian[80] = "makruk";\r
int Threshold = 800;\r
+int drawMoves = 50;\r
int Score;\r
int makruk;\r
-int prom, pm, gating, succession;\r
+int prom, pm, gating, succession, hill;\r
char piecename[32], piecetype[32], blacktype[32];\r
char selectedFairy[80];\r
char *inifile = INI_FILE;\r
do{u=b[x]; /* scan board looking for */\r
if(u&&(u&16)==k) /* own piece (inefficient!)*/\r
{r=p=u&15; /* p = piece type (set r>0) */\r
+ if(hill&&w[p]<0&b[385+x])m=I,d=98; /* King on the hill: we won */\r
j=od[p]; /* first step vector f.piece*/\r
W(r=o[++j]) /* loop over directions o[] */\r
{A: /* resume normal after best */\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=gt=0;G: /* retry move with gating */\r
- v+=centr[p]?b[x+257]-b[y+257]:0; /* center positional pts. */\r
+ v+=centr[p]*(b[x+257]-b[y+257]); /* center positional pts. */\r
if(G-S)b[FF]=(rk=b[G])|32,v+=50; /* castling: put R & score */\r
b[G]=b[H]=0;b[x]=gt;b[y]=u|32; /* do move, set non-virgin */\r
pl[t&31]-=!!t; /* updat victim piece count */\r
}\r
if(z&S&&K-I) /* move pending: check legal*/\r
{if(v+I&&x==K&y==L>==GT) /* if move found */\r
- {Q=-e-i;O=F;LL=L;prom=gt;\r
+ {Q=-e-i;O=F;LL=L;prom=gt&15;\r
if(b[y]-u&15)prom=b[y]-=PromPiece, /* (under-)promotion: */\r
Q-=abs(w[prom&=15])-w[p]-(6*S>>sh), /* correct piece & score & */\r
Z+=PromPiece; /* invalidate hash */\r
a->D=99;a->V=0; /* lock game in hash as draw*/\r
R-=i/FAC; /*** total captd material ***/\r
Fifty = t|p<3?0:Fifty+1;\r
+ if(centr[p]==5)b[257+y]-=5;\r
sp=ps;\r
return l;} /* & not in check, signal */\r
v=m; /* (prevent fail-lows on */\r
J=f;Z=g;\r
if(h){h=0;goto A;} /* redo after doing old best*/\r
}\r
- s=t;v=r^flag>>12; /* calc. alternated vector */\r
+ s=t&&2&~rg|~t&16^k;v=r^flag>>12; /* platform & toggled vector*/\r
if(flag&15^4|u&32|| /* no double or moved before*/\r
p>2&!(flag&S)&& /* no P & no virgin jump, */\r
((b[G=r<0?x&~15:BW-1|x&112]^32)<33 /* no virgin R in corner G, */\r
||b[G^1]|b[G^2]|b[FF=y+v-r]) /* no 2 empty sq. next to R */\r
)t+=flag&4; /* fake capt. for nonsliding*/\r
else if(flag&64)t=flag&128?0:t,flag&=63;else F=y; /* enable e.p. */\r
- if(s&&flag&8)t=0,flag^=flag>>4&15; /* hoppers go to next phase */\r
- if(--rg<0&!(flag&S)) /* zig-zag piece? (w. delay)*/\r
+ if(s&&flag&8&&!(y=rg&1?y-r:y,t=0) /* hoppers go to next phase */\r
+ ||!(flag&S)&&!rg--) /* zig-zag piece? (w. delay)*/\r
r=v,flag^=flag>>4&15; /* alternate vector & mode */\r
}W(!t); /* if not capt. continue ray*/\r
}}\r
}\r
return 3;\r
}\r
- if(Fifty >=100) {\r
+ if(Fifty >= 2*drawMoves) {\r
printf("1/2-1/2 {Draw by fifty move rule}\n");\r
return 4;\r
}\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
+ L=8;W(L--)b[16*L+K+257]=(K-BW/2+hill/2.)*(K-BW/2+hill/2.)+(L-3.5)*(L-3.5); /* center-pts table */\r
} /*(in unused half b[])*/\r
+ b[385+16*3+BW/2]=b[385+16*4+BW/2]=b[385+16*3+BW/2-1]=b[385+16*4+BW/2-1]=1; /* hill */\r
for(i=0; i<BW; i++) {\r
R += abs(w[oo[i]])/FAC + abs(w[oo[i+16]])/FAC;\r
Q += abs(w[oo[i]]) - abs(w[oo[i+16]]) + w[1] - w[2];\r
while((c = fgetc(f)) != EOF && c != '\n');\r
if(c == EOF) break;\r
total++;\r
- if(combo == (strstr(buf, "fairy/") != buf)) continue;\r
+ if(*buf < 'a' || combo == (strstr(buf, "fairy/") != buf)) continue;\r
if(combo && count == 0) strcpy(selectedFairy, buf);\r
if(count++) printf(combo ? " /// " : ",");\r
printf("%s", combo ? buf+6 : buf);\r
printf("feature option=\"Ini File -file %s\"\n", inifile);\r
printf("feature option=\"Multi-PV Margin -spin %d 0 1000\"\n", margin);\r
printf("feature option=\"Variant fairy selects -combo "); PrintVariants(1); printf("\"\n");\r
- printf("feature option=\"Cambodian Makruk rules -check %d\"\n", Cambodian);\r
+ printf("feature option=\"Makruk rules -combo makruk /// Cambodian /// Ai-wok\"\n");\r
+ printf("feature option=\"Claim draw after -spin %d 0 200\"\n", drawMoves);\r
printf("feature option=\"Dummy Slider Example -slider 20 0 100\"\n");\r
printf("feature option=\"Dummy String Example -string happy birthday!\"\n");\r
printf("feature option=\"Dummy Path Example -path .\"\n");\r
\r
void LoadGame(char *name)\r
{\r
- int i, j, ptc, count=0; char c, buf[80], pieceToChar[80];\r
+ int i, j, ptc=0, count=0; char c, buf[80], pieceToChar[80], parent[80];\r
static int currentVariant;\r
FILE *f;\r
\r
gating = succession = 0;\r
if(name != NULL)\r
{ /* search for game name in definition file */\r
- if(!strcmp(name, "makruk") && Cambodian) name = "cambodian"; else\r
+ if(!strcmp(name, "makruk")) name = Cambodian; else\r
if(!strcmp(name, "fairy")) name = selectedFairy;\r
gating = !strcmp(name, "seirawan");\r
- while((ptc=fscanf(f, "Game: %s # %s", buf, pieceToChar))==0 || strcmp(name, buf) ) {\r
+ while((ptc=fscanf(f, "Game: %s # %s # %s", buf, pieceToChar, parent))==0 || strcmp(name, buf) ) {\r
while((c = fgetc(f)) != EOF && c != '\n');\r
count++;\r
if(c == EOF) {\r
/* We have found variant, or if none specified, are at beginning of file */\r
if(fscanf(f, "%dx%d", &BW, &BH)!=2 || BW>12 || BH!=8)\r
{ printf("telluser unsupported board size %dx%d\n",BW,BH); exit(0); }\r
+ makruk = 0; if(fscanf(f, "=%d", &i)) makruk=67-i; // new method to indicate deviant zone depth (for now assumes 3)\r
\r
for(i=0; i<BW; i++) fscanf(f, "%d", oo+i);\r
for(i=0; i<BW; i++) fscanf(f, "%d", oo+i+16);\r
c=0; if(i>15 || j>255) break;\r
}\r
\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
+ sh = w[7] < 250 ? 3 : 0; hill = (w[3] == -2);\r
+ if(ptc > 1) { // setup board in GUI, by sending it pieceToCharTable and FEN\r
+ if(ptc == 2) printf("setup (%s) ", pieceToChar);\r
+ else printf("setup (%s) %dx%d+0_%s ", pieceToChar, BW, BH, parent);\r
for(i=0; i<BW; i++) printf("%c", piecename[oo[i+16]]+'`'); printf("/");\r
+ if(makruk) printf("8/");\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=2+!!makruk; i<BH-2-!!makruk; 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
+ if(makruk) printf("8/");\r
+ for(i=0; i<BW; i++) printf("%c", oo[i] ? piecename[oo[i]]+'@' : '1'); printf(" w KQkq - 0 1\n");\r
}\r
+ while(fscanf(f, " # %[^\n]", pieceToChar)) printf("piece %s\n", pieceToChar);\r
+ fclose(f);\r
+ if(makruk != 64) makruk = 0; // 66 was kludge to interpret "=1" suffix in asean for setting up 3rd-rank Pawns\r
}\r
\r
int main(int argc, char **argv)\r
tlim = (0.6-0.06*(BW-8))*(TimeLeft+(m-1)*TimeInc)/(m+7);\r
if(tlim>TimeLeft/15) tlim = TimeLeft/15;\r
PromPiece = 0; /* Always promote to Queen ourselves */\r
+ for(N=K=0;K<S;K++)N+=b[K]?b[K]&16?S:1:0; /* count pieces for detecting bare King */\r
+ if(w[3]<0&w[4]<0){if(N>>8<2)centr[4]=5;if(!(N&S-2))centr[3]=5;Z+=R>4;R=4;}\r
+printf("# %d+%d pieces, centr = (%d,%d)\n", N&63, N>>7, centr[3], centr[4]);\r
N=0;K=I;\r
+ if(hill) centr[3] = R>20 ? 1 : 22-R;\r
if (D(Side,-I,I,Q,O,LL|S,3)==I) {\r
Side ^= BLACK^WHITE;\r
m = GetTickCount() - Ticks;\r
printf("# times @ %u: real=%d cpu=%1.0f\n", m + Ticks, m,\r
(CPUtime() - cpuT)/CLOCKS_PER_SEC);\r
+printf("# promo = %d (%c) GT = %d\n", prom, prom + '`', GT); \r
printf("move ");\r
printf("%c%c%c%c",'a'+(K&15),'0'+BH-(K>>4),\r
'a'+(L&15),'0'+BH-(L>>4));\r
if(sscanf(line+7, "Clear Hash%c", &c) == 1) for(i=0; i<=U; i++) A->K = 0;\r
if(sscanf(line+7, "MultiVariation Margin=%d", &margin) == 1) continue;\r
if(sscanf(line+7, "Variant fairy selects=%s", selectedFairy+6) == 1) continue;\r
- if(sscanf(line+7, "Cambodian Makruk rules=%d", &Cambodian) == 1) continue;\r
+ if(sscanf(line+7, "Makruk rules=%s", Cambodian) == 1) continue;\r
+ if(sscanf(line+7, "Claim draw after=%d", &drawMoves) == 1) continue;\r
continue;\r
}\r
if (!strcmp(command, "go")) {\r
CopyBoard(HistPtr=HistPtr+1&1023);\r
if(PrintResult(Side)) Computer = EMPTY;\r
}\r
+\r
}\r
}\r
+ return 0;\r
}\r
projects / fairymax.git / blobdiff