X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=UCI2WB.c;h=cf2f8e4f0af03e828bbc0dbf3fef51c1ca03417e;hb=2b077abccc6427e6924b1ed903e3bce1128fc5b4;hp=dddb073f5e24f122879768adf5462976c5b10977;hpb=95996bd376f95541530f66cf27ad54949cb46d3c;p=uci2wb.git

diff --git a/UCI2WB.c b/UCI2WB.c
index dddb073..cf2f8e4 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -147,8 +147,8 @@ StartSearch(char *ponder)
 	int t = (flob ? inc + myTime/40 : 1000*byo*(byo>0)); // byoyomi time 
 	if(sc == 'x') black = 1; else drawOffer = 0;// in UCCI 'black' refers to us and 'white' to opponent
 	if(!x && drawOffer) ponder = " draw", drawOffer = 0; //pass draw offer only when not pondering
-	fprintf(toE, "\ngo%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t);
-	DPRINT(    "\n# go%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t);
+	fprintf(toE, "go%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t);
+	DPRINT(    "# go%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t);
 	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(flob || byo >= 0) sprintf(suffix, " byoyomi %d", t); // for engines running purely on byoyomi
@@ -180,6 +180,7 @@ LoadPos(int moveNr)
 	fprintf(toE, "%s moves", pos);
 	DPRINT(    "# %s moves", pos);
 	for(j=lastCapt; j<moveNr; j++) { fprintf(toE, " %s", move[j]); DPRINT(" %s", move[j]); }
+	fprintf(toE, "\n"); DPRINT("\n");
 }
 
 void
@@ -395,24 +396,23 @@ Move4Engine(char *m)
 void
 GUI2Engine()
 {
-    char line[256], command[256], *p, *q, *r, mySide;
+    char line[256], command[256], *p, *q, *r, mySide, searching = 0;
 
     while(1) {
 	int i, x;
 
-	if((computer == stm || computer == ANALYZE) && !suspended) {
+	if((computer == stm || computer == ANALYZE && !searching) && !suspended) {
 	    DPRINT("# start search\n");
 	    LoadPos(moveNr); fflush(stdout); // load position
 	    // and set engine thinking (note USI swaps colors!)
 	    startTime = GetTickCount(); mySide = stm; // remember side we last played for
 	    if(computer == ANALYZE) {
-		fprintf(toE, "\ngo infinite"); DPRINT("\n# go infinite");
+		fprintf(toE, "go infinite"); DPRINT("# go infinite");
 		if(sm & 1) { // some moves are disabled
 		    fprintf(toE, " searchmoves"); DPRINT(" searchmoves");
 		    for(i=1; i<nr; i++) if(on[i]) { fprintf(toE, " %s", moveMap[i]); DPRINT(" %s", moveMap[i]); }
 		}
-		fprintf(toE, "\n"); DPRINT("\n");
-	    // code for searchmoves goes here
+		fprintf(toE, "\n"); DPRINT("\n"); searching = 1; // suppresses spurious commands during analysis starting new searches
 	    } else { pause = 2; StartSearch(""); fflush(stdout); fflush(toE); Sync(PAUSE); } // block input during thinking
 	}
       nomove:
@@ -446,7 +446,7 @@ GUI2Engine()
 		    Sync(PAUSE); // block input during thinking
 		    goto nomove;
 		}
-		StopPonder(1);
+		StopPonder(1); searching = 0;
 	    }
 	    strcpy(move[moveNr++], command); // possibly overwrites ponder move
 	}
@@ -458,6 +458,7 @@ GUI2Engine()
 	}
 	else if(!strcmp(command, "option")) {
 	    char name[80], *p;
+	    if(searching) StopPonder(1), searching = 0; // force new search if settings change during analysis (multi-PV!)
 	    if(sscanf(line+7, "UCI2WB debug output=%d", &debug) == 1) ; else
 	    if(sscanf(line+7, "Floating Byoyomi=%d", &flob) == 1) ; else
 	    if(sscanf(line+7, "Byoyomi=%d", &byo) == 1) ; else
@@ -498,7 +499,7 @@ GUI2Engine()
 		if(!strcmp(line+8, "fischerandom\n")) { frc |= 1; if(frc > 0) fprintf(toE, "setoption name UCI_Chess960 value true\n"); }
 	}
 	else if(!strcmp(command, "undo") && (i=1) || !strcmp(command, "remove") && (i=2)) {
-	    if(pondering || computer == ANALYZE) StopPonder(1);
+	    if(pondering || computer == ANALYZE) StopPonder(1), searching = 0;
 	    moveNr = moveNr > i ? moveNr - i : 0; collect = (computer == ANALYZE); sm = 0;
 	}
 	else if(!strcmp(command, ".")) {
@@ -510,7 +511,7 @@ GUI2Engine()
 	    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)) goto nomove; // no moves enabled; continue current search
-	    if(computer == ANALYZE) StopPonder(1); // abort old analysis
+	    if(computer == ANALYZE) StopPonder(1), searching = 0; // abort old analysis
 	}
 	else if(!strcmp(command, "pause")) {
 	    if(computer == stm) myTime -= GetTickCount() - startTime;
@@ -523,7 +524,7 @@ GUI2Engine()
 	}
 	else if(!strcmp(command, "xboard")) ;
 	else if(!strcmp(command, "analyze"))computer = ANALYZE, collect = 1, sm = 0;
-	else if(!strcmp(command, "exit"))   computer = NONE, StopPonder(1);
+	else if(!strcmp(command, "exit"))   computer = NONE, StopPonder(1), searching = 0;
 	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*myTime)/unit;