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.)

diff --git a/README.txt b/README.txt
index 41e2d80..09d94ae 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -54,6 +54,7 @@ Change log:
 Implement handling of 'UCI_Variant' option for variant announcement and selection\r
 Pass 'info string variant' line as 'setup' command to allow engine-defined variants\r
 Set 'UCI_Opponent' option in accordance with CECP 'name' and 'computer' commands\r
+Fix option setting during analysis (MultiPV!)\r
 \r
 22/11/2016 2.2\r
 Use USI gameover command to relay game result\r

diff --git a/UCI2WB.c b/UCI2WB.c
index dddb073..dffac3b 100644 (file)
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -395,12 +395,12 @@ Move4Engine(char *m)
 void\r
 GUI2Engine()\r
 {\r
-    char line[256], command[256], *p, *q, *r, mySide;\r
+    char line[256], command[256], *p, *q, *r, mySide, searching = 0;\r
 \r
     while(1) {\r
        int i, x;\r
 \r
-       if((computer == stm || computer == ANALYZE) && !suspended) {\r
+       if((computer == stm || computer == ANALYZE && !searching) && !suspended) {\r
            DPRINT("# start search\n");\r
            LoadPos(moveNr); fflush(stdout); // load position\r
            // and set engine thinking (note USI swaps colors!)\r
@@ -411,8 +411,7 @@ GUI2Engine()
                    fprintf(toE, " searchmoves"); DPRINT(" searchmoves");\r
                    for(i=1; i<nr; i++) if(on[i]) { fprintf(toE, " %s", moveMap[i]); DPRINT(" %s", moveMap[i]); }\r
                }\r
-               fprintf(toE, "\n"); DPRINT("\n");\r
-           // code for searchmoves goes here\r
+               fprintf(toE, "\n"); DPRINT("\n"); searching = 1; // suppresses spurious commands during analysis starting new searches\r
            } else { pause = 2; StartSearch(""); fflush(stdout); fflush(toE); Sync(PAUSE); } // block input during thinking\r
        }\r
       nomove:\r
@@ -446,7 +445,7 @@ GUI2Engine()
                    Sync(PAUSE); // block input during thinking\r
                    goto nomove;\r
                }\r
-               StopPonder(1);\r
+               StopPonder(1); searching = 0;\r
            }\r
            strcpy(move[moveNr++], command); // possibly overwrites ponder move\r
        }\r
@@ -458,6 +457,7 @@ GUI2Engine()
        }\r
        else if(!strcmp(command, "option")) {\r
            char name[80], *p;\r
+           if(searching) StopPonder(1), searching = 0; // force new search if settings change during analysis (multi-PV!)\r
            if(sscanf(line+7, "UCI2WB debug output=%d", &debug) == 1) ; else\r
            if(sscanf(line+7, "Floating Byoyomi=%d", &flob) == 1) ; else\r
            if(sscanf(line+7, "Byoyomi=%d", &byo) == 1) ; else\r
@@ -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"); }\r
        }\r
        else if(!strcmp(command, "undo") && (i=1) || !strcmp(command, "remove") && (i=2)) {\r
-           if(pondering || computer == ANALYZE) StopPonder(1);\r
+           if(pondering || computer == ANALYZE) StopPonder(1), searching = 0;\r
            moveNr = moveNr > i ? moveNr - i : 0; collect = (computer == ANALYZE); sm = 0;\r
        }\r
        else if(!strcmp(command, ".")) {\r
@@ -510,7 +510,7 @@ GUI2Engine()
            inex = 1; line[strlen(line)-1] = sm = 0; // strip LF and clear sm flag\r
            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\r
            if(!(sm & 2)) goto nomove; // no moves enabled; continue current search\r
-           if(computer == ANALYZE) StopPonder(1); // abort old analysis\r
+           if(computer == ANALYZE) StopPonder(1), searching = 0; // abort old analysis\r
        }\r
        else if(!strcmp(command, "pause")) {\r
            if(computer == stm) myTime -= GetTickCount() - startTime;\r
@@ -523,7 +523,7 @@ GUI2Engine()
        }\r
        else if(!strcmp(command, "xboard")) ;\r
        else if(!strcmp(command, "analyze"))computer = ANALYZE, collect = 1, sm = 0;\r
-       else if(!strcmp(command, "exit"))   computer = NONE, StopPonder(1);\r
+       else if(!strcmp(command, "exit"))   computer = NONE, StopPonder(1), searching = 0;\r
        else if(!strcmp(command, "force"))  computer = NONE, StopPonder(pondering);\r
        else if(!strcmp(command, "go"))     computer = stm;\r
        else if(!strcmp(command, "time"))   sscanf(line+4, "%d", &myTime),  myTime  = (10*myTime)/unit;\r