X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=77b671b7b633cefba7715f06e5f0076b82ec0635;hp=bd8a4f8071a4e1a1019d640d8ea99126fb8e7adb;hb=d4c964cc8830407dbc9efa12a1d50e4ce48b711a;hpb=a0e8b912242887c25e8fd5dedcfcb72b31b29434

diff --git a/UCI2WB.c b/UCI2WB.c
index bd8a4f8..77b671b 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -1,6 +1,6 @@
 /************************* UCI2WB by H.G.Muller ****************************/
 
-#define VERSION "1.10"
+#define VERSION "2.0"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -35,8 +35,8 @@ int mps, tc, inc, sTime, depth, myTime, hisTime, stm, computer = NONE, memory, o
 int statDepth, statScore, statNodes, statTime, currNr, size, collect, nr, sm, inex, on[500];
 char currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20], threadOpt[20];
 char board[100];  // XQ board for UCCI
-char *nameWord = "name ", *valueWord = "value ", *wTime = "w", *bTime = "b", *wInc = "winc", *bInc = "binc"; // keywords that differ in UCCI
-int unit = 1;
+char *nameWord = "name ", *valueWord = "value ", *wTime = "w", *bTime = "b", *wInc = "winc", *bInc = "binc", newGame; // keywords that differ in UCCI
+int unit = 1, drawOffer;
 
 FILE *toE, *fromE, *fromF;
 int pid;
@@ -132,6 +132,8 @@ 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!
+	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);
 	if(sTime > 0) { fprintf(toE, " movetime %d", sTime); DPRINT(" movetime %d", sTime); } else
@@ -146,7 +148,7 @@ void
 StopPonder(int pondering)
 {
 	if(!pondering) return;
-	pause = 1;
+	pause = 2;
 	fprintf(toE, "stop\n"); fflush(toE); DPRINT("# stop\n"); // note: 'pondering' remains set until engine acknowledges 'stop' with 'bestmove'
 	Sync(PAUSE); // wait for engine to acknowledge 'stop' with 'bestmove'.
 }
@@ -154,10 +156,16 @@ StopPonder(int pondering)
 void
 LoadPos(int moveNr)
 {
-	int j;
-	fprintf(toE, "%s moves", iniPos);
-	DPRINT(    "# %s moves", iniPos);
-	for(j=0; j<moveNr; j++) { fprintf(toE, " %s", move[j]); DPRINT(" %s", move[j]); }
+	int j, lastCapt = 0; char *pos = iniPos, buf[200], stm;
+	if(sc == 'x') { // UCCI: send only reversible moves
+	    lastCapt = Play(moveNr); // find last capture (returns -1 if none!)
+	    Play(++lastCapt);        // reconstruct board after last capture
+	    stm = (!strstr(iniPos+4, " b ") ^ lastCapt & 1 ? 'w' :  'b');
+	    sprintf(buf, "position fen %s", ToFEN(stm)); pos = buf; // send it as FEN (with "position" in UCCI!)
+	}
+	fprintf(toE, "%s moves", pos);
+	DPRINT(    "# %s moves", pos);
+	for(j=lastCapt; j<moveNr; j++) { fprintf(toE, " %s", move[j]); DPRINT(" %s", move[j]); }
 }
 
 void
@@ -229,7 +237,9 @@ Engine2GUI()
 	if(sscanf(line, "%s", command) != 1) continue;
 	if(!strcmp(command, "bestmove")) {
 	    if(pause) { pondering = pause = 0; Sync(WAKEUP); continue; } // bestmove was reply to ponder miss or analysis result; ignore.
+	    else if(pondering) { pondering = 0; printf("%d 0 0 0 UCI violation! Engine moves during ponder\n", lastDepth+1); continue; } // ignore ponder search
 	    // 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, "(none)") || strstr(line+9, "null") ||
 	       strstr(line+9, "0000")) { printf("%s\n", lastScore < -99999 ? "resign" : "1/2-1/2 {stalemate}"); computer = NONE; }
@@ -286,14 +296,16 @@ Engine2GUI()
 	    if(p = strstr(line+6, " min "))  sscanf(p+1, "min %d", &min), *p = '\n';
 	    if(p = strstr(line+6, " max "))  sscanf(p+1, "max %d", &max), *p = '\n';
 	    if(p = strstr(line+6, " default "))  sscanf(p+1, "default %[^\n]*", val), *p = '\n';
-	    if(p = strstr(line+6, " name ")) sscanf(p+1, "name %[^\n]*", name);
-	    if(!strcmp(name, "Threads")) { strcpy(threadOpt, name); continue; }
-	    if(!strcmp(name, "Ponder") || !strcmp(name, "USI_Ponder")) { strcpy(canPonder, name); continue; }
-	    if(!strcmp(name, "Hash") || !strcmp(name, "USI_Hash")) {
+	    if(!(p = strstr(line+6, " name "))) p = line+1; sscanf(p+6, "%[^\n]", name); // 'name' is omitted in UCCI
+	    if(!strcasecmp(name, "Threads")) { strcpy(threadOpt, name); continue; }
+	    if(!strcasecmp(name, "Ponder") || !strcasecmp(name, "USI_Ponder")) { strcpy(canPonder, name); continue; }
+	    if(!strcasecmp(name, "Hash") || !strcasecmp(name, "USI_Hash") || !strcasecmp(name, "hashsize")) {
 		memory = oldMem = atoi(val); hasHash = 1; 
 		strcpy(hashOpt, name);
 		continue;
 	    }
+	    if(!strcasecmp(name, "newgame") && !strcmp(type, "button")) { newGame++; continue; }
+	    if(!strcasecmp(name, "usemillisec")) { unit = (!strcmp(val, "false") ? 2 : 1); continue; }
 	    // pass on engine-defined option as WB option feature
 	    if(!strcmp(type, "filename")) type[4] = 0;
 	    sprintf(buf, "feature option=\"%s -%s", name, type); q = buf + strlen(buf);
@@ -319,7 +331,11 @@ Engine2GUI()
 	    if(sscanf(line, "id name %[^\n]", name) == 1) printf("feature myname=\"%s (U%cI2WB)\"\n", name, sc-32);
 	}
 	else if(!strcmp(command, "readyok")) { pause = 0; Sync(WAKEUP); } // resume processing of GUI commands
-	else if(sscanf(command, "u%ciok", &c)==1 && c==sc)   printf("feature smp=1 memory=%d done=1\n", hasHash), Sync(WAKEUP); // done with options
+	else if(sc == 'x'&& !strcmp(command, "ucciok") || sscanf(command, "u%ciok", &c)==1 && c==sc) {
+	    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
+	}
     }
 }
 
@@ -351,7 +367,7 @@ GUI2Engine()
 
 	if((computer == stm || computer == ANALYZE) && !suspended) {
 	    DPRINT("# start search\n");
-	    LoadPos(moveNr); // load position
+	    LoadPos(moveNr); fflush(stdout); // load position
 	    // and set engine thinking (note USI swaps colors!)
 	    startTime = GetTickCount();
 	    if(computer == ANALYZE) {
@@ -367,7 +383,7 @@ GUI2Engine()
       nomove:
 	fflush(toE); fflush(stdout);
 	i = 0; while((x = getchar()) != EOF && (line[i] = x) != '\n') i++;
-	line[++i] = 0; if(x == EOF) { printf("# EOF\n"); exit(-1); }
+	line[++i] = 0; if(x == EOF) { printf("# EOF\n"); fprintf(toE, "quit\n"); exit(-1); }
 	sscanf(line, "%s", command);
 	if(!strcmp(command, "new")) {
 	    computer = BLACK; moveNr = 0; depth = -1; move[0][0] = 0;
@@ -375,9 +391,10 @@ GUI2Engine()
 	    if(memory != oldMem && hasHash) fprintf(toE, "setoption name %s %s%d\n", hashOpt, valueWord, memory);
 	    oldMem = memory;
 	    // we can set other options here
-	    pause = 1; // wait for option settings to take effect
-	    fprintf(toE, "isready\n");
+	    if(sc == 'x') { if(newGame) fprintf(toE, "setoption newgame\n"); } else // optional in UCCI
 	    fprintf(toE, "u%cinewgame\n", sc); fflush(toE);
+	    pause = 1; // wait for option settings to take effect
+	    fprintf(toE, "isready\n"); fflush(toE);
 	    Sync(PAUSE); // wait for readyok
 	}
 	else if(!strcmp(command, "usermove")) {
@@ -387,8 +404,9 @@ GUI2Engine()
 	    // when pondering we either continue the ponder search as normal search, or abort it
 	    if(pondering || computer == ANALYZE) {
 		if(pondering && !strcmp(command, move[moveNr])) { // ponder hit
+		    char *draw = drawOffer ? " draw" : ""; drawOffer = 0;
 		    pondering = 0; moveNr++; startTime = GetTickCount(); // clock starts running now
-		    fprintf(toE, "ponderhit\n"); DPRINT("# ponderhit\n");
+		    fprintf(toE, "ponderhit%s\n", draw); DPRINT("# ponderhit%s\n", draw);
 		    goto nomove;
 		}
 		StopPonder(1);
@@ -414,7 +432,7 @@ GUI2Engine()
 	    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 done=0\n", variants);
 	    printf("feature option=\"UCI2WB debug output -check %d\"\n", debug);
-	    fprintf(toE, "u%ci\n", sc); fflush(toE); // this prompts UCI engine for options
+	    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")) {
@@ -468,11 +486,12 @@ GUI2Engine()
 	else if(!strcmp(command, "nopost")) post = 0;
 	else if(!strcmp(command, "easy") && !!*canPonder) ponder = 0, StopPonder(pondering), fprintf(toE, "setoption %s%s %sfalse\n", nameWord, canPonder, valueWord);
 	else if(!strcmp(command, "hard") && !!*canPonder) ponder = 1, fprintf(toE, "setoption %s%s %strue\n", nameWord, canPonder, valueWord), StartPonder();
-	else if(!strcmp(command, "ping"))   pause = 1, fprintf(toE, "isready\n"), fflush(toE), Sync(PAUSE), printf("pong %s", line+5);
+	else if(!strcmp(command, "ping"))   { static int done; if(!done) pause = 1, fprintf(toE, "isready\n"), fflush(toE), printf("# send isready\n"), fflush(stdout), Sync(PAUSE); done = 1; printf("pong %s", line+5); }
 	else if(!strcmp(command, "memory")) sscanf(line, "memory %d", &memory);
 	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, "offer"))  drawOffer = 1;
 	else if(!strcmp(command, "quit"))   fprintf(toE, "quit\n"), fflush(toE), exit(0);
     }
 }
@@ -574,6 +593,8 @@ main(int argc, char **argv)
 	if(argc > 2) dir = argv[2];
         if(argc > 3) suffix = argv[3];
 
+        if(sc == 'x') nameWord = valueWord = bTime = "", wTime = "opp", bInc = "increment", wInc = "oppincrement", unit = 1000; // switch to UCCI keywords
+
 	// spawn engine proc
 	if(StartEngine(argv[1], dir) != NO_ERROR) { perror(argv[1]), exit(-1); }
 
@@ -583,7 +604,7 @@ main(int argc, char **argv)
 #ifdef WIN32
 	CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) Engine2GUI, (LPVOID) NULL, 0, &thread_id);
 #else
-        { pthread_t t; signal(SIGINT, SIG_IGN); pthread_create(&t, NULL, Engine2GUI, NULL); }
+        { pthread_t t; signal(SIGINT, SIG_IGN); signal(SIGTERM, SIG_IGN); pthread_create(&t, NULL, Engine2GUI, NULL); }
 #endif
 
 	// handle GUI->engine traffic in original thread