X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=UCI2WB.c;h=dffac3b37098030c560d70cdb657431600f2371d;hb=05c7d739a244a923c0f3e90bcb10f3db9f5e670c;hp=145a96c64dbf074f41a0ec4f2dea802879ac06f5;hpb=e10e26b893f28c034d830fdc57487453325306f5;p=uci2wb.git

diff --git a/UCI2WB.c b/UCI2WB.c
index 145a96c..dffac3b 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -9,7 +9,7 @@
 /* of which you should have received a copy together with this file.        */
 /****************************************************************************/
 
-#define VERSION "2.0"
+#define VERSION "2.3"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,7 +30,8 @@
 #include <string.h>
 
 // Set VARIANTS for in WinBoard variant feature. (With -s option this will always be reset to use "shogi".)
-#  define VARIANTS "normal,xiangqi"
+#define VARIANTS "normal,xiangqi"
+#define STDVARS "chess,chess960,crazyhouse,threecheck,giveaway,atomic,seirawan,shogi,xiangqi"
 
 #define DPRINT if(debug) printf
 
@@ -39,10 +40,10 @@
 #define NONE  2
 #define ANALYZE 3
 
-char move[2000][10], checkOptions[8192], iniPos[256], hashOpt[20], pause, pondering, suspended, ponder, post, hasHash, c, sc='c', *suffix, *variants;
-int mps, tc, inc, sTime, depth, myTime, hisTime, stm, computer = NONE, memory, oldMem=0, cores, moveNr, lastDepth, lastScore, startTime, debug;
-int statDepth, statScore, statNodes, statTime, currNr, size, collect, nr, sm, inex, on[500], frc;
-char currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20], threadOpt[20];
+char move[2000][10], checkOptions[8192], iniPos[256], hashOpt[20], pause, pondering, suspended, ponder, post, hasHash, c, sc='c', suffix[81], *variants, varOpt;
+int mps, tc, inc, sTime, depth, myTime, hisTime, stm, computer = NONE, memory, oldMem=0, cores, moveNr, lastDepth, lastScore, startTime, debug, flob;
+int statDepth, statScore, statNodes, statTime, currNr, size, collect, nr, sm, inex, on[500], frc, byo = -1, namOpt, comp;
+char currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20], threadOpt[20], varList[8000];
 char board[100];  // XQ board for UCCI
 char *nameWord = "name ", *valueWord = "value ", *wTime = "w", *bTime = "b", *wInc = "winc", *bInc = "binc", newGame; // keywords that differ in UCCI
 int unit = 1, drawOffer;
@@ -51,6 +52,8 @@ FILE *toE, *fromE, *fromF;
 int pid;
 
 #ifdef WIN32
