X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=UCI2WB.c;h=15b35de852f992da1de41cbdeb4c3fbe8add7eee;hb=9dc81a4e9cd733c1ac04515325534749a39d8959;hp=33546037baccf0772288def903ca25598b0996f6;hpb=9106cb55be2eee65075e4cd9954d371c82ecd8e0;p=uci2wb.git

diff --git a/UCI2WB.c b/UCI2WB.c
index 3354603..15b35de 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -35,6 +35,7 @@ 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", newGame; // keywords that differ in UCCI
 int unit = 1;
 
 FILE *toE, *fromE, *fromF;
@@ -131,11 +132,12 @@ 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!
-	fprintf(toE, "\ngo%s btime %d wtime %d", ponder, black ? myTime : hisTime, !black ? myTime : hisTime);
-	DPRINT(    "\n# go%s btime %d wtime %d", ponder, black ? myTime : hisTime, !black ? myTime : hisTime);
+	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
 	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, " winc %d binc %d", inc, inc); DPRINT(" winc %d binc %d", inc, inc); }
+	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); }
 	fprintf(toE, "\n"); DPRINT("\n");
@@ -153,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
@@ -235,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")) {
@@ -285,14 +294,15 @@ 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")) {
+	    if(!strcmp(name, "Hash") || !strcmp(name, "USI_Hash") || !strcmp(name, "hashsize")) {
 		memory = oldMem = atoi(val); hasHash = 1; 
 		strcpy(hashOpt, name);
 		continue;
 	    }
+	    if(!strcmp(name, "newgame") && !strcmp(type, "button")) { newGame++; 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);
@@ -318,7 +328,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
+	}
     }
 }
 
@@ -371,12 +384,13 @@ GUI2Engine()
 	if(!strcmp(command, "new")) {
 	    computer = BLACK; moveNr = 0; depth = -1; move[0][0] = 0;
 	    stm = WHITE; strcpy(iniPos, "position startpos");
-	    if(memory != oldMem && hasHash) fprintf(toE, "setoption name %s value %d\n", hashOpt, memory);
+	    if(memory != oldMem && hasHash) fprintf(toE, "setoption name %s %s%d\n", hashOpt, valueWord, memory);
 	    oldMem = memory;
 	    // we can set other options here
+	    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");
-	    fprintf(toE, "u%cinewgame\n", sc); fflush(toE);
 	    Sync(PAUSE); // wait for readyok
 	}
 	else if(!strcmp(command, "usermove")) {
@@ -406,14 +420,14 @@ GUI2Engine()
 	    if(p = strchr(line, '=')) {
 		*p++ = 0;
 		if(strstr(checkOptions, line+7)) sprintf(p, "%s\n", atoi(p) ? "true" : "false");
-		fprintf(toE, "setoption name %s value %s", line+7, p); DPRINT("# setoption name %s value %s", line+7, p);
-	    } else { fprintf(toE, "setoption name %s\n", line+7); DPRINT("# setoption name %s\n", line+7); }
+		fprintf(toE, "setoption name %s value %s", line+7, p); DPRINT("# setoption %s%s %s%s", nameWord, line+7, valueWord, p);
+	    } else { fprintf(toE, "setoption %s%s\n", nameWord, line+7); DPRINT("# setoption %s%s\n", nameWord, line+7); }
 	}
 	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 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")) {
@@ -465,11 +479,11 @@ GUI2Engine()
 	else if(!strcmp(command, "otim"))   sscanf(line+4, "%d", &hisTime), hisTime = (10*hisTime)/unit;
 	else if(!strcmp(command, "post"))   post = 1;
 	else if(!strcmp(command, "nopost")) post = 0;
-	else if(!strcmp(command, "easy") && !!*canPonder) ponder = 0, StopPonder(pondering), fprintf(toE, "setoption name %s value false\n", canPonder);
-	else if(!strcmp(command, "hard") && !!*canPonder) ponder = 1, fprintf(toE, "setoption name %s value true\n", canPonder), StartPonder();
+	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, "memory")) sscanf(line, "memory %d", &memory);
-	else if(!strcmp(command, "cores")&& !!*threadOpt) sscanf(line, "cores %d", &cores), fprintf(toE, "setoption name %s value %d\n", threadOpt, cores);
+	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, "quit"))   fprintf(toE, "quit\n"), fflush(toE), exit(0);
@@ -573,6 +587,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); }