fix knockout restart

coolchess123 · coolchess123 · commit 285b08f6f484 · 2019-04-30T16:26:47.000-07:00
diff --git a/projects/lib/src/knockouttournament.cpp b/projects/lib/src/knockouttournament.cpp
@@ -242,6 +242,24 @@ bool KnockoutTournament::procceedNextGame() const
 {
 }
 
+bool KnockoutTournament::resetBook(const TournamentPair* pair) const
+{
+	// Second player is a BYE
+	if (!pair->isValid())
+		return false;
+
+	const int iWhite = pair->firstPlayer();
+	const int iBlack = pair->secondPlayer();
+	int firstScore  = pair->firstScore() + Tournament::playerAt(iWhite).builder()->resumescore();
+	int secondScore = pair->secondScore() + Tournament::playerAt(iBlack).builder()->resumescore();
+
+	if ((firstScore == secondScore) && (!firstScore))
+	{
+		return true;
+	}
+	return false;
+}
+
 bool KnockoutTournament::needMoreGames(const TournamentPair* pair) const
 {
 	// Second player is a BYE
diff --git a/projects/lib/src/knockouttournament.h b/projects/lib/src/knockouttournament.h
@@ -55,6 +55,7 @@ class LIB_EXPORT KnockoutTournament : public Tournament
       virtual bool procceedNextGame() const;
       virtual bool shouldWeStop(int white, int black, const TournamentPair* pair) const;
       virtual bool shouldWeStopTour() const;
+      virtual bool resetBook(const TournamentPair* pair) const;
       bool m_should_we_stop;
 
 	private:
diff --git a/projects/lib/src/tournament.cpp b/projects/lib/src/tournament.cpp
@@ -448,6 +448,11 @@ bool Tournament::fileExists(QString path) const
     }
 }
 
+bool Tournament::resetBook(const TournamentPair* pair) const
+{
+	return false;
+}
+
 bool Tournament::shouldWeStopTour() const
 {
    QString path = "failed.txt";
@@ -747,6 +752,7 @@ void Tournament::startNextGame()
 		return;
 
 	bool needToStop = false;
+	bool needtoResetBook = false;
 	for (;;)
 	{
 		needToStop = shouldWeStopTour();
@@ -766,7 +772,9 @@ void Tournament::startNextGame()
 			break;
 		}
 
-		if (!pair->hasSamePlayers(m_pair) && m_players.size() > 2)
+		needtoResetBook = resetBook(pair);
+		qWarning () << "CAlling resetBook ,needtoResetBook:" << needtoResetBook;
+		if (needtoResetBook || ((!pair->hasSamePlayers(m_pair) && m_players.size() > 2)))
 		{
 			m_startFen.clear();
 			m_openingMoves.clear();
diff --git a/projects/lib/src/tournament.h b/projects/lib/src/tournament.h
@@ -475,7 +475,8 @@ class LIB_EXPORT Tournament : public QObject
 		virtual bool hasGauntletRatingsOrder() const;
 		virtual bool shouldWeStop(int white, int black, const TournamentPair* pair) const;
 		virtual bool shouldWeStopTour() const;
-      virtual bool fileExists(QString path) const;
+		virtual bool resetBook(const TournamentPair* pair) const;
+		virtual bool fileExists(QString path) const;
 
 
 	private slots:

Original file line number	Diff line number	Diff line change
`@@ -448,6 +448,11 @@ bool Tournament::fileExists(QString path) const`
`448`	`448`	`}`
`449`	`449`	`}`
`450`	`450`
	`451`	`+bool Tournament::resetBook(const TournamentPair* pair) const`
	`452`	`+{`
	`453`	`+ return false;`
	`454`	`+}`
	`455`	`+`
`451`	`456`	`bool Tournament::shouldWeStopTour() const`
`452`	`457`	`{`
`453`	`458`	`QString path = "failed.txt";`
`@@ -747,6 +752,7 @@ void Tournament::startNextGame()`
`747`	`752`	`return;`
`748`	`753`
`749`	`754`	`bool needToStop = false;`
	`755`	`+ bool needtoResetBook = false;`
`750`	`756`	`for (;;)`
`751`	`757`	`{`
`752`	`758`	`needToStop = shouldWeStopTour();`
`@@ -766,7 +772,9 @@ void Tournament::startNextGame()`
`766`	`772`	`break;`
`767`	`773`	`}`
`768`	`774`
`769`		`- if (!pair->hasSamePlayers(m_pair) && m_players.size() > 2)`
	`775`	`+ needtoResetBook = resetBook(pair);`
	`776`	`+ qWarning () << "CAlling resetBook ,needtoResetBook:" << needtoResetBook;`
	`777`	`+ if (needtoResetBook \|\| ((!pair->hasSamePlayers(m_pair) && m_players.size() > 2)))`
`770`	`778`	`{`
`771`	`779`	`m_startFen.clear();`
`772`	`780`	`m_openingMoves.clear();`