+char *strcasestr (char *p, char *q) { char *r = p; while(*r) *r = tolower(*r), r++; return strstr(p, q); }
+
 WinPipe(HANDLE *hRd, HANDLE *hWr)
 {
   SECURITY_ATTRIBUTES saAttr;
@@ -141,15 +144,17 @@ StartSearch(char *ponder)
 	int x = (ponder[0] != 0);                   // during ponder stm is the opponent
 	int black = (stm == BLACK ^ x ^ sc == 's'); // set if our color is what the engine calls black
 	int nr = moveNr + x;                        // we ponder for one move ahead!
+	int t = (flob ? inc + myTime/40 : 1000*byo*(byo>0)); // byoyomi time 
 	if(sc == 'x') black = 1; else drawOffer = 0;// in UCCI 'black' refers to us and 'white' to opponent
 	if(!x && drawOffer) ponder = " draw", drawOffer = 0; //pass draw offer only when not pondering
-	fprintf(toE, "\ngo%s %stime %d %stime %d", ponder, bTime, black ? myTime : hisTime, wTime, !black ? myTime : hisTime);
-	DPRINT(    "\n# go%s %stime %d %stime %d", ponder, bTime, black ? myTime : hisTime, wTime, !black ? myTime : hisTime);
+	fprintf(toE, "\ngo%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t);
+	DPRINT(    "\n# go%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t);
 	if(sTime > 0) { fprintf(toE, " movetime %d", sTime); DPRINT(" movetime %d", sTime); } else
 	if(mps) { fprintf(toE, " movestogo %d", mps*(nr/(2*mps)+1)-nr/2); DPRINT(" movestogo %d", mps*(nr/(2*mps)+1)-nr/2); }
-	if(inc && !suffix) { fprintf(toE, " %s %d %s %d", wInc, inc, bInc, inc); DPRINT(" %s %d %s %d", wInc, inc, bInc, inc); }
+	if(flob || byo >= 0) sprintf(suffix, " byoyomi %d", t); // for engines running purely on byoyomi
+	if(inc && !*suffix) { fprintf(toE, " %s %d %s %d", wInc, inc, bInc, inc); DPRINT(" %s %d %s %d", wInc, inc, bInc, inc); }
 	if(depth > 0) { fprintf(toE, " depth %d", depth); DPRINT(" depth %d", depth); }
-        if(suffix) { fprintf(toE, suffix, inc); DPRINT(suffix, inc); }
+        if(*suffix) { fprintf(toE, suffix, inc); DPRINT(suffix, inc); }
 	fprintf(toE, "\n"); DPRINT("\n");
 }
 
@@ -250,6 +255,7 @@ Engine2GUI()
 	    // move was a move to be played
 	    if(p = strstr(line+8, " draw")) *p = 0, printf("offer draw\n"); // UCCI
 	    if(strstr(line+9, "resign")) { printf("resign\n"); computer = NONE; }
+	    if(strstr(line+9, "win")) { printf("%s {claim}\n", stm== WHITE ? "1-0" :"0-1"); computer = NONE; } // USI
 	    if(strstr(line+9, "(none)") || strstr(line+9, "null") ||
 	       strstr(line+9, "0000")) { printf("%s\n", lastScore < -99999 ? "resign" : "1/2-1/2 {stalemate}"); computer = NONE; }
 	    sscanf(line, "bestmove %s", move[moveNr++]);
@@ -267,13 +273,18 @@ Engine2GUI()
 	    } else move[moveNr][0] = 0;
 	    Move4GUI(line+9);
 	    printf("move %s\n", line+9); // send move to GUI
+            if(move[moveNr][0]) printf("Hint: %s\n", move[moveNr]);
 	    if(pause) { pause = 0; Sync(WAKEUP); } // release commands that came in during think
 	    if(lastScore == 100001 && iniPos[0] != 'f') { printf("%s {mate}\n", stm == BLACK ? "1-0" : "0-1"); computer = NONE; }
 	}
 	else if(!strcmp(command, "info")) {
-	    int d=0, s=0, t=0, n=0;
-	    char *pv;
+	    int d=0, s=0, t=(GetTickCount() - startTime)/10, n=1;
+	    char *pv, varName[80];
 	    if(sscanf(line+5, "string times @ %c", &dummy) == 1) { printf("# %s", line+12); continue; }
+	    if(sscanf(line+5, "string variant %s", varName) == 1) {
+		if(!strstr(STDVARS, varName) && (p = strstr(line+18, " startpos "))) printf("setup (-) 8x8+0_fairy %s", p+10);
+		continue;
+	    }
 	    if(collect && (pv = strstr(line+5, "currmove "))) {
 		if(p = strstr(line+5, "currmovenumber ")) {
 		    n = atoi(p+15);
@@ -308,6 +319,8 @@ Engine2GUI()
 	    if(p = strstr(line+6, " default "))  sscanf(p+1, "default %[^\n]*", val), *p = '\n';
 	    if(!(p = strstr(line+6, " name "))) p = line+1; sscanf(p+6, "%[^\n]", name); // 'name' is omitted in UCCI
 	    if(!strcasecmp(name, "UCI_Chess960")) { frc=2; continue; }
+	    if(!strcasecmp(name, "UCI_Variant")) { if(p = strstr(line+6, " var ")) strcpy(varList, p); varOpt = 1; continue; }
+	    if(!strcasecmp(name, "UCI_Opponent")) { namOpt = 1; continue; }
 	    if(frc< 0 && (strstr(name, "960") || strcasestr(name, "frc")) && !strcmp(type, "check")) {
 		fprintf(toE, "setoption name %s value true\n", name); strcpy(val, "true"); // set non-standard suspected FRC options
 	    }
@@ -347,7 +360,13 @@ Engine2GUI()
 	}
 	else if(!strcmp(command, "readyok")) { pause = 0; Sync(WAKEUP); } // resume processing of GUI commands
 	else if(sc == 'x'&& !strcmp(command, "ucciok") || sscanf(command, "u%ciok", &c)==1 && c==sc) {
-	    if(frc) printf("feature variants=\"normal,fischerandom\" oocastle=%d\n", frc<0); // unannounced FRC uses O-O castling
+	    char *p = varList, *q = varList;
+	    while(*q && *q != '\n')  if(!strncmp(q, " var ", 5)) *p++ = ',', q +=5; // replace var keywords by commas
+				else if(!strncmp(q-1, " chess ", 7)) strcpy(p, "normal"), p += 6, q += 5; // 'chess' is called 'normal' in CECP
+				else if(!strncmp(q-1, " threecheck", 11)) *p++ = '3', q += 5; // 'threecheck' is written '3check' in CECP
+				else *p++ = *q++; // copy other variant names unmodified
+	    if(frc) sprintf(p, ",normal,fischerandom"), printf("feature oocastle=%d\n", frc<0); // unannounced FRC uses O-O castling
+	    if(*varList) printf("feature variants=\"%s\"\n", varList+1); // from UCI_Variant combo and/or UCI_Chess960 check options
 	    printf("feature smp=1 memory=%d done=1\n", hasHash);
 	    if(unit == 2) unit = 1, fprintf(toE, "setoption usemillisec true\n");
 	    Sync(WAKEUP); // done with options
@@ -376,24 +395,23 @@ Move4Engine(char *m)
 void
 GUI2Engine()
 {
-    char line[256], command[256], *p, *q, *r;
+    char line[256], command[256], *p, *q, *r, mySide, searching = 0;
 
     while(1) {
 	int i, x;
 
-	if((computer == stm || computer == ANALYZE) && !suspended) {
+	if((computer == stm || computer == ANALYZE && !searching) && !suspended) {
 	    DPRINT("# start search\n");
 	    LoadPos(moveNr); fflush(stdout); // load position
 	    // and set engine thinking (note USI swaps colors!)
-	    startTime = GetTickCount();
+	    startTime = GetTickCount(); mySide = stm; // remember side we last played for
 	    if(computer == ANALYZE) {
 		fprintf(toE, "\ngo infinite"); DPRINT("\n# go infinite");
 		if(sm & 1) { // some moves are disabled
 		    fprintf(toE, " searchmoves"); DPRINT(" searchmoves");
 		    for(i=1; i<nr; i++) if(on[i]) { fprintf(toE, " %s", moveMap[i]); DPRINT(" %s", moveMap[i]); }
 		}
-		fprintf(toE, "\n"); DPRINT("\n");
-	    // code for searchmoves goes here
+		fprintf(toE, "\n"); DPRINT("\n"); searching = 1; // suppresses spurious commands during analysis starting new searches
 	    } else { pause = 2; StartSearch(""); fflush(stdout); fflush(toE); Sync(PAUSE); } // block input during thinking
 	}
       nomove:
@@ -408,6 +426,7 @@ GUI2Engine()
 	    oldMem = memory;
 	    // we can set other options here
 	    if(sc == 'x') { if(newGame) fprintf(toE, "setoption newgame\n"); } else // optional in UCCI
+	    if(varOpt) fprintf(toE, "setoption name UCI_Variant value chess\n");
 	    pause = 1; // wait for option settings to take effect
 	    fprintf(toE, "isready\n"); fflush(toE);
 	    Sync(PAUSE); // wait for readyok
@@ -426,7 +445,7 @@ GUI2Engine()
 		    Sync(PAUSE); // block input during thinking
 		    goto nomove;
 		}
-		StopPonder(1);
+		StopPonder(1); searching = 0;
 	    }
 	    strcpy(move[moveNr++], command); // possibly overwrites ponder move
 	}
@@ -438,7 +457,10 @@ GUI2Engine()
 	}
 	else if(!strcmp(command, "option")) {
 	    char name[80], *p;
+	    if(searching) StopPonder(1), searching = 0; // force new search if settings change during analysis (multi-PV!)
 	    if(sscanf(line+7, "UCI2WB debug output=%d", &debug) == 1) ; else
+	    if(sscanf(line+7, "Floating Byoyomi=%d", &flob) == 1) ; else
+	    if(sscanf(line+7, "Byoyomi=%d", &byo) == 1) ; else
 	    if(p = strchr(line, '=')) {
 		*p++ = 0;
 		if(strstr(checkOptions, line+7)) sprintf(p, "%s\n", atoi(p) ? "true" : "false");
@@ -447,14 +469,15 @@ GUI2Engine()
 	}
 	else if(!strcmp(command, "protover")) {
 	    if(!variants) variants = sc=='s' ? "shogi,5x5+5_shogi" : VARIANTS;
-	    printf("feature variants=\"%s\" setboard=1 usermove=1 debug=1 ping=1 reuse=0 exclude=1 pause=1 sigint=0 sigterm=0 done=0\n", variants);
+	    printf("feature variants=\"%s\" setboard=1 usermove=1 debug=1 ping=1 name=1 reuse=0 exclude=1 pause=1 sigint=0 sigterm=0 done=0\n", variants);
 	    printf("feature option=\"UCI2WB debug output -check %d\"\n", debug);
+	    if(sc == 's') printf("feature option=\"Floating Byoyomi -check %d\"\nfeature option=\"Byoyomi -spin %d -1 1000\"\n", flob, byo);
 	    fprintf(toE, sc == 'x' ? "ucci\n" : "u%ci\n", sc); fflush(toE); // prompt UCI engine for options
 	    Sync(PAUSE); // wait for uciok
 	}
 	else if(!strcmp(command, "setboard")) {
 		stm = (strstr(line+9, " b ") ? BLACK : WHITE);
-                if(p = strchr(line+9, '[')) { char c;
+                if((p = strchr(line+9, '[')) && !varOpt) { char c;
                     *p++ = 0; q = strchr(p, ']'); *q = 0; r = q + 4; 
 		    if(sc == 's') q[2] = 'w' + 'b' - q[2], strcpy(r=q+3, " 1\n"); // Shogi: reverse color
 		    else r = strchr(strchr(q+4, ' ') + 1, ' '); // skip to second space (after e.p. square)
@@ -465,13 +488,17 @@ GUI2Engine()
 		iniPos[strlen(iniPos)-1] = sm = 0; collect = (computer == ANALYZE);
 	}
 	else if(!strcmp(command, "variant")) {
+		if(varOpt) {
+		    fprintf(toE, "setoption name UCI_Variant value %sucinewgame\nisready\n", strcmp(line+8, "3check\n") ? line+8 : "threecheck\n");
+		    fflush(toE); Sync(PAUSE);
+		}
 		if(!strcmp(line+8, "shogi\n")) size = 9, strcpy(iniPos, "position startpos");
 		if(!strcmp(line+8, "5x5+5_shogi\n")) size = 5, strcpy(iniPos, "position startpos");
 		if(!strcmp(line+8, "xiangqi\n")) strcpy(iniPos, "fen rnbakabnr/9/1c5c1/p1p1p1p1p/9/9/P1P1P1P1P/1C5C1/9/RNBAKABNR r");
 		if(!strcmp(line+8, "fischerandom\n")) { frc |= 1; if(frc > 0) fprintf(toE, "setoption name UCI_Chess960 value true\n"); }
 	}
 	else if(!strcmp(command, "undo") && (i=1) || !strcmp(command, "remove") && (i=2)) {
-	    if(pondering || computer == ANALYZE) StopPonder(1);
+	    if(pondering || computer == ANALYZE) StopPonder(1), searching = 0;
 	    moveNr = moveNr > i ? moveNr - i : 0; collect = (computer == ANALYZE); sm = 0;
 	}
 	else if(!strcmp(command, ".")) {
@@ -483,7 +510,7 @@ GUI2Engine()
 	    inex = 1; line[strlen(line)-1] = sm = 0; // strip LF and clear sm flag
 	    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
 	    if(!(sm & 2)) goto nomove; // no moves enabled; continue current search
-	    if(computer == ANALYZE) StopPonder(1); // abort old analysis
+	    if(computer == ANALYZE) StopPonder(1), searching = 0; // abort old analysis
 	}
 	else if(!strcmp(command, "pause")) {
 	    if(computer == stm) myTime -= GetTickCount() - startTime;
@@ -496,7 +523,7 @@ GUI2Engine()
 	}
 	else if(!strcmp(command, "xboard")) ;
 	else if(!strcmp(command, "analyze"))computer = ANALYZE, collect = 1, sm = 0;
-	else if(!strcmp(command, "exit"))   computer = NONE, StopPonder(1);
+	else if(!strcmp(command, "exit"))   computer = NONE, StopPonder(1), searching = 0;
 	else if(!strcmp(command, "force"))  computer = NONE, StopPonder(pondering);
 	else if(!strcmp(command, "go"))     computer = stm;
 	else if(!strcmp(command, "time"))   sscanf(line+4, "%d", &myTime),  myTime  = (10*myTime)/unit;
@@ -510,7 +537,10 @@ GUI2Engine()
 	else if(!strcmp(command, "cores")&& !!*threadOpt) sscanf(line, "cores %d", &cores), fprintf(toE, "setoption %s%s %s%d\n", nameWord, threadOpt, valueWord, cores);
 	else if(!strcmp(command, "sd"))     sscanf(line, "sd %d", &depth);
 	else if(!strcmp(command, "st"))     sscanf(line, "st %d", &sTime), sTime = 1000*sTime - 30, inc = 0, sTime /= unit;
+	else if(!strcmp(command, "name"))   { if(namOpt) fprintf(toE, "setoption name UCI_Opponent value none none %s %s", comp ? "computer" : "human", line+5); }
+	else if(!strcmp(command, "computer")) comp = 1;
 	else if(!strcmp(command, "offer"))  drawOffer = 1;
+	else if(!strcmp(command, "result")) { if(sc == 's') fprintf(toE, "gameover %s\n", line[8] == '/' ? "draw" : (line[7] == '0') == mySide ? "win" : "lose"); }
 	else if(!strcmp(command, "quit"))   fprintf(toE, "quit\n"), fflush(toE), exit(0);
     }
 }
@@ -610,7 +640,7 @@ main(int argc, char **argv)
 	if(argc > 1 && argv[1][0] == '-') { sc = argv[1][1]; argc--; argv++; }
 	if(argc < 2) { printf("usage is: U%cI2WB [debug] [-s] <engine.exe> [<engine directory>]\n", sc-32); exit(-1); }
 	if(argc > 2) dir = argv[2];
-        if(argc > 3) suffix = argv[3];
+        if(argc > 3) strncpy(suffix, argv[3], 80);
 
         if(sc == 'x') nameWord = valueWord = bTime = "", wTime = "opp", bInc = "increment", wInc = "oppincrement", unit = 1000; // switch to UCCI keywords
 	else if(sc == 'f' ) frc = -1, sc = 'c';   // UCI for unannounced Chess960