From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Mon, 27 Oct 2014 22:59:02 +0000 (+0100)
Subject: Implement UCCI
X-Git-Tag: v2.0~17
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=792199f6616669de79a1b09644af1cea831be128;p=uci2wb.git

Implement UCCI

The main framework of UCCI now works, and is activated by the option -x :
We send 'ucci' and expect 'ucciok', the alternative keywords for timing
are used (time and opptime, increment and oppincrement), and 'name'
and 'value' are suppressed when setting options. 'name' is also not
mandatory anymore in the received 'option' commands. The position-moves
command starts with the FEN for after the latest capture, and now
has the 'position' keyword that was missing in Cyclone UCI.
---

diff --git a/UCI2WB.c b/UCI2WB.c
index bd8a4f8..21aad7d 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -132,6 +132,7 @@ 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;                    // in UCCI 'black' refers to us and 'white' to opponent
 	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
@@ -154,10 +155,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
@@ -236,6 +243,7 @@ Engine2GUI()
 	    sscanf(line, "bestmove %s", move[moveNr++]);
 	    myTime -= (GetTickCount() - startTime)*1.02 + inc; // update own clock, so we can give correct wtime, btime with ponder
 	    if(mps && ((moveNr+1)/2) % mps == 0) myTime += tc; if(sTime) myTime = sTime; // new session or move starts
+
 	    stm = WHITE+BLACK - stm;
 	    // first start a new ponder search, if pondering is on and we have a move to ponder on
 	    if(p = strstr(line+9, "ponder")) {
@@ -286,7 +294,7 @@ 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(!(p = strstr(line+6, " name "))) p = line+1; sscanf(p+6, "%[^\n]", name); // 'name' is omitted in UCCI
 	    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")) {
@@ -319,7 +327,10 @@ 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);
+	    Sync(WAKEUP); // done with options
+	}
     }
 }
 
@@ -414,7 +425,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")) {
@@ -574,6 +585,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); }