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

diff --git a/UCI2WB.c b/UCI2WB.c
index b92e975..bd8a4f8 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -34,6 +34,9 @@ char move[2000][10], checkOptions[8192], iniPos[256], hashOpt[20], pause, ponder
 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];
 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;
 
 FILE *toE, *fromE, *fromF;
 int pid;
@@ -78,19 +81,65 @@ Sync (int action)
 }
 
 void
+FromFEN(char *fen)
+{	int i=0;
+	while(*fen) {
+	    char c = *fen++;
+	    if(c >= 'A') board[i++] = c; else
+	    if(c == '/') i++; else
+	    if(c == ' ') break; else
+	    while(c-- > '0' && i < 99) board[i++] = 0;
+	    if(i >= 99) break;
+	}
+}
+
+char *
+ToFEN(int stm)
+{
+	int i, n=0; static char fen[200]; char *p = fen;
+	for(i=0; i<99; i++) {
+	    char c = board[i];
+	    if(c >= 'A')  { if(n) *p++ = '0' + n; n = 0;  *p++ = c; } else n ++;
+	    if(i%10 == 8) { if(n) *p++ = '0' + n; n = -1; *p++ = '/'; }
+	}
+	sprintf(p-1, " %c - - 0 1", stm);
+	return fen;
+}
+
+int
+Sqr(char *m, int j)
+{
+	int n = m[j] - 'a' + 10*('9' - m[j+1]);
+	if(n < 0) n = 0; else if(n > 99) n = 99; return n;
+}
+
+int
+Play(int nr)
+{
+	int i, last = -1;
+	FromFEN(iniPos + 4); // in XQ iniPos always has just "fen " prefix
+	for(i=0; i<nr; i++) {
+	    int from=Sqr(move[i], 0), to=Sqr(move[i], 2);
+	    if(board[to]) last = i;
+	    board[to] = board[from]; board[from] = 0;
+	}
+	return last;
+}
+
+void
 StartSearch(char *ponder)
 {	// send the 'go' command to engine. Suffix by ponder.
-	int x = (ponder[0] != 0);
-	int nr = moveNr + x; // we ponder for one move ahead!
-	fprintf(toE, "\ngo btime %d wtime %d", stm == BLACK ^ x ^ sc=='s' ? myTime : hisTime, stm == WHITE ^ x ^ sc=='s' ? myTime : hisTime);
-	DPRINT(    "\n# go btime %d wtime %d", stm == BLACK ^ x ^ sc=='s' ? myTime : hisTime, stm == WHITE ^ x ^ sc=='s' ? myTime : hisTime);
+	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 %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, "%s\n", ponder);
-	DPRINT("%s\n", ponder);
+	fprintf(toE, "\n"); DPRINT("\n");
 }
 
 void
@@ -323,7 +372,7 @@ 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
 	    pause = 1; // wait for option settings to take effect
@@ -350,7 +399,7 @@ GUI2Engine()
 	    int sec = 0;
 	    sscanf(line, "level %d %d:%d %d", &mps, &tc, &sec, &inc) == 4 ||
 	    sscanf(line, "level %d %d %d", &mps, &tc, &inc);
-	    tc = (60*tc + sec)*1000; inc *= 1000; sTime = 0;
+	    tc = (60*tc + sec)*1000; inc *= 1000; sTime = 0; tc /= unit; inc /= unit;
 	}
 	else if(!strcmp(command, "option")) {
 	    char name[80], *p;
@@ -358,8 +407,8 @@ 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;
@@ -413,17 +462,17 @@ GUI2Engine()
 	else if(!strcmp(command, "exit"))   computer = NONE, StopPonder(1);
 	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;
-	else if(!strcmp(command, "otim"))   sscanf(line+4, "%d", &hisTime), hisTime *= 10;
+	else if(!strcmp(command, "time"))   sscanf(line+4, "%d", &myTime),  myTime  = (10*myTime)/unit;
+	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;
+	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);
     }
 }