X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=a546859dd163f22136537749a7e67af1dd90f12f;hp=41c71c81f97880a7f7de80da1b5d1f675a32d47d;hb=f21b77b0e872a89e1448cb56d5cff016f7231a12;hpb=990ae69c6d5ff8468541372acc4c6fcb854f64e2

diff --git a/UCI2WB.c b/UCI2WB.c
index 41c71c8..a546859 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -9,7 +9,7 @@
 /* of which you should have received a copy together with this file.        */
 /****************************************************************************/
 
-#define VERSION "3.0"
+#define VERSION "4.0"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -260,9 +260,9 @@ HandleEngineOutput()
 	    if(strstr(line+9, "(none)") || strstr(line+9, "null") ||
 	       strstr(line+9, "0000")) { printf("%s\n", lastScore < -99999 ? "resign" : "1/2-1/2 {stalemate}"); computer = NONE; }
 	    sscanf(line, "bestmove %s", move[moveNr++]);
-	    myTime -= (GetTickCount() - startTime)*1.02 + inc; // update own clock, so we can give correct wtime, btime with ponder
+	    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;
+	    stm = WHITE+BLACK - stm; searching = 0;
 	    // first start a new ponder search, if pondering is on and we have a move to ponder on
 	    if(p = strstr(line+9, "ponder")) {
 	      sscanf(p+7, "%s", move[moveNr]);
@@ -276,7 +276,7 @@ HandleEngineOutput()
 	    printf("move %s\n", line+9); // send move to GUI
             if(move[moveNr][0]) printf("Hint: %s\n", move[moveNr]);
 	    if(lastScore == 100001 && iniPos[0] != 'f') { printf("%s {mate}\n", stm == BLACK ? "1-0" : "0-1"); computer = NONE; }
-	    return;
+	    fflush(stdout); return;
 	}
 	else if(!strcmp(command, "info")) {
 	    int d=0, s=0, t=(GetTickCount() - startTime)/10, n=1;
@@ -294,17 +294,6 @@ HandleEngineOutput()
 		}
 		continue;
 	    }
-	    if(collect && (pv = strstr(line+5, "currmove "))) {
-		if(p = strstr(line+5, "currmovenumber ")) {
-		    n = atoi(p+15);
-		    if(collect == 1 && n != 1) continue; // wait for move 1
-		    if(collect + (n == 1) > 2) { // done collecting
-			if(inex && collect == 2) printf("%d 0 0 0 OK to exclude\n", lastDepth);
-			collect = 3; continue;
-		    }
-		    collect = 2; on[nr=n] = 1; sscanf(pv+9, "%s", moveMap[n]); continue; // store move
-		}
-	    }
 	    if(!post) continue;
 	    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;
@@ -313,8 +302,6 @@ HandleEngineOutput()
 		if(p = strstr(line+4, " score "))      sscanf(p+7, "%d", &s), statScore = s;
 		if(p = strstr(line+4, " nodes "))      sscanf(p+7, "%d", &n), statNodes = n;
 		if(p = strstr(line+4, " time "))       sscanf(p+6, "%d", &t), t /= 10, statTime = t;
-		if(p = strstr(line+4, " currmove "))   sscanf(p+10,"%s", currMove);
-		if(p = strstr(line+4, " currmovenumber ")) sscanf(p+16,"%d", &currNr);
 		if(pv = strstr(line+4, " pv ")) { // convert PV info to WB thinking output
 		  if(d > maxDepth) maxDepth = d, mpvSP = 0; else if(d < maxDepth) continue; // ignore depth regressions
 		  if(p = strstr(line+4, " upperbound ")) strcat(p, "?\n"); else
@@ -324,6 +311,18 @@ HandleEngineOutput()
 		    printf("%3d  %6d %6d %10d %s", lastDepth=d, lastScore=s, t, n, Convert(pv+4));
 		} else if(s == -100000) lastScore = s; // when checkmated score is valid even without PV (which might not come)
 	    }
+	    if(collect && (pv = strstr(line+4, " currmove "))) {
+		sscanf(pv+10,"%s", currMove);
+		if(p = strstr(line+4, " currmovenumber ")) {
+		    n = currNr = atoi(p+16);
+		    if(collect == 1 && n != 1) continue; // wait for move 1
+		    if(collect + (n == 1) > 2) { // done collecting
+			if(inex && collect == 2) printf("%d 0 0 0 OK to exclude\n", lastDepth);
+			collect = 3; continue;
+		    }
+		    collect = 2; on[nr=n] = 1; strcpy(moveMap[n], currMove); continue; // store move
+		}
+	    }
 	}
 	else if(!strcmp(command, "option")) { // USI option: extract data fields
 	    char name[80], type[80], buf[1024], val[256], *q;
@@ -388,11 +387,12 @@ HandleEngineOutput()
 				else if(!strncmp(q-1, " chess ", 7)) strcpy(p, "normal"), p += 6, q += 5; // 'chess' is called 'normal' in CECP
 				else *p++ = *q++; // copy other variant names unmodified
 	    if(frc) sprintf(p, ",normal,fischerandom"), printf("feature oocastle=%d\n", frc<0); // unannounced FRC uses O-O castling
-	    if(*varList) printf("feature variants=\"%s\"\n", varList+1); // from UCI_Variant combo and/or UCI_Chess960 check options
+	    if(!*varList) strcpy(varList, sc=='s' ? ",shogi,5x5+5_shogi" : VARIANTS); // without clue guess liberally
+	    printf("feature variants=\"%s\"\n", varList+1); // from UCI_Variant combo and/or UCI_Chess960 check options
 	    if(*egts) printf("feature egt=\"%s\"\n", egts+1);
 	    printf("feature smp=1 memory=%d done=1\n", hasHash);
 	    if(unit == 2) { unit = 1; EPRINT((f, "# setoption usemillisec true\n")) }
-	    return; // done with options
+	    fflush(stdout); return; // done with options
 	}
     }
 }
@@ -415,7 +415,7 @@ Move4Engine(char *m)
     }
 }
 
-int DoCommand ();
+void DoCommand ();
 char mySide;
 volatile char queue[10000], *qStart, *qEnd;
 
@@ -424,7 +424,7 @@ LaunchSearch()
 {
     int i;
 
-	if((computer == stm || computer == ANALYZE && !searching) && !suspended) {
+	if((computer == stm || computer == ANALYZE && !searching && sm != 1) && !suspended) {
 	    DPRINT("# start search\n");
 	    LoadPos(moveNr); fflush(stdout); // load position
 	    // and set engine thinking (note USI swaps colors!)
@@ -459,13 +459,21 @@ GUI2Engine()
 	else if(!strcmp(command, "post"))  post = 1;
 	else if(!strcmp(command, "nopost"))post = 0;
 	else if(!strcmp(command, ".")) {
-	    printf("stat01: %d %d %d %d 100 %s\n", statTime, statNodes, statDepth, 100-currNr, currMove);
+	    printf("stat01: %d %d %d %d %d %s\n", statTime, statNodes, statDepth, nr-currNr, nr, currMove);
 	}
 	else if(!strcmp(command, "pause")) {
 	    if(computer == stm) myTime -= GetTickCount() - startTime;
 	    suspended = 1 + (searching == 1); // remember if we were pondering, and stop search ignoring bestmove
 	    StopSearch(1);
 	}
+	else if(!strcmp(command, "xboard")) ;
+	else if(!strcmp(command, "random")) ;
+	else if(!strcmp(command, "accepted")) ;
+	else if(!strcmp(command, "rejected")) ;
+	else if(!strcmp(command, "book")) ;
+	else if(!strcmp(command, "ics")) ;
+	else if(!strcmp(command, "hint")) ;
+	else if(!strcmp(command, "computer")) comp = 1;
 	else { //convert easy & hard to "option" after treating their effect on the adapter
 	  if(!strcmp(command, "easy")) {
 	    if(*canPonder) ponder = 0, sprintf(command, "option"), sprintf(line, "option %s=0\n", canPonder); else continue;
@@ -473,7 +481,7 @@ GUI2Engine()
 	  else if(!strcmp(command, "hard")) {
 	    if(*canPonder) ponder = 1, sprintf(command, "option"), sprintf(line, "option %s=1\n", canPonder); else continue;
 	  }
-	  else if(!strcmp(command, "option")) {
+	  if(!strcmp(command, "option")) {
 	    if(sscanf(line+7, "UCI2WB debug output=%d", &debug) == 1) ; else
 	    if(sscanf(line+7, "ponder always=%d", &ponderAlways) == 1) ; else
 	    if(sscanf(line+7, "Floating Byoyomi=%d", &flob) == 1) ; else
@@ -507,6 +515,7 @@ GUI2Engine()
 	    suspended = 0;  *qEnd++ = '\n'; Sync(WAKEUP); // causes search to start in normal way if on move or analyzing
 	} else
       {
+	DPRINT("# queue '%s', searching=%d\n", command, searching);
 	if(searching == 3) { // command arrived during thinking; order abort for 'instant commands'
 	    if(!strcmp(command, "?") || !strcmp(command, "quit") ||
 	       !strcmp(command, "force") || !strcmp(command, "result")) StopSearch(0);
@@ -520,15 +529,15 @@ GUI2Engine()
     }
 }
 
-int
+void
 DoCommand ()
 {
     char line[1024], command[256], *p, *q, *r, type[99];
     int i;
 
     p=line; while(qStart < qEnd && (*p++ = *qStart++) != '\n') {} *p = 0;
-    if(line[0] == '\n') return 0;
-    sscanf(line, "%s", command);
+    if(line[0] == '\n') return;
+    sscanf(line, "%s", command); DPRINT("# command %s\n", command), fflush(stdout);
 
 	if(!strcmp(command, "new")) {
 	    computer = BLACK; moveNr = 0; depth = -1; move[0][0] = 0;
@@ -536,10 +545,10 @@ DoCommand ()
 	    if(memory != oldMem && hasHash) EPRINT((f, "# setoption %s%s %s%d\n", nameWord, hashOpt, valueWord, memory))
 	    oldMem = memory;
 	    // we can set other options here
-	    if(sc == 'x') { if(newGame) EPRINT((f, "# setoption newgame\n")) } else // optional in UCCI
 	    if(varOpt) EPRINT((f, "# setoption name UCI_Variant value chess\n"))
 	    EPRINT((f, "# isready\n")) fflush(toE);
 	    HandleEngineOutput(); // wait for readyok
+	    if(sc == 'x') { if(newGame) EPRINT((f, "# setoption newgame\n")) } else // optional in UCCI
 	    EPRINT((f, "# u%cinewgame\n", sc)) fflush(toE);
 	}
 	else if(!strcmp(command, "option")) {
@@ -557,7 +566,6 @@ DoCommand ()
 	    tc = (60*tc + sec)*1000; inc *= 1000; sTime = 0; tc /= unit; inc /= unit;
 	}
 	else if(!strcmp(command, "protover")) {
-	    if(!varList[0]) strcpy(varList, sc=='s' ? ",shogi,5x5+5_shogi" : VARIANTS);
 	    printf("feature setboard=1 usermove=1 debug=1 ping=1 name=1 reuse=0 exclude=1 pause=1 sigint=0 sigterm=0 done=0\n");
 	    printf("feature option=\"UCI2WB debug output -check %d\"\n", debug);
 	    printf("feature option=\"ponder always -check %d\"\n", ponderAlways);
@@ -594,9 +602,7 @@ DoCommand ()
 	    int all = !strcmp(line+8, "all"), in = command[1] == 'n';
 	    inex = 1; line[strlen(line)-1] = sm = 0; // strip LF and clear sm flag
 	    for(i=1; i<nr; i++) { if(!strcmp(line+8, moveMap[i]) || all) on[i] = in; sm |= on[i]+1; } // sm: 2 = enabled, 1 = disabled
-	    if(!(sm & 2)) return 1; // no moves enabled; continue current search
 	}
-	else if(!strcmp(command, "xboard")) ;
 	else if(!strcmp(command, "analyze"))computer = ANALYZE, collect = 1, sm = 0, Analyze("true");
 	else if(!strcmp(command, "exit"))   computer = NONE, Analyze("false");
 	else if(!strcmp(command, "force"))  computer = NONE;
@@ -612,14 +618,14 @@ DoCommand ()
 	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, "name"))   { if(namOpt) EPRINT((f, "# setoption name UCI_Opponent value none none %s %s", comp ? "computer" : "human", line+5)) }
-	else if(!strcmp(command, "computer")) comp = 1;
 	else if(!strcmp(command, "result")) {
 	    if(sc == 's') EPRINT((f, "# gameover %s\n", line[8] == '/' ? "draw" : (line[7] == '0') == mySide ? "win" : "lose"))
 	    computer = NONE;
 	}
 	else if(!strcmp(command, "quit"))   { EPRINT((f, "# quit\n")) fflush(toE), exit(atoi(line+4)); }
+	else printf("Error (unknown command): %s\n", command);
 
-    return 0;
+	fflush(stdout);
 }
 
 void *
@@ -630,7 +636,7 @@ Engine2GUI()
 	if(searching > 1) HandleEngineOutput();  // this could leave us (or fall through) pondering
 	while(qStart == qEnd && searching) HandleEngineOutput(); // relay ponder output until command arrives
 	Sync(PAUSE); // possibly wait for command silently if engine is idle
-	if(!DoCommand()) LaunchSearch();
+	DoCommand(); LaunchSearch();
     }
 }