X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=UCI2WB.c;h=33546037baccf0772288def903ca25598b0996f6;hb=9106cb55be2eee65075e4cd9954d371c82ecd8e0;hp=725606198a78013786e23cacd21a3c9c8b4e7171;hpb=6339bbabc92588399ae64225e62db0aa571aa921;p=uci2wb.git

diff --git a/UCI2WB.c b/UCI2WB.c
index 7256061..3354603 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -33,7 +33,9 @@
 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];
-char currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20];
+char currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20], threadOpt[20];
+char board[100];  // XQ board for UCCI
+int unit = 1;
 
 FILE *toE, *fromE, *fromF;
 int pid;
@@ -78,19 +80,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 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(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(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
@@ -238,6 +286,7 @@ Engine2GUI()
 	    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")) {
 		memory = oldMem = atoi(val); hasHash = 1; 
@@ -349,7 +398,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;
@@ -368,7 +417,7 @@ GUI2Engine()
 	    Sync(PAUSE); // wait for uciok
 	}
 	else if(!strcmp(command, "setboard")) {
-		if(strstr(line+9, " b ")) stm = BLACK;
+		stm = (strstr(line+9, " b ") ? BLACK : WHITE);
                 if(p = strchr(line+9, '[')) { 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
@@ -412,17 +461,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, "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"))  sscanf(line, "cores %d", &cores);
+	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, "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);
     }
 }