From 05c7d739a244a923c0f3e90bcb10f3db9f5e670c Mon Sep 17 00:00:00 2001
From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Thu, 10 Nov 2016 10:12:11 +0100
Subject: [PATCH] Fix commands during analysis (MultiPV option!)

UCI2WB could not handle spurious commands while analyzing: these would
start a new search without first terminating the old one. Only the commands
allowed in analysis mode (exit, usermove, and in/exclude) were handled
correctly. Unfortunately XBoard sometimes sends spurious 'accepted' commands
during analysis, in violation of the CECP specs. All such non-compliant
commands are now ignored. And the 'option' command will also abort an
ongoing analysis search, to allow altering the MultiPV setting during
analysis. (Something XBoard also does.)
---
 README.txt |    1 +
 UCI2WB.c   |   16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 41e2d80..09d94ae 100644
--- a/README.txt
+++ b/README.txt
@@ -54,6 +54,7 @@ Change log:
 Implement handling of 'UCI_Variant' option for variant announcement and selection
 Pass 'info string variant' line as 'setup' command to allow engine-defined variants
 Set 'UCI_Opponent' option in accordance with CECP 'name' and 'computer' commands
+Fix option setting during analysis (MultiPV!)
 
 22/11/2016 2.2
 Use USI gameover command to relay game result
diff --git a/UCI2WB.c b/UCI2WB.c
index dddb073..dffac3b 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -395,12 +395,12 @@ 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!)
@@ -411,8 +411,7 @@ GUI2Engine()
 		    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 +445,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 +457,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 +498,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 +510,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 +523,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;
-- 
1.7.0.4