X-Git-Url: http://winboard.nl/cgi-bin?p=fairymax.git;a=blobdiff_plain;f=fairymax.c;h=2046aaa34e153c0304862545efa52534b90d5d0d;hp=3ec024fa2d232eb4b96bad67abb82eb62529c648;hb=53922e6c4e1aec25ccd20e4e46483846c93fd775;hpb=bd5a6cad6372e0a8406aeddd2033947b72fce082 diff --git a/fairymax.c b/fairymax.c index 3ec024f..2046aaa 100644 --- a/fairymax.c +++ b/fairymax.c @@ -102,9 +102,10 @@ int GameNr; int Resign; char Cambodian[80] = "makruk"; int Threshold = 800; +int drawMoves = 50; int Score; int makruk; -int prom, pm, gating, succession; +int prom, pm, gating, succession, hill; char piecename[32], piecetype[32], blacktype[32]; char selectedFairy[80]; char *inifile = INI_FILE; @@ -170,6 +171,7 @@ int k,q,l,e,E,z,n; /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/ do{u=b[x]; /* scan board looking for */ if(u&&(u&16)==k) /* own piece (inefficient!)*/ {r=p=u&15; /* p = piece type (set r>0) */ + if(hill&&w[p]<0&b[385+x])m=I,d=98; /* King on the hill: we won */ j=od[p]; /* first step vector f.piece*/ W(r=o[++j]) /* loop over directions o[] */ {A: /* resume normal after best */ @@ -198,7 +200,7 @@ int k,q,l,e,E,z,n; /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/ v=d-1?e:i-p; /*** MVV/LVA scoring if d=1**/ if(d-!t>1) /*** all captures if d=2 ***/ {v=gt=0;G: /* retry move with gating */ - v+=centr[p]?b[x+257]-b[y+257]:0; /* center positional pts. */ + v+=centr[p]*(b[x+257]-b[y+257]); /* center positional pts. */ if(G-S)b[FF]=(rk=b[G])|32,v+=50; /* castling: put R & score */ b[G]=b[H]=0;b[x]=gt;b[y]=u|32; /* do move, set non-virgin */ pl[t&31]-=!!t; /* updat victim piece count */ @@ -230,13 +232,14 @@ int k,q,l,e,E,z,n; /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/ } if(z&S&&K-I) /* move pending: check legal*/ {if(v+I&&x==K&y==L>==GT) /* if move found */ - {Q=-e-i;O=F;LL=L;prom=gt; + {Q=-e-i;O=F;LL=L;prom=gt&15; if(b[y]-u&15)prom=b[y]-=PromPiece, /* (under-)promotion: */ Q-=abs(w[prom&=15])-w[p]-(6*S>>sh), /* correct piece & score & */ Z+=PromPiece; /* invalidate hash */ a->D=99;a->V=0; /* lock game in hash as draw*/ R-=i/FAC; /*** total captd material ***/ Fifty = t|p<3?0:Fifty+1; + if(centr[p]==5)b[257+y]-=5; sp=ps; return l;} /* & not in check, signal */ v=m; /* (prevent fail-lows on */ @@ -265,15 +268,15 @@ int k,q,l,e,E,z,n; /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/ J=f;Z=g; if(h){h=0;goto A;} /* redo after doing old best*/ } - s=t;v=r^flag>>12; /* calc. alternated vector */ + s=t&&2&~rg|~t&16^k;v=r^flag>>12; /* platform & toggled vector*/ if(flag&15^4|u&32|| /* no double or moved before*/ p>2&!(flag&S)&& /* no P & no virgin jump, */ ((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 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(--rg<0&!(flag&S)) /* zig-zag piece? (w. delay)*/ + if(s&&flag&8&&!(y=rg&1?y-r:y,t=0) /* hoppers go to next phase */ + ||!(flag&S)&&!rg--) /* zig-zag piece? (w. delay)*/ r=v,flag^=flag>>4&15; /* alternate vector & mode */ }W(!t); /* if not capt. continue ray*/ }} @@ -342,9 +345,6 @@ int PrintResult(int s) } differs: ; } - - - K=I; cnt = D(s,-I,I,Q,O,LL|4*S,3); #ifdef SHATRANJ @@ -376,7 +376,7 @@ int PrintResult(int s) } return 3; } - if(Fifty >=100) { + if(Fifty >= 2*drawMoves) { printf("1/2-1/2 {Draw by fifty move rule}\n"); return 4; } @@ -403,8 +403,9 @@ void InitGame() 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 */ + 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 */ } /*(in unused half b[])*/ + 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 */ for(i=0; i12 || BH!=8) { printf("telluser unsupported board size %dx%d\n",BW,BH); exit(0); } - makruk = 0; if(fscanf(f, "=%d", &i)) makruk=64; // new method to indicate deviant zone depth (for now assumes 3) + makruk = 0; if(fscanf(f, "=%d", &i)) makruk=67-i; // new method to indicate deviant zone depth (for now assumes 3) for(i=0; i15 || j>255) break; } - fclose(f); - sh = w[7] < 250 ? 3 : 0; + sh = w[7] < 250 ? 3 : 0; hill = (w[3] == -2); if(ptc > 1) { // setup board in GUI, by sending it pieceToCharTable and FEN if(ptc == 2) printf("setup (%s) ", pieceToChar); else printf("setup (%s) %dx%d+0_%s ", pieceToChar, BW, BH, parent); @@ -534,8 +535,11 @@ void LoadGame(char *name) for(i=2+!!makruk; iTimeLeft/15) tlim = TimeLeft/15; PromPiece = 0; /* Always promote to Queen ourselves */ + for(N=K=0;K>8<2)centr[4]=5;if(!(N&S-2))centr[3]=5;Z+=R>4;R=4;} +printf("# %d+%d pieces, centr = (%d,%d)\n", N&63, N>>7, centr[3], centr[4]); N=0;K=I; + if(hill) centr[3] = R>20 ? 1 : 22-R; if (D(Side,-I,I,Q,O,LL|S,3)==I) { Side ^= BLACK^WHITE; m = GetTickCount() - Ticks; printf("# times @ %u: real=%d cpu=%1.0f\n", m + Ticks, m, (CPUtime() - cpuT)/CLOCKS_PER_SEC); +printf("# promo = %d (%c) GT = %d\n", prom, prom + '`', GT); printf("move "); printf("%c%c%c%c",'a'+(K&15),'0'+BH-(K>>4), 'a'+(L&15),'0'+BH-(L>>4)); @@ -753,6 +762,7 @@ int main(int argc, char **argv) if(sscanf(line+7, "MultiVariation Margin=%d", &margin) == 1) continue; if(sscanf(line+7, "Variant fairy selects=%s", selectedFairy+6) == 1) continue; if(sscanf(line+7, "Makruk rules=%s", Cambodian) == 1) continue; + if(sscanf(line+7, "Claim draw after=%d", &drawMoves) == 1) continue; continue; } if (!strcmp(command, "go")) {