X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=3b2db59bf5dfe65a72095edf63edbb6a358a6300;hb=6bb0ca7a95818cda8b6a08b8815359203af4d84b;hp=b5086d5fd0d0e1f0cf25bd2d85324a2d71859c9b;hpb=af07349064b580cfaba648a5395a64e6b73d7f9f;p=fairymax.git diff --git a/fairymax.c b/fairymax.c index b5086d5..3b2db59 100644 --- a/fairymax.c +++ b/fairymax.c @@ -18,7 +18,7 @@ /*****************************************************************/ #define MULTIPATH -#define VERSION "4.8N" +#define VERSION "4.8O" #include #include @@ -93,7 +93,9 @@ 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; @@ -184,8 +186,8 @@ 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=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 */ - if(!(G&S))b[FF]=k+6,v+=50; /* castling: put R & score */ v-=w[p]>0|RD=99;a->V=0; /* lock game in hash as draw*/ R-=i/FAC; /*** total captd material ***/ @@ -226,7 +228,7 @@ int k,q,l,e,E,z,n; /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/ } /* K-capt. replies) */ J=f;Z=g; SHAMAX( pl[k]+=!!t; ) - b[G]=k+6;b[FF]=b[y]=0;b[x]=u;b[H]=t; /* undo move,G can be dummy */ + 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*/ + } + 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*/ } - s=t; + s=t;v=r^flag>>12; /* calc. alternated vector */ if(flag&15^4|u&32|| /* no double or moved before*/ p>2&& /* no P & no lateral K move,*/ ((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=r<0?G+3:G-2]) /* no 2 empty sq. next to R */ + ||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^=flag>>12,flag^=flag>>4&15; /* alternate vector & mode */ + r=v,flag^=flag>>4&15; /* alternate vector & mode */ }W(!t); /* if not capt. continue ray*/ }} if((++x&15)>=BW)x=x+16&112; /* next sqr. of board, wrap */ @@ -318,10 +321,24 @@ int PrintResult(int s) } K=I; cnt = D(s,-I,I,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"); + return 4; + } + if(pl[s]<=1 && pl[16-s]>1) { + if (s == BLACK) + printf("0-1 {Bare King}\n"); + else + printf("1-0 {Bare King}\n"); + return 5; + } +#else if(cnt>-I+1 && K==0 && L==0) { printf("1/2-1/2 {Stalemate}\n"); return 2; } +#endif if(cnt==-I+1) { if (s == WHITE) printf("0-1 {Black mates}\n"); @@ -333,19 +350,6 @@ int PrintResult(int s) printf("1/2-1/2 {Draw by fifty move rule}\n"); return 4; } -#ifdef SHATRANJ - if(pl[s]==1 && pl[16-s]==1) { - printf("1/2-1/2 {Insufficient mating material}\n"); - return 4; - } - if(pl[s]<=1 && pl[16-s]>1) { - if (s == BLACK) - printf("0-1 {Bare King}\n"); - else - printf("1-0 {Bare King}\n"); - return 5; - } -#endif return 0; } @@ -384,9 +388,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"); @@ -397,11 +401,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() @@ -410,9 +418,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"); @@ -434,6 +442,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++; @@ -527,6 +536,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; @@ -565,7 +575,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; @@ -614,12 +624,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; @@ -687,6 +699,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")) {