X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=46b3890cdafdbb0c39b4149e15d7cc401e942ec8;hb=pairomax;hp=2bf32d154120afafc94150f728f328124303aeaa;hpb=bdf3b4a8c86501392e95313ef99b46a2f6c217e5;p=fairymax.git diff --git a/fairymax.c b/fairymax.c index 2bf32d1..46b3890 100644 --- a/fairymax.c +++ b/fairymax.c @@ -18,7 +18,7 @@ /*****************************************************************/ #define MULTIPATH -#define VERSION "4.8O" +#define VERSION "4.8S" #include #include @@ -32,13 +32,24 @@ #ifdef WIN32 # include +# define CPUtime 1000.*clock #else # include +# include +# include int GetTickCount() // with thanks to Tord { struct timeval t; gettimeofday(&t, NULL); return t.tv_sec*1000 + t.tv_usec/1000; } + double CPUtime() + { // get CPU time used by process, converted to 'MILLICLOCKS' + struct tms cpuTimes; + static int cps = 0; + if(!cps) cps = sysconf(_SC_CLK_TCK); + times(&cpuTimes); + return ((double)(cpuTimes.tms_utime + cpuTimes.tms_stime) * CLOCKS_PER_SEC * 1000)/cps; + } #endif int StartKey; @@ -62,16 +73,16 @@ int StartKey; #else # define FAC 128 # define EG 10 -# define NAME "Fairy-Max" +# define NAME "Pair-o-Max" # define SHAMAX(x) # define FMAX(x) x #endif /* make unique integer from engine move representation */ -#define PACK_MOVE 256*K + L; +#define PACK_MOVE 256*K + L + (PromPiece << 16) + (GT<<24); /* 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; GT = (A)>>24 & 255; /* Global variables visible to engine. Normally they */ /* would be replaced by the names under which these */ @@ -87,13 +98,13 @@ int MovesLeft; int MaxDepth; int Post; int Fifty; -int UnderProm; int GameNr; int Resign; +int Cambodian; int Threshold = 800; int Score; int makruk; -int prom; +int prom, pm, gating, succession; char piecename[32], piecetype[32], blacktype[32]; char selectedFairy[80]; char *inifile = INI_FILE; @@ -111,15 +122,15 @@ int GamePtr, HistPtr; int U=(1<<23)-1; struct _ {int K,V;char X,Y,D,F;} *A; /* hash table, 16M+8 entries*/ -int M=136,S=128,I=8e3,Q,O,K,N,j,R,J,Z,LL, /* M=0x88 */ +int M=136,S=128,I=8e3,Q,O,K,N,j,R,J,Z,LL,GT, /* M=0x88 */ BW,BH,sh, -w[16]={0,2,2,-1,7,8,12,23,7,5}, /* relative piece values */ +w[32]={0,2,2,-1,7,8,12,23,7,5}, /* relative piece values */ o[256], oo[32], /* initial piece setup */ of[256], od[16]; /* 1st dir. in o[] per piece*/ -signed char L,pl[32], +signed char L,pl[32],pb[32], b[513], /* board: 16x8+dummy, + PST */ T[4104], /* hash translation table */ centr[32], @@ -128,20 +139,20 @@ n[]=".*XKNBRQEWFMACHG?x+knbrqewfmachg"; /* piece symbols on printout*/ int pv[10000],*sp=pv; // triangular array int margin; -pboard() +void pboard() {int i; i=-1;W(++i<128)printf(" %c",(i&15)==BW&&(i+=15-BW)?10:n[b[i]&31]); } -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.*/ +D(k,q,l,e,ev,E,z,n) /* recursive minimax search, k=moving side, n=depth*/ +int k,q,l,e,ev,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; - 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*/ + int j,r,m,v,d,h,i,F,G,P,V,f=J,g=Z,C,s,flag,FF,*ps=sp,kk=S,re; + signed char t,p,u,x,y,X,Y,H,B,gt; + struct _*a=A+(J+(k+S)*E&U); /* lookup pos. in hash table*/ *sp++=0; - q-=qD;m=a->V;X=a->F;Y=a->Y; /* resume at stored depth */ if(a->K-Z|z&S | /* miss: other pos. or empty*/ !(m<=q|X&8&&m>=l|X&S)) /* or window incompatible */ @@ -152,8 +163,8 @@ int k,q,l,e,E,z,n; /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/ (K=X,L=Y&~S,Score=m,d=3))) /* time's up: go do best */ {x=B=X; /* start scan at prev. best */ h=Y&S; /* request try noncastl. 1st*/ - P=d>2&&l+I?D(16-k,-l,1-l,-e,2*S,2*S,d-3):I; /* search null move */ - m=-P beta unconsidered:static eval */ + P=n>2&d>1&&l+I?D(16-k,-l,1-l,-e,-ev,2*S,2*S,d-3):I; /* search null move */ + m=-P beta unconsidered:static eval */ SHAMAX( if(pl[k]<=1&pl[16-k]>1)m=I-1; ) /* bare king loses */ N++; /* node count (for timing) */ do{u=b[x]; /* scan board looking for */ @@ -176,39 +187,42 @@ int k,q,l,e,E,z,n; /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/ } #endif m=E<16|(E^112)<16&&flag&1&y-E<2&E-y<2?I:m; /* bad castling */ - if(p<3&y==E)H=z&127; /* shift capt.sqr. H if e.p.*/ + if(p<3&y==E&flag)H=z&127; /* shift capt.sqr. H if e.p.*/ t=b[H]; 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**/ + v=d-1?ev: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. */ + {v=gt=0;G: /* retry move with gating */ + 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 */ + b[G]=b[H]=0;b[x]=gt;b[y]=u|32; /* do move, set non-virgin */ + i+=-((pl[t&31]-=!!t)&1)&pb[t&31];/* update piece count, pair bonus */ v-=w[p]>0|R>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 */ } if(z&S && GamePtr<6) v+=(rand()>>10&31)-16; J+=J(0);Z+=J(4)+G-S; - SHAMAX( pl[k]-=!!t; ) /* count pieces per side */ + pl[k]-=!!t; /* count pieces per side */ v+=e+i;V=m>q?m:q; /*** new eval & alpha ****/ + re=v>>Fac(v>>15&16^k); /* Reduce eval if drawish for leading side */ if(z&S)V=m-margin>q?m-margin:q; /* multiPV */ C=d-1-(d>5&p>2&!t&!h); /* nw depth, reduce non-cpt.*/ - C=R0?C:d; /* extend 1 ply if in-check */ do - s=C>2|v>V?-D(16-k,-l,-V,-v,/*** futility, recursive eval. of reply */ - F,y&255,C):v; + s=C>2|re>V?-D(16-k,-l,-V,/*** futility, recursive eval. of reply */ + -v,-re,F,y&255,C):re; W(s>q&++CV&vD=99;a->V=0; /* lock game in hash as draw*/ R-=i/FAC; /*** total captd material ***/ Fifty = t|p<3?0:Fifty+1; @@ -227,25 +242,33 @@ int k,q,l,e,E,z,n; /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/ return l;} /* & not in check, signal */ v=m; /* (prevent fail-lows on */ } /* K-capt. replies) */ - J=f;Z=g; - SHAMAX( pl[k]+=!!t; ) pl[t&31]+=!!t; + 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>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(z&S&&K==I&d>2&v>V&v>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); + }GT=gt; /* In root, remember gated */ + } if(v>m) /* new best, update max,best*/ m=v,X=x,Y=y|S&F; /* mark non-double with S */ + if(gating&&!(u&32)&&p>2&&d-!t>1){ /* virgin non-Pawn: gate */ + pl[(gt|=k+40)-27]++; /* prev. gated back in hand */ + if(m>=l)goto C; /* loop skips cutoff :-( */ + W(++gt>12; /* calc. alternated vector */ if(flag&15^4|u&32|| /* no double or moved before*/ - p>2&& /* no P & no lateral K move,*/ + 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*/ @@ -264,9 +287,33 @@ C:FMAX( m=m+I|P==I?m:(X=Y=0); ) /* if stalemate, draw-score */ } /* encoded in X S,8 bits */ if(z&4*S)K=X,L=Y&~S; sp=ps; - return m+=m0){ /* can sac, <= 1 piece left */ + i=18-k;W(!pl[++i]); /* get lowest piece */ + e=abs(w[i--])*n; /* sac for Pawn (if any) */ + W(h>1)h-=pl[++i],e-=pl[i]*w[i]; /* total value his remaining*/ + if(!h)e+=3*w[i]; /* dual King, correct w[]<0 */ + j&=pb[i]==-1; /* tough defenders left */ + for(i=k+3,h=m;h>1;h-=pl[i++])e+=pl[i]*w[i],/* lead in piece material */ + f|=pl[i]&pb[i]/*,printf("%d,%d,%d=%d,%d ",i,pl[i],pb[i],e,f)*/; /* detect mating minors */ + if(!f&&e<350 /* non-mating minor ahead */ + ||m-1&(pb[--i]>3|j) /* single color-bound or vs tough */ + ||pl[i]==2&pb[i]<-1)r=3-n; /* non-mating pair */ + }}} + return r; +} /* Generic main() for Winboard-compatible engine */ /* (Inspired by TSCP) */ @@ -302,7 +349,7 @@ if(z&4*S)K=X,L=Y&~S; int PrintResult(int s) { - int i, j, k, cnt=0; + int j, k, cnt=0; /* search last 50 states with this stm for third repeat */ for(j=2; j<=100 && j <= HistPtr; j+=2) @@ -321,7 +368,7 @@ int PrintResult(int s) differs: ; } K=I; - cnt = D(s,-I,I,Q,O,LL|4*S,3); + cnt = D(s,-I,I,Q,Q,O,LL|4*S,3); #ifdef SHATRANJ if(pl[s]==1 && pl[16-s]==1) { printf("1/2-1/2 {Insufficient mating material}\n"); @@ -343,8 +390,12 @@ int PrintResult(int s) if(cnt==-I+1) { if (s == WHITE) printf("0-1 {Black mates}\n"); - else + else { + if(succession) { // suppress loss claim if black might be able to replace its King by promotion + for(j=0;j=100) { @@ -355,34 +406,42 @@ int PrintResult(int s) } -InitEngine() +void InitEngine() { - int i, j; - N=32*S+7;W(N-->S+3)T[N]=rand()>>9; srand(GetTickCount()); } -InitGame() +void InitGame() { - int i,j; + int i,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*/ + {b[K]=oo[K+16]+16;b[K+112]=oo[K];b[K+16+16*!!makruk]=18;b[K+96-16*!!makruk]=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>1)*pb[i] -(pl[i+16]>>1)*pb[i]; + if(w[oo[i]] < 0) k = w[oo[i]]; + } + R -= 2*(-k/FAC); + 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. + if(gating) pl[14] = pl[15] = pl[30] = pl[31] = 1, R += 2*(w[9]/FAC + w[10]/FAC); } void CopyBoard(int s) { - int i, j, k, cnt=0; + int i, j; /* copy game representation of engine to HistoryBoard */ /* don't forget castling rights and e.p. state! */ @@ -393,7 +452,7 @@ void CopyBoard(int s) void PrintVariants(int combo) { - int i, j, count=0, total=0; char c, buf[80]; + int count=0, total=0; char c=EOF+1, buf[80]; FILE *f; f = fopen(INI_FILE, "r"); @@ -422,6 +481,7 @@ void PrintOptions() printf("feature option=\"Ini File -file %s\"\n", inifile); printf("feature option=\"Multi-PV Margin -spin %d 0 1000\"\n", margin); printf("feature option=\"Variant fairy selects -combo "); PrintVariants(1); printf("\"\n"); + printf("feature option=\"Cambodian Makruk rules -check %d\"\n", Cambodian); printf("feature option=\"Dummy Slider Example -slider 20 0 100\"\n"); printf("feature option=\"Dummy String Example -string happy birthday!\"\n"); printf("feature option=\"Dummy Path Example -path .\"\n"); @@ -429,24 +489,27 @@ void PrintOptions() printf("feature done=1\n"); } -int LoadGame(char *name) +void LoadGame(char *name) { - int i, j, count=0; char c, buf[80]; + int i, j, ptc, count=0; char c, buf[80], pieceToChar[80], parent[80]; static int currentVariant; FILE *f; f = fopen(inifile, "r"); if(f==NULL) - { printf("telluser piece-desription file '%s' not found\n", inifile); + { printf("telluser piece-description file '%s' not found\n", inifile); exit(0); } if(fscanf(f, "version 4.8(%c)", &c)!=1 || c != 'w') { printf("telluser incompatible fmax.ini file\n"); exit(0); } + gating = succession = 0; if(name != NULL) { /* search for game name in definition file */ + if(!strcmp(name, "makruk") && Cambodian) name = "cambodian"; else if(!strcmp(name, "fairy")) name = selectedFairy; - while(fscanf(f, "Game: %s", buf)!=1 || strcmp(name, buf) ) { + gating = !strcmp(name, "seirawan"); + while((ptc=fscanf(f, "Game: %s # %s %s", buf, pieceToChar, parent))==0 || strcmp(name, buf) ) { while((c = fgetc(f)) != EOF && c != '\n'); count++; if(c == EOF) { @@ -472,9 +535,14 @@ int LoadGame(char *name) while(fscanf(f, "%d,%x", o+j, of+j)==2 || fscanf(f,"%c:%d",&c, w+i+1)==2) { if(c) - { od[++i]=j; centr[i] = c>='a'; + { od[++i]=j; centr[i] = c>='a'; w[i+16] = w[i]; blacktype[c&31]=i; piecename[i]=c&31; if(piecetype[c&31]==0) piecetype[c&31]=i; // only first + pb[i] = pb[i+16] = w[i]>>3 & ~3; // pair bonus, for now 1/8 of piece value, leave low bits for flag + succession |= w[i] < -4; // expendable royalty; assume we can promote to it + } else { + if((o[j]^o[j]+8>>4)&1 || of[j]>>4) pb[i] = pb[i+16] = 0; // not color bound (or too complex to see it), so no pair bonus + if(!o[j]) pb[i] = pb[i+16] = of[j--]; // hand-set pair bonus kludges: 3 for mating minor, negative for non-mating pair. } j++; o[j]=0; /* printf("# c='%c' i=%d od[i]=%d j=%d (%3d,%8x)\n",c?c:' ',i,od[i],j,o[j-1],of[j-1]); /**/ @@ -484,14 +552,23 @@ 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(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); + for(i=0; i1 && sscanf(argv[1], "%d", &m)==1) { U = (1<TimeLeft/15) tlim = TimeLeft/15; PromPiece = 0; /* Always promote to Queen ourselves */ N=0;K=I; - if (D(Side,-I,I,Q,O,LL|S,3)==I) { + if (D(Side,-I,I,Q,Q,O,LL|S,3)==I) { Side ^= BLACK^WHITE; - if(UnderProm>=0 && UnderProm != L) - { printf("tellics I hate under-promotions!\n"); - printf("resign { underpromotion } \n"); - Computer = EMPTY; - continue; - } else UnderProm = -1; + m = GetTickCount() - Ticks; + printf("# times @ %u: real=%d cpu=%1.0f\n", m + Ticks, m, + (CPUtime() - cpuT)/CLOCKS_PER_SEC); printf("move "); printf("%c%c%c%c",'a'+(K&15),'0'+BH-(K>>4), 'a'+(L&15),'0'+BH-(L>>4)); if(prom)printf("%c",piecename[prom&15]+'a'-1); printf("\n"); - m = GetTickCount() - Ticks; /* time-control accounting */ TimeLeft -= m; @@ -567,7 +641,7 @@ int main(int argc, char **argv) continue; } if (!fgets(line, 256, stdin)) - return; + return 1; if (line[0] == '\n') continue; sscanf(line, "%s", command); @@ -576,7 +650,7 @@ int main(int argc, char **argv) if (!strcmp(command, "protover")) { printf("feature myname=\"" NAME " " VERSION "\"\n"); printf("feature memory=1\n"); - printf("feature setboard=0 ping=1 done=0\n"); + printf("feature setboard=0 xedit=1 ping=1 done=0\n"); printf("feature variants=\""); PrintVariants(0); printf("\"\n"); @@ -619,7 +693,7 @@ int main(int argc, char **argv) } if (!strcmp(command, "quit")) /* exit engine */ - return; + return 0; if (!strcmp(command, "force")) { /* computer plays neither */ Computer = EMPTY; @@ -700,9 +774,10 @@ int main(int argc, char **argv) if(sscanf(line+7, "Ini File=%s", filename) == 1) { inifile = filename; continue; } - if(sscanf(line+7, "Clear Hash") == 1) for(i=0; iK = 0; + if(sscanf(line+7, "Clear Hash%c", &c) == 1) for(i=0; i<=U; i++) A[i].K = 0; 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, "Cambodian Makruk rules=%d", &Cambodian) == 1) continue; continue; } if (!strcmp(command, "go")) { @@ -715,7 +790,7 @@ int main(int argc, char **argv) } if (!strcmp(command, "hint")) { Ticks = GetTickCount(); tlim = 1000; - D(Side,-I,I,Q,O,LL|4*S,6); + D(Side,-I,I,Q,Q,O,LL|4*S,6); if (K==0 && L==0) continue; printf("Hint: "); @@ -745,7 +820,7 @@ int main(int argc, char **argv) for(i=0; i<=U; i++) A[i].D = A[i].K = 0; // clear hash table for(nr=0; nr= 'A' && m <= 'Z' && piecetype[m&31] - && line[1] >= 'a' && line[1] <= 'a'+BW-1 + if( m >= 'A' && m <= 'Z' && piecetype[m&31]) { + p = (color == WHITE ? piecetype : blacktype)[line[0]&31]; + if(line[1] == '@') { // stuff holdings + pl[color+p+5] = m = line[2] - '0'; + pl[BLACK+WHITE-color]+=m;pl[p+color]+=m; + Q+=m*w[p]; R+=m*(w[p]/FAC); + continue; + } else + if(line[1] >= 'a' && line[1] <= 'a'+BW-1 && line[2] >= '1' && line[2] <= '0'+BH) { - m = line[1]-16*line[2]+799; - switch(p = (color == WHITE ? piecetype : blacktype)[line[0]&31]) + m = line[1]-16*line[2]+799; r = m & 0x70; + switch(p) { case 1: case 2: if(color==WHITE) - b[m]=(m&0x70)==0x60?1:33, - Q+=w[1]; - else b[m]=(m&0x70)==0x10?18:50, - Q+=w[2]; + b[m]=r==0x10?161:r==0x20?97:r==0x60?1:33, + Q+=w[1]+(r==0x10?S:r==0x20?64:0); + else b[m]=r==0x60?178:r==0x50?114:r==0x10?18:50, + Q+=w[2]+(r==0x60?S:r==0x50?64:0); break; default: b[m]=p+color+32; // assume non-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; } - 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 + if(color==BLACK && m<0x10 && p==oo[m+16] || // but make virgin on original square + color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32; + if(w[p]<0) { // Royal piece on original square: virgin + 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; } case 0: // undefined piece, ignore break; } - pl[BLACK+WHITE-color]++;pl[p+color]++; + pl[BLACK+WHITE-color]++; if(pl[p+color]++&1) Q+=pb[p]; + if(w[p+color] == -1)pl[p+color]=1; // fake we have one if value = -1, to thwart extinction condition continue; + } } } if(Side != color) Q = -Q; @@ -818,26 +901,34 @@ int main(int argc, char **argv) setupPosition[128] = Side; 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; + GT = (Side == WHITE ? piecetype : blacktype)[line[4]&31]; + if(GT) PromPiece = (Side == WHITE ? 7 : 7+pm) - GT, GT |= 32 + Side; {char *c=line; K=c[0]-16*c[1]+799;L=c[2]-16*c[3]+799; } - if (m) + if(w[GT&15] == -1) L = S; // spoil move for promotion to King + if (m & line[1] != '@') /* doesn't have move syntax */ printf("Error (unknown command): %s\n", command); - else if(D(Side,-I,I,Q,O,LL|S,3)!=I) { + else { int i=-1; + if(b[L] && (b[L]&16) == Side && w[b[L]&15] < 0) // capture own King: castling + { i=K; K = L; L = i>L ? i-1 : i+2; } + if((b[K]&15) < 3) GT = 0; // Pawn => true promotion rather than gating + if(D(Side,-I,I,Q,Q,O,LL|S,3)!=I) { /* did have move syntax, but illegal move */ printf("Illegal move:%s\n", line); - } else { /* legal move, perform it */ + } else { /* legal move, perform it */ + if(i >= 0) b[i]=b[K],b[K]=0; // reverse Seirawan gating GameHistory[GamePtr++] = PACK_MOVE; Side ^= BLACK^WHITE; CopyBoard(HistPtr=HistPtr+1&1023); if(PrintResult(Side)) Computer = EMPTY; + } } } }