X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=7f90ba6a4b49abe6292b652f38aa5c9d49628bbd;hp=10f4dd64e69d38625a42376253d6751174aeb0d0;hb=0b8da57d48c47856aac3b742aecc930f3c7b668d;hpb=dc007e1364c2beb3023e8ec4535b67b1dece028f

diff --git a/UCI2WB.c b/UCI2WB.c
index 10f4dd6..7f90ba6 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -1,6 +1,6 @@
 /************************* UCI2WB by H.G.Muller ****************************/
 
-#define VERSION "1.6"
+#define VERSION "1.7"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,7 +30,7 @@
 #define NONE  2
 #define ANALYZE 3
 
-char move[2000][10], checkOptions[8192], iniPos[256], hashOpt[20], pause, pondering, ponder, post, hasHash, c, sc='c', *suffix;
+char move[2000][10], checkOptions[8192], iniPos[256], hashOpt[20], pause, pondering, 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; char currMove[20]; // for analyze mode
 
@@ -82,13 +82,13 @@ StartSearch(char *ponder)
 	int nr = moveNr + (ponder[0] != 0); // we ponder for one move ahead!
 	fprintf(toE, "\ngo btime %d wtime %d", stm == BLACK ^ sc=='s' ? myTime : hisTime, stm == WHITE ^ sc=='s' ? myTime : hisTime);
 	DPRINT(    "\n# go btime %d wtime %d", stm == BLACK ^ sc=='s' ? myTime : hisTime, stm == WHITE ^ sc=='s' ? myTime : hisTime);
-	if(sTime > 0) fprintf(toE, " movetime %d", sTime),printf(" movetime %d", sTime); else
-	if(mps) fprintf(toE, " movestogo %d", mps*(nr/(2*mps)+1)-nr/2),printf(" movestogo %d", mps*(nr/(2*mps)+1)-nr/2);
-	if(inc && !suffix) fprintf(toE, " winc %d binc %d", inc, inc),printf(" winc %d binc %d", inc, inc);
-	if(depth > 0) fprintf(toE, " depth %d", depth),printf(" depth %d", depth);
-        if(suffix) fprintf(toE, suffix, inc),printf(suffix, inc);
+	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);
-	printf("%s\n", ponder);
+	DPRINT("%s\n", ponder);
 }
 
 void
@@ -106,7 +106,7 @@ 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]),printf(" %s", move[j]);
+	for(j=0; j<moveNr; j++) { fprintf(toE, " %s", move[j]); DPRINT(" %s", move[j]); }
 }
 
 char *Convert(char *pv)
@@ -128,13 +128,13 @@ Engine2GUI()
     char line[1024], command[256];
 
     while(1) {
-	int i=0, x; char *p;
+	int i=0, x; char *p, dummy;
 
 	fflush(stdout); fflush(toE);
 	while((line[i] = x = fgetc(fromE)) != EOF && line[i] != '\n') i++;
 	line[++i] = 0;
 	if(x == EOF) exit(0);
-	DPRINT("# engine said: %s", line); fflush(stdout);
+	DPRINT("# engine said: %s", line), fflush(stdout);
 	sscanf(line, "%s", command);
 	if(!strcmp(command, "bestmove")) {
 	    if(pause) { pondering = pause = 0; Sync(WAKEUP); continue; } // bestmove was reply to ponder miss or analysis result; ignore.
@@ -178,8 +178,9 @@ Engine2GUI()
 	else if(!strcmp(command, "info")) {
 	    int d=0, s=0, t=0, n=0;
 	    char *pv;
+	    if(sscanf(line+5, "string times @ %c", &dummy) == 1) { printf("# %s", line+12); continue; }
 	    if(!post) continue;
-	    if(strstr(line, "info string ") == line) printf("%d 0 0 0 %s", lastDepth, line+12); else {
+	    if(sscanf(line+5, "string %c", &dummy) == 1) printf("%d 0 0 0 %s", lastDepth, line+12); else {
 		if(p = strstr(line+4, " depth "))      sscanf(p+7, "%d", &d), statDepth = d;
 		if(p = strstr(line+4, " score cp "))   sscanf(p+10, "%d", &s), statScore = s; else
 		if(p = strstr(line+4, " score mate ")) sscanf(p+12, "%d", &s), s += s>0 ? 100000 : -100000, statScore = s; else
@@ -309,7 +310,8 @@ GUI2Engine()
 	    } else { fprintf(toE, "setoption name %s\n", line+7); DPRINT("# setoption name %s\n", line+7); }
 	}
 	else if(!strcmp(command, "protover")) {
-	    printf("feature variants=\"%s\" setboard=1 usermove=1 debug=1 ping=1 reuse=0 done=0\n", sc=='s' ? "shogi,5x5+5_shogi" : VARIANTS);
+	    if(!variants) variants = sc=='s' ? "shogi,5x5+5_shogi" : VARIANTS;
+	    printf("feature variants=\"%s\" setboard=1 usermove=1 debug=1 ping=1 reuse=0 done=0\n", variants);
 	    printf("feature option=\"UCI2WB debug output -check %d\"\n", debug);
 	    fprintf(toE, "u%ci\n", sc); // this prompts UCI engine for options
 	}
@@ -349,7 +351,7 @@ GUI2Engine()
 	else if(!strcmp(command, "memory")) sscanf(line, "memory %d", &memory);
 	else if(!strcmp(command, "cores"))  sscanf(line, "cores %d", &cores);
 	else if(!strcmp(command, "sd"))     sscanf(line, "sd %d", &depth);
-	else if(!strcmp(command, "st"))     sscanf(line, "st %d", &sTime), sTime *= 1000, inc = 0;
+	else if(!strcmp(command, "st"))     sscanf(line, "st %d", &sTime), sTime = 1000*sTime - 30, inc = 0;
 	else if(!strcmp(command, "quit"))   fprintf(toE, "quit\n"), fflush(toE), exit(0);
     }
 }
@@ -445,6 +447,7 @@ main(int argc, char **argv)
 
 	if(argc == 2 && !strcmp(argv[1], "-v")) { printf("UCI2WB " VERSION " by H.G.Muller\n"); exit(0); }
 	if(argc > 1 && !strcmp(argv[1], "debug")) { debug = 1; argc--; argv++; }
+	if(argc > 1 && !strcmp(argv[1], "-var")) { variants = argv[2]; argc-=2; argv+=2; }
 	if(argc > 1 && argv[1][0] == '-') { sc = argv[1][1]; argc--; argv++; }
 	if(argc < 2) { printf("usage is: U%cI2WB [debug] [-s] <engine.exe> [<engine directory>]\n", sc-32); exit(-1); }
 	if(argc > 2) dir = argv[2];