Made knockout work

coolchess123 · coolchess123 · commit 6c4c827bd9a7 · 2019-03-17T16:05:20.000-07:00
diff --git a/projects/cli/src/main.cpp b/projects/cli/src/main.cpp
@@ -143,14 +143,19 @@ void addEngineScore(QVariantMap *engineMap, QString name, int value)
 {
 	if (engineMap->size())
 	{
+		int found = 0;
 		for (QVariantMap::const_iterator iter = engineMap->begin(); iter != engineMap->end(); ++iter) {
 			if (iter.key() == name)
 			{
+				found = 1;
 				int score = iter.value().toInt();
 				score += value;
 				engineMap->insert(name, score);
 			}
 		}
+		if (! found) {
+			engineMap->insert(name, value);
+		}
 	}
 	else
 	{
diff --git a/projects/lib/src/knockouttournament.cpp b/projects/lib/src/knockouttournament.cpp
@@ -71,14 +71,15 @@ QList<int> KnockoutTournament::firstRoundPlayers() const
 	for (int i = seedCount; i < n; i++)
 	{
 		unseeded << i;
+		players << i;
 	}
 
+/*
 	while (!unseeded.isEmpty())
 	{
 		int i = Mersenne::random() % unseeded.size();
-		players << unseeded.takeAt(i);
 	}
-
+*/
 	return players;
 }
 
@@ -108,12 +109,16 @@ void KnockoutTournament::initializePairing()
 			all[byeIndex] = player;
 		}
 		else
-			all[index] = player;
+			all[i] = player;
 	}
 
 	QList<TournamentPair*> pairs;
+	int j = 0;
 	for (int i = 0; i < x; i += 2)
-		pairs.append(pair(all.at(i), all.at(i + 1)));
+	{
+		pairs.append(pair(all.at(j), all.at(x -j - 1)));
+		j++;
+	}
 
 	m_rounds.clear();
 	m_rounds << pairs;
@@ -174,7 +179,20 @@ bool KnockoutTournament::areAllGamesFinished() const
 
 bool KnockoutTournament::shouldWeStopTour() const
 {
-	return m_should_we_stop_global;
+	QString path = "failed.txt";
+
+	if (!fileExists(path))
+	{
+		return m_should_we_stop_global;
+	}
+	else
+	{
+		qWarning () << " \n *************************************************************** \n" << 
+						"         We stopped before game#::" <<
+						"         Look at failed.txt" <<
+						" \n *************************************************************** \n";
+		return true;
+	}
 }
 
 bool KnockoutTournament::shouldWeStop(int iWhite, int iBlack, const TournamentPair* pair) const
@@ -280,6 +298,10 @@ TournamentPair* KnockoutTournament::nextPair(int gameNumber)
 		nextRound << pair(winners.at(i), winners.at(i + 1));
 	}
 	m_rounds << nextRound;
+	if (currentRound() == 1)
+	{
+		return nullptr;
+	}
 	setCurrentRound(currentRound() + 1);
 
 	for (TournamentPair* pair : qAsConst(nextRound))

Original file line number	Diff line number	Diff line change
`@@ -143,14 +143,19 @@ void addEngineScore(QVariantMap *engineMap, QString name, int value)`
`143`	`143`	`{`
`144`	`144`	`if (engineMap->size())`
`145`	`145`	`{`
	`146`	`+ int found = 0;`
`146`	`147`	`for (QVariantMap::const_iterator iter = engineMap->begin(); iter != engineMap->end(); ++iter) {`
`147`	`148`	`if (iter.key() == name)`
`148`	`149`	`{`
	`150`	`+ found = 1;`
`149`	`151`	`int score = iter.value().toInt();`
`150`	`152`	`score += value;`
`151`	`153`	`engineMap->insert(name, score);`
`152`	`154`	`}`
`153`	`155`	`}`
	`156`	`+ if (! found) {`
	`157`	`+ engineMap->insert(name, value);`
	`158`	`+ }`
`154`	`159`	`}`
`155`	`160`	`else`
`156`	`161`	`{`