X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=d879de7108642b7fc957bdc8cbf144174fa803b2;hb=95244a1c40718e9ad8bda9e2df66677e180354d6;hp=791958709d7b08ca906d961505eb8cced98407d3;hpb=02a9ccf9465b0f067fa5d0768596bd01113dcad7;p=xboard.git

diff --git a/backend.c b/backend.c
index 7919587..d879de7 100644
--- a/backend.c
+++ b/backend.c
@@ -296,7 +296,7 @@ int promoDefaultAltered;
 int keepInfo = 0; /* [HGM] to protect PGN tags in auto-step game analysis */
 static int initPing = -1;
 int border;       /* [HGM] width of board rim, needed to size seek graph  */
-char bestMove[MSG_SIZ];
+char bestMove[MSG_SIZ], avoidMove[MSG_SIZ];
 int solvingTime, totalTime;
 
 /* States for ics_getting_history */
@@ -1586,7 +1586,7 @@ MatchEvent (int mode)
 	}
 	matchMode = mode;
 	matchGame = roundNr = 1;
-	first.matchWins = second.matchWins = 0; // [HGM] match: needed in later matches
+	first.matchWins = second.matchWins = totalTime = 0; // [HGM] match: needed in later matches
 	NextMatchGame();
 }
 
@@ -8952,11 +8952,11 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
         }
         if(appData.epd) {
            if(solvingTime >= 0) {
-              snprintf(buf1, MSG_SIZ, "%d. solved %4.2fs\n", matchGame, solvingTime/100.);
+              snprintf(buf1, MSG_SIZ, "%d. %4.2fs: %s ", matchGame, solvingTime/100., parseList[backwardMostMove]);
               totalTime += solvingTime; first.matchWins++; solvingTime = -1;
            } else {
-              snprintf(buf1, MSG_SIZ, "%d. wrong (%s)\n", matchGame, parseList[backwardMostMove]);
-              second.matchWins++;
+              snprintf(buf1, MSG_SIZ, "%d. %s?%s ", matchGame, parseList[backwardMostMove], solvingTime == -2 ? " ???" : "");
+              if(solvingTime == -2) second.matchWins++;
            }
            OutputKibitz(2, buf1);
            GameEnds(GameUnfinished, NULL, GE_XBOARD);
@@ -9695,6 +9695,7 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
 
 	if (!ignore) {
 	    ChessProgramStats tempStats = programStats; // [HGM] info: filter out info lines
+	    int solved = 0;
 	    buf1[0] = NULLCHAR;
 	    if (sscanf(message, "%d%c %d %d " u64Display " %[^\n]\n",
 		       &plylev, &plyext, &curscore, &time, &nodes, buf1) >= 5) {
@@ -9723,10 +9724,33 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
 
 		if(*bestMove) { // rememer time best EPD move was first found
 		    int ff1, tf1, fr1, tr1, ff2, tf2, fr2, tr2; char pp1, pp2;
-		    ChessMove mt;
-		    int ok = ParseOneMove(bestMove, forwardMostMove, &mt, &ff1, &fr1, &tf1, &tr1, &pp1);
-		    ok    &= ParseOneMove(pv, forwardMostMove, &mt, &ff2, &fr2, &tf2, &tr2, &pp2);
-		    solvingTime = (ok && ff1==ff2 && fr1==fr2 && tf1==tf2 && tr1==tr2 && pp1==pp2 ? (solvingTime < 0 ? time : solvingTime) : -1);
+		    ChessMove mt; char *p = bestMove;
+		    int ok = ParseOneMove(pv, forwardMostMove, &mt, &ff2, &fr2, &tf2, &tr2, &pp2);
+		    solved = 0;
+		    while(ok && *p && ParseOneMove(p, forwardMostMove, &mt, &ff1, &fr1, &tf1, &tr1, &pp1)) {
+			if(ff1==ff2 && fr1==fr2 && tf1==tf2 && tr1==tr2 && pp1==pp2) {
+			    solvingTime = (solvingTime < 0 ? time : solvingTime);
+			    solved = 1;
+			    break;
+			}
+			while(*p && *p != ' ') p++;
+			while(*p == ' ') p++;
+		    }
+		    if(!solved) solvingTime = -1;
+		}
+		if(*avoidMove && !solved) {
+		    int ff1, tf1, fr1, tr1, ff2, tf2, fr2, tr2; char pp1, pp2;
+		    ChessMove mt; char *p = avoidMove, solved = 1;
+		    int ok = ParseOneMove(pv, forwardMostMove, &mt, &ff2, &fr2, &tf2, &tr2, &pp2);
+		    while(ok && *p && ParseOneMove(p, forwardMostMove, &mt, &ff1, &fr1, &tf1, &tr1, &pp1)) {
+			if(ff1==ff2 && fr1==fr2 && tf1==tf2 && tr1==tr2 && pp1==pp2) {
+			    solved = 0; solvingTime = -2;
+			    break;
+			}
+			while(*p && *p != ' ') p++;
+			while(*p == ' ') p++;
+		    }
+		    if(solved && !*bestMove) solvingTime = (solvingTime < 0 ? time : solvingTime);
 		}
 
 		if(serverMoves && (time > 100 || time == 0 && plylev > 7)) {
@@ -11842,11 +11866,13 @@ GameEnds (ChessMove result, char *resultDetails, int whosays)
 	} else {
 	    gameMode = nextGameMode;
 	    if(appData.epd) {
-		snprintf(buf, MSG_SIZ, "-------------------------------- ");
+		snprintf(buf, MSG_SIZ, "-------------------------------------- ");
 		OutputKibitz(2, buf);
-		snprintf(buf, MSG_SIZ, "Average solving time %4.2f sec ", totalTime/(100.*first.matchWins));
+		snprintf(buf, MSG_SIZ, _("Average solving time %4.2f sec (total time %4.2f sec) "), totalTime/(100.*first.matchWins), totalTime/100.);
 		OutputKibitz(2, buf);
-		snprintf(buf, MSG_SIZ, "Solved %d of %d (%3.1f%%) ", first.matchWins, nextGame, first.matchWins*100./nextGame);
+		snprintf(buf, MSG_SIZ, _("%d avoid-moves played "), second.matchWins);
+		if(second.matchWins) OutputKibitz(2, buf);
+		snprintf(buf, MSG_SIZ, _("Solved %d out of %d (%3.1f%%) "), first.matchWins, nextGame-1, first.matchWins*100./(nextGame-1));
 		OutputKibitz(2, buf);
 	    }
 	    snprintf(buf, MSG_SIZ, _("Match %s vs. %s: final score %d-%d-%d"),
@@ -13540,8 +13566,11 @@ LoadPosition (FILE *f, int positionNumber, char *title)
 	    return FALSE;
 	}
 	if((strchr(line, ';')) && (p = strstr(line, " bm "))) { // EPD with best move
-	    sscanf(p+4, "%s", bestMove);
+	    sscanf(p+4, "%[^;]", bestMove);
 	} else *bestMove = NULLCHAR;
+	if((strchr(line, ';')) && (p = strstr(line, " am "))) { // EPD with avoid move
+	    sscanf(p+4, "%[^;]", avoidMove);
+	} else *avoidMove = NULLCHAR;
     } else {
 	(void) fgets(line, MSG_SIZ, f);
 	(void) fgets(line, MSG_SIZ, f);
@@ -14995,6 +15024,7 @@ TwoMachinesEvent P((void))
       ScheduleDelayedEvent(TwoMachinesEventIfReady, 10);
       return;
     }
+  if(!appData.epd) {
     if(WaitForEngine(&second, TwoMachinesEventIfReady)) return; // (if needed:) started up second engine, so wait for features
 
     if(!SupportedVariant(second.variants, gameInfo.variant, gameInfo.boardWidth,
@@ -15013,6 +15043,7 @@ TwoMachinesEvent P((void))
       ScheduleDelayedEvent(TwoMachinesEventIfReady, 10);
       return;
     }
+  }
     GetTimeMark(&now); // [HGM] matchpause: implement match pause after engine load
     if(appData.matchPause>10000 || appData.matchPause<10)
                 appData.matchPause = 10000; /* [HGM] make pause adjustable */
@@ -15024,6 +15055,7 @@ TwoMachinesEvent P((void))
     // we are now committed to starting the game
     stalling = 0;
     DisplayMessage("", "");
+  if(!appData.epd) {
     if (startedFromSetupPosition) {
 	SendBoard(&second, backwardMostMove);
     if (appData.debugMode) {
@@ -15033,6 +15065,7 @@ TwoMachinesEvent P((void))
     for (i = backwardMostMove; i < forwardMostMove; i++) {
 	SendMoveToProgram(i, &second);
     }
+  }
 
     gameMode = TwoMachinesPlay;
     pausing = startingEngine = FALSE;
@@ -15051,11 +15084,13 @@ TwoMachinesEvent P((void))
       snprintf(buf, MSG_SIZ, "name %s\n", second.tidy);
       SendToProgram(buf, &first);
     }
+  if(!appData.epd) {
     SendToProgram(second.computerString, &second);
     if (second.sendName) {
       snprintf(buf, MSG_SIZ, "name %s\n", first.tidy);
       SendToProgram(buf, &second);
     }
+  }
 
     ResetClocks();
     if (!first.sendTime || !second.sendTime) {