X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=2c1639748649b1e88c9e83e2100cddd8d4f8f150;hb=630c98a790ff04b8243020fa5479b252d7baed86;hp=4db818ebca07fad12bfb3bf88009f6b937689d58;hpb=fe7f9a6e90036f2d656a1d3cc4ef197748ef2d75;p=fairymax.git diff --git a/fairymax.c b/fairymax.c index 4db818e..2c16397 100644 --- a/fairymax.c +++ b/fairymax.c @@ -93,13 +93,15 @@ int Resign; int Threshold = 800; int Score; int makruk; +int prom; char piecename[32], piecetype[32], blacktype[32]; +char selectedFairy[80]; 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 @@ -117,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], @@ -135,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; @@ -179,13 +181,14 @@ 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||kk!=H&kk!=S||(kk=H,i=-i,0)))m=I,d=98;/* K capture, duple check */ 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|RD=99;a->V=0; /* lock game in hash as draw*/ R-=i/FAC; /*** total captd material ***/ @@ -225,7 +228,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>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*/ @@ -246,7 +249,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 */ @@ -331,13 +334,6 @@ int PrintResult(int s) printf("1-0 {Bare King}\n"); return 5; } - if(cnt>-I+1 && K==0 && L==0) { - if (s == WHITE) - printf("0-1 {Stalemate}\n"); - else - printf("1-0 {Stalemate}\n"); - return 2; - } #else if(cnt>-I+1 && K==0 && L==0) { printf("1/2-1/2 {Stalemate}\n"); @@ -372,8 +368,10 @@ InitGame() int i,j; 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]++; 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; @@ -393,9 +391,9 @@ void CopyBoard(int s) HistoryBoards[s][BW*i+j] = b[16*i+j]|64*(16*i+j==O); } -void PrintVariants() +void PrintVariants(int combo) { - int i, j, count=0; char c, buf[80]; + int i, j, count=0, total=0; char c, buf[80]; FILE *f; f = fopen(INI_FILE, "r"); @@ -406,11 +404,15 @@ void PrintVariants() while(fscanf(f, "Game: %s", buf) != 1 && c != EOF) while((c = fgetc(f)) != EOF && c != '\n'); if(c == EOF) break; - if(count++) printf(","); - printf("%s", buf); + total++; + if(combo == (strstr(buf, "fairy/") != buf)) continue; + if(combo && count == 0) strcpy(selectedFairy, buf); + if(count++) printf(combo ? " /// " : ","); + printf("%s", combo ? buf+6 : buf); } while(c != EOF); fclose(f); + if(!combo && total != count) printf("%sfairy", count ? "," : ""); } void PrintOptions() @@ -419,9 +421,9 @@ void PrintOptions() printf("feature option=\"Resign Threshold -spin %d 200 1200\"\n", Threshold); printf("feature option=\"Ini File -file %s\"\n", inifile); printf("feature option=\"Multi-PV Margin -spin %d 0 1000\"\n", margin); - printf("feature option=\"Playing Style ;-) -combo Brilliant /// *Brave /// Beautiful\"\n"); + printf("feature option=\"Variant fairy selects -combo "); PrintVariants(1); printf("\"\n"); printf("feature option=\"Dummy Slider Example -slider 20 0 100\"\n"); - printf("feature option=\"Dummy String Example -file happy birthday!\"\n"); + printf("feature option=\"Dummy String Example -string happy birthday!\"\n"); printf("feature option=\"Dummy Path Example -path .\"\n"); printf("feature option=\"Clear Hash -button\"\n"); printf("feature done=1\n"); @@ -443,6 +445,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((c = fgetc(f)) != EOF && c != '\n'); count++; @@ -536,6 +539,7 @@ int main(int argc, char **argv) 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; @@ -574,7 +578,7 @@ int main(int argc, char **argv) printf("feature memory=1\n"); printf("feature setboard=0 ping=1 done=0\n"); printf("feature variants=\""); - PrintVariants(); + PrintVariants(0); printf("\"\n"); PrintOptions(); continue; @@ -623,12 +627,14 @@ int main(int argc, char **argv) } if (!strcmp(command, "white")) { /* set white to move in current position */ + if(Side == BLACK) Q = -Q; Side = WHITE; Computer = BLACK; continue; } if (!strcmp(command, "black")) { /* set blck to move in current position */ + if(Side == WHITE) Q = -Q; Side = BLACK; Computer = WHITE; continue; @@ -696,6 +702,7 @@ int main(int argc, char **argv) } if(sscanf(line+7, "Clear Hash") == 1) for(i=0; iK = 0; if(sscanf(line+7, "MultiVariation Margin=%d", &margin) == 1) continue; + if(sscanf(line+7, "Variant fairy selects=%s", selectedFairy+6) == 1) continue; continue; } if (!strcmp(command, "go")) { @@ -731,9 +738,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; nr0x6F && 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]++; continue; } } @@ -808,8 +818,8 @@ 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]; continue; } /* command not recognized, assume input move */