/* of which you should have received a copy together with this file. */\r
/****************************************************************************/\r
\r
-#define VERSION "2.2"\r
+#define VERSION "2.3"\r
\r
#include <stdio.h>\r
#include <stdlib.h>\r
#include <string.h>\r
\r
// Set VARIANTS for in WinBoard variant feature. (With -s option this will always be reset to use "shogi".)\r
-# define VARIANTS "normal,xiangqi"\r
+#define VARIANTS "normal,xiangqi"\r
+#define STDVARS "chess,chess960,crazyhouse,threecheck,giveaway,atomic,seirawan,shogi,xiangqi"\r
\r
#define DPRINT if(debug) printf\r
\r
int pid;\r
\r
#ifdef WIN32\r
+char *strcasestr (char *p, char *q) { char *r = p; while(*r) *r = tolower(*r), r++; return strstr(p, q); }\r
+\r
WinPipe(HANDLE *hRd, HANDLE *hWr)\r
{\r
SECURITY_ATTRIBUTES saAttr;\r
int t = (flob ? inc + myTime/40 : 1000*byo*(byo>0)); // byoyomi time \r
if(sc == 'x') black = 1; else drawOffer = 0;// in UCCI 'black' refers to us and 'white' to opponent\r
if(!x && drawOffer) ponder = " draw", drawOffer = 0; //pass draw offer only when not pondering\r
- fprintf(toE, "\ngo%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t);\r
- DPRINT( "\n# go%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t);\r
+ fprintf(toE, "go%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t);\r
+ DPRINT( "# go%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t);\r
if(sTime > 0) { fprintf(toE, " movetime %d", sTime); DPRINT(" movetime %d", sTime); } else\r
if(mps) { fprintf(toE, " movestogo %d", mps*(nr/(2*mps)+1)-nr/2); DPRINT(" movestogo %d", mps*(nr/(2*mps)+1)-nr/2); }\r
if(flob || byo >= 0) sprintf(suffix, " byoyomi %d", t); // for engines running purely on byoyomi\r
fprintf(toE, "%s moves", pos);\r
DPRINT( "# %s moves", pos);\r
for(j=lastCapt; j<moveNr; j++) { fprintf(toE, " %s", move[j]); DPRINT(" %s", move[j]); }\r
+ fprintf(toE, "\n"); DPRINT("\n");\r
}\r
\r
void\r
}\r
else if(!strcmp(command, "info")) {\r
int d=0, s=0, t=(GetTickCount() - startTime)/10, n=1;\r
- char *pv;\r
+ char *pv, varName[80];\r
if(sscanf(line+5, "string times @ %c", &dummy) == 1) { printf("# %s", line+12); continue; }\r
+ if(sscanf(line+5, "string variant %s", varName) == 1) {\r
+ if(!strstr(STDVARS, varName) && (p = strstr(line+18, " startpos "))) printf("setup (-) 8x8+0_fairy %s", p+10);\r
+ continue;\r
+ }\r
if(collect && (pv = strstr(line+5, "currmove "))) {\r
if(p = strstr(line+5, "currmovenumber ")) {\r
n = atoi(p+15);\r
void\r
GUI2Engine()\r
{\r
- char line[256], command[256], *p, *q, *r, mySide;\r
+ char line[256], command[256], *p, *q, *r, mySide, searching = 0;\r
\r
while(1) {\r
int i, x;\r
\r
- if((computer == stm || computer == ANALYZE) && !suspended) {\r
+ if((computer == stm || computer == ANALYZE && !searching) && !suspended) {\r
DPRINT("# start search\n");\r
LoadPos(moveNr); fflush(stdout); // load position\r
// and set engine thinking (note USI swaps colors!)\r
startTime = GetTickCount(); mySide = stm; // remember side we last played for\r
if(computer == ANALYZE) {\r
- fprintf(toE, "\ngo infinite"); DPRINT("\n# go infinite");\r
+ fprintf(toE, "go infinite"); DPRINT("# go infinite");\r
if(sm & 1) { // some moves are disabled\r
fprintf(toE, " searchmoves"); DPRINT(" searchmoves");\r
for(i=1; i<nr; i++) if(on[i]) { fprintf(toE, " %s", moveMap[i]); DPRINT(" %s", moveMap[i]); }\r
}\r
- fprintf(toE, "\n"); DPRINT("\n");\r
- // code for searchmoves goes here\r
+ fprintf(toE, "\n"); DPRINT("\n"); searching = 1; // suppresses spurious commands during analysis starting new searches\r
} else { pause = 2; StartSearch(""); fflush(stdout); fflush(toE); Sync(PAUSE); } // block input during thinking\r
}\r
nomove:\r
Sync(PAUSE); // block input during thinking\r
goto nomove;\r
}\r
- StopPonder(1);\r
+ StopPonder(1); searching = 0;\r
}\r
strcpy(move[moveNr++], command); // possibly overwrites ponder move\r
}\r
}\r
else if(!strcmp(command, "option")) {\r
char name[80], *p;\r
+ if(searching) StopPonder(1), searching = 0; // force new search if settings change during analysis (multi-PV!)\r
if(sscanf(line+7, "UCI2WB debug output=%d", &debug) == 1) ; else\r
if(sscanf(line+7, "Floating Byoyomi=%d", &flob) == 1) ; else\r
if(sscanf(line+7, "Byoyomi=%d", &byo) == 1) ; else\r
iniPos[strlen(iniPos)-1] = sm = 0; collect = (computer == ANALYZE);\r
}\r
else if(!strcmp(command, "variant")) {\r
- if(varOpt) fprintf(toE, "setoption name UCI_Variant value %sucinewgame\n", strcmp(line+8, "3check\n") ? line+8 : "threecheck\n");\r
+ if(varOpt) {\r
+ fprintf(toE, "setoption name UCI_Variant value %sucinewgame\nisready\n", strcmp(line+8, "3check\n") ? line+8 : "threecheck\n");\r
+ fflush(toE); Sync(PAUSE);\r
+ }\r
if(!strcmp(line+8, "shogi\n")) size = 9, strcpy(iniPos, "position startpos");\r
if(!strcmp(line+8, "5x5+5_shogi\n")) size = 5, strcpy(iniPos, "position startpos");\r
if(!strcmp(line+8, "xiangqi\n")) strcpy(iniPos, "fen rnbakabnr/9/1c5c1/p1p1p1p1p/9/9/P1P1P1P1P/1C5C1/9/RNBAKABNR r");\r
if(!strcmp(line+8, "fischerandom\n")) { frc |= 1; if(frc > 0) fprintf(toE, "setoption name UCI_Chess960 value true\n"); }\r
}\r
else if(!strcmp(command, "undo") && (i=1) || !strcmp(command, "remove") && (i=2)) {\r
- if(pondering || computer == ANALYZE) StopPonder(1);\r
+ if(pondering || computer == ANALYZE) StopPonder(1), searching = 0;\r
moveNr = moveNr > i ? moveNr - i : 0; collect = (computer == ANALYZE); sm = 0;\r
}\r
else if(!strcmp(command, ".")) {\r
inex = 1; line[strlen(line)-1] = sm = 0; // strip LF and clear sm flag\r
for(i=1; i<nr; i++) { if(!strcmp(line+8, moveMap[i]) || all) on[i] = in; sm |= on[i]+1; } // sm: 2 = enabled, 1 = disabled\r
if(!(sm & 2)) goto nomove; // no moves enabled; continue current search\r
- if(computer == ANALYZE) StopPonder(1); // abort old analysis\r
+ if(computer == ANALYZE) StopPonder(1), searching = 0; // abort old analysis\r
}\r
else if(!strcmp(command, "pause")) {\r
if(computer == stm) myTime -= GetTickCount() - startTime;\r
}\r
else if(!strcmp(command, "xboard")) ;\r
else if(!strcmp(command, "analyze"))computer = ANALYZE, collect = 1, sm = 0;\r
- else if(!strcmp(command, "exit")) computer = NONE, StopPonder(1);\r
+ else if(!strcmp(command, "exit")) computer = NONE, StopPonder(1), searching = 0;\r
else if(!strcmp(command, "force")) computer = NONE, StopPonder(pondering);\r
else if(!strcmp(command, "go")) computer = stm;\r
else if(!strcmp(command, "time")) sscanf(line+4, "%d", &myTime), myTime = (10*myTime)/unit;\r
projects / uci2wb.git / blobdiff