X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=d169bdbd1b2209c8714378b7699ec488a6d94f5a;hp=706281215112adc4bbd19b40a33d5eb0b578be5a;hb=3a708ad09d26d955393edfedbffdf668c58ccd48;hpb=13ed6ca4807f938eba70592b2cb728cd3b632115

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 7062812..d169bdb 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -341,7 +341,7 @@ void GroupScreen::draw(unsigned char *buf)
 			unsigned y = 540;
 			
 			// see what score this player must beat to lead
-			unsigned lead_beat = 0, win_beat = 0, qualify_beat = 0;
+			unsigned lead_beat = 0, win_beat = 0;
 			for (unsigned i = 0; i < group.players.size(); ++i) {
 				if (group.players[i].id == next_player->id)
 					continue;
@@ -357,13 +357,63 @@ void GroupScreen::draw(unsigned char *buf)
 				win_beat = std::max(win_beat, max_score[i]);
 			}
 
+			/*
+			 * There's a somewhat subtle point here. Normally, what a player would be interested in
+			 * with regard to qualification would be a set of three values:
+			 *
+			 * 1. How much is the absolute minimum required to qualify, given that all others
+			 *    fail?
+			 * 2. How much will give a reasonable chance of qualifying, given the expected performance
+			 *    of all the others?
+			 * 3. How much will be enough to secure qualification, no matter what?
+			 *
+			 * Given perfect guessing, #2 would be "how much is needed to qualify"; however, it is
+			 * completely impossible to give an exact value for that, and we're not into the guessing
+			 * games. :-) #1 is often so low it's completely unrealistic (ie. far enough from #2 that
+			 * it's not interesting), but #3, the most conservative estimate, is often a good measure.
+			 * #3 is "how much is needed to _secure_ qualification", and that is usually what we
+			 * print out when it's possible.
+			 *
+			 * However, in a few situations, #1 and #3 will be the exact same value, from which it
+			 * follows (from the squeeze law, or just common sense :-) ) that #2 will be the same
+			 * value as #1 and #3. (This usually happens near or at the end of a group.) In that
+			 * case, we know the value we seek (ie. "how much is needed to qualify"), so we drop
+			 * the word "secure" and just print it as-is.
+			 *
+			 * To find #1 and #3, we sort and pick out the values we need to beat in the best and
+			 * the worst case.
+			 */
+			int qualify_beat_worst_case = -1, qualify_beat_best_case = -1;
+
+			if (group.num_qualifying > 0) {
+				std::vector<unsigned> tmp;
+				
+				for (unsigned i = 0; i < group.players.size(); ++i) {
+					if (group.players[i].id == next_player->id)
+						continue;
+					tmp.push_back(max_score[i]);
+				}
+				std::sort(tmp.begin(), tmp.end());
+				qualify_beat_worst_case = tmp[tmp.size() - group.num_qualifying];
+				
+				std::vector<unsigned> tmp2;
+				for (unsigned i = 0; i < group.players.size(); ++i) {
+					if (group.players[i].id == next_player->id)
+						continue;
+					tmp2.push_back(min_score[i]);
+				}
+
+				std::sort(tmp2.begin(), tmp2.end());
+				qualify_beat_best_case = tmp2[tmp2.size() - group.num_qualifying];
+			}
+			
 			// print out the lines we can attain
-			if (next_player->total + max_score_this_song > lead_beat) {
+			if (next_player->total + max_score_this_song > lead_beat && (lead_beat != win_beat)) {
 				int lead_need = std::max(lead_beat - next_player->total + 1, 0U);
 				
 				text = widestring("Needs to lead: ") + widestring(pqxx::to_string(lead_need));
-				this_width = my_draw_text(text, NULL, 22.0);
-				my_draw_text(text, buf, 22.0, 400 - this_width/2, y);
+				this_width = my_draw_text(text, NULL, 18.0);
+				my_draw_text(text, buf, 18.0, 400 - this_width/2, y);
 
 				y += 30;
 			}
@@ -373,8 +423,23 @@ void GroupScreen::draw(unsigned char *buf)
 				
 				text = widestring("Needs to win: ") + widestring(pqxx::to_string(win_need));
 
-				this_width = my_draw_text(text, NULL, 22.0);
-				my_draw_text(text, buf, 22.0, 400 - this_width/2, y);
+				this_width = my_draw_text(text, NULL, 18.0);
+				my_draw_text(text, buf, 18.0, 400 - this_width/2, y);
+
+				y += 30;
+			}
+
+			if (next_player->total + max_score_this_song > qualify_beat_worst_case) {
+				int qual_need = std::max(qualify_beat_worst_case - next_player->total + 1, 0U);
+				
+				if (qualify_beat_worst_case == qualify_beat_best_case) {
+					text = widestring("Needs to qualify: ") + widestring(pqxx::to_string(qual_need));
+				} else {
+					text = widestring("Needs to secure qualification: ") + widestring(pqxx::to_string(qual_need));
+				}
+				
+				this_width = my_draw_text(text, NULL, 18.0);
+				my_draw_text(text, buf, 18.0, 400 - this_width/2, y);
 
 				y += 30;
 			}