actually make top grades sort internally by wife%

etternagame · Jul 8, 2020 · 42ffff0 · 42ffff0
1 parent 6bdbf98
commit 42ffff0
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 160 deletions.
diff --git a/src/Etterna/Actor/Menus/MusicWheel.cpp b/src/Etterna/Actor/Menus/MusicWheel.cpp
@@ -813,7 +813,7 @@ MusicWheel::BuildWheelItemDatas(
 				SongUtil::SortSongPointerArrayByBPM(arraySongs);
 				break;
 			case SORT_TOP_GRADES:
-				SongUtil::SortSongPointerArrayByGrades(arraySongs, true);
+				SongUtil::SortSongPointerArrayByWifeScore(arraySongs);
 				break;
 			case SORT_ARTIST:
 				SongUtil::SortSongPointerArrayByArtist(arraySongs);
@@ -887,11 +887,9 @@ MusicWheel::BuildWheelItemDatas(
 			 * sort. */
 			switch (so) {
 				case SORT_FAVORITES:
+				case SORT_TOP_GRADES:
 				case SORT_BPM:
 					break; // don't sort by section
-				case SORT_TOP_GRADES:
-					SongUtil::SortSongPointerArrayByWifeScore(arraySongs, so);
-					break;
 				default:
 					SongUtil::SortSongPointerArrayBySectionName(arraySongs, so);
 					break;

diff --git a/src/Etterna/Models/Misc/Profile.cpp b/src/Etterna/Models/Misc/Profile.cpp
@@ -164,18 +164,14 @@ Profile::SetDefaultModifiers(const Game* pGameType,
 }
 
 auto
-Profile::GetBestGrade(const Song* pSong, StepsType st) const -> Grade
+Profile::GetBestGrade(const Song* song, const StepsType st) const -> Grade
 {
 	auto gradeBest = Grade_Invalid;
-	if (pSong != nullptr) {
-		auto hasCurrentStyleSteps = false;
-		FOREACH_ENUM_N(Difficulty, 6, i)
-		{
-			auto* pSteps = SongUtil::GetStepsByDifficulty(pSong, st, i);
-			if (pSteps != nullptr) {
-				hasCurrentStyleSteps = true;
+	if (song != nullptr) {
+		for (const auto& s : song->GetAllSteps()) {
+			if (s != nullptr && s->m_StepsType == st) {
 				const auto dcg =
-				  SCOREMAN->GetBestGradeFor(pSteps->GetChartKey());
+				  SCOREMAN->GetBestGradeFor(s->GetChartKey(), m_sProfileID);
 				if (gradeBest >= dcg) {
 					gradeBest = dcg;
 				}
@@ -187,19 +183,15 @@ Profile::GetBestGrade(const Song* pSong, StepsType st) const -> Grade
 }
 
 auto
-Profile::GetBestWifeScore(const Song* pSong, StepsType st) const -> float
+Profile::GetBestWifeScore(const Song* song, const StepsType st) const -> float
 {
 	auto scorebest = 0.F;
-	if (pSong != nullptr) {
-		auto hasCurrentStyleSteps = false;
-		FOREACH_ENUM_N(Difficulty, 6, i)
-		{
-			auto* pSteps = SongUtil::GetStepsByDifficulty(pSong, st, i);
-			if (pSteps != nullptr) {
-				hasCurrentStyleSteps = true;
+	if (song != nullptr) {
+		for (const auto& s : song->GetAllSteps()) {
+			if (s != nullptr && s->m_StepsType == st) {
 				const auto wsb =
-				  SCOREMAN->GetBestWifeScoreFor(pSteps->GetChartKey());
-				if (scorebest >= wsb) {
+				  SCOREMAN->GetBestWifeScoreFor(s->GetChartKey(), m_sProfileID);
+				if (wsb >= scorebest) {
 					scorebest = wsb;
 				}
 			}
@@ -393,7 +385,7 @@ Profile::CalculateStatsFromScores(LoadingWindow* ld)
 	m_iTotalDancePoints = m_iTotalTapsAndHolds * 2;
 	m_iTotalGameplaySeconds = static_cast<int>(TotalGameplaySeconds);
 
-	SCOREMAN->RecalculateSSRs(ld, m_sProfileID);
+	SCOREMAN->RecalculateSSRs(ld);
 	SCOREMAN->CalcPlayerRating(
 	  m_fPlayerRating, m_fPlayerSkillsets, m_sProfileID);
 }

diff --git a/src/Etterna/Models/Misc/Profile.h b/src/Etterna/Models/Misc/Profile.h
@@ -276,8 +276,8 @@ class Profile
 	LuaTable m_UserTable;
 
 	// this actually does use scoreman atm
-	auto GetBestGrade(const Song* pSong, StepsType st) const -> Grade;
-	auto GetBestWifeScore(const Song* pSong, StepsType st) const -> float;
+	auto GetBestGrade(const Song* song, StepsType st) const -> Grade;
+	auto GetBestWifeScore(const Song* song, StepsType st) const -> float;
 
 	// Screenshot Data
 	std::vector<Screenshot> m_vScreenshots;

diff --git a/src/Etterna/Models/Songs/SongUtil.cpp b/src/Etterna/Models/Songs/SongUtil.cpp
@@ -468,67 +468,29 @@ AppendOctal(int n, int digits, std::string& out)
 	}
 }
 
-static bool
-CompDescending(const pair<Song*, int>& a, const pair<Song*, int>& b)
+static auto
+get_best_wife_score_for_song_and_profile(const Song* song, const Profile* p)
+  -> float
 {
-	return a.second < b.second;
+	assert(p != nullptr);
+	return p->GetBestWifeScore(
+	  song,
+	  GAMESTATE->GetCurrentStyle(GAMESTATE->GetMasterPlayerNumber())
+		->m_StepsType);
 }
 
-static bool
-CompAscending(const pair<Song*, int>& a, const pair<Song*, int>& b)
+static int
+CompareSongPointersByBestWifeScore(const Song* a, const Song* b)
 {
-	return a.second > b.second;
+	const auto* p = PROFILEMAN->GetProfile(PLAYER_1);
+	return get_best_wife_score_for_song_and_profile(a, p) >
+		   get_best_wife_score_for_song_and_profile(b, p);
 }
 
 void
-SongUtil::SortSongPointerArrayByGrades(vector<Song*>& vpSongsInOut,
-									   bool bDescending)
-{
-	typedef pair<Song*, int> val;
-	vector<val> vals;
-	vals.reserve(vpSongsInOut.size());
-	const Profile* pProfile = PROFILEMAN->GetProfile(PLAYER_1);
-
-	for (auto* pSong : vpSongsInOut) {
-		ASSERT(pProfile != nullptr);
-		auto g = static_cast<int>(pProfile->GetBestGrade(
-		  pSong,
-		  GAMESTATE->GetCurrentStyle(GAMESTATE->GetMasterPlayerNumber())
-			->m_StepsType));
-		vals.emplace_back(val(pSong, g));
-	}
-
-	sort(
-	  vals.begin(), vals.end(), bDescending ? CompDescending : CompAscending);
-
-	for (unsigned i = 0; i < vpSongsInOut.size(); ++i)
-		vpSongsInOut[i] = vals[i].first;
-}
-
-// do not know why this doesn't work
-void
-SongUtil::SortSongPointerArrayByWifeScore(vector<Song*>& vpSongsInOut,
-										  bool bDescending)
-{
-	typedef pair<Song*, float> val;
-	vector<val> vals;
-	vals.reserve(vpSongsInOut.size());
-	const Profile* pProfile = PROFILEMAN->GetProfile(PLAYER_1);
-
-	for (auto* pSong : vpSongsInOut) {
-		ASSERT(pProfile != nullptr);
-		auto g = static_cast<int>(pProfile->GetBestWifeScore(
-		  pSong,
-		  GAMESTATE->GetCurrentStyle(GAMESTATE->GetMasterPlayerNumber())
-			->m_StepsType));
-		vals.emplace_back(val(pSong, g));
-	}
-
-	sort(
-	  vals.begin(), vals.end(), bDescending ? CompDescending : CompAscending);
-
-	for (unsigned i = 0; i < vpSongsInOut.size(); ++i)
-		vpSongsInOut[i] = vals[i].first;
+SongUtil::SortSongPointerArrayByWifeScore(vector<Song*>& v)
+{
+	sort(v.begin(), v.end(), CompareSongPointersByBestWifeScore);
 }
 
 void

diff --git a/src/Etterna/Models/Songs/SongUtil.h b/src/Etterna/Models/Songs/SongUtil.h
@@ -77,9 +77,7 @@ SortSongPointerArrayByTitle(vector<Song*>& vpSongsInOut);
 void
 SortSongPointerArrayByBPM(vector<Song*>& vpSongsInOut);
 void
-SortSongPointerArrayByGrades(vector<Song*>& vpSongsInOut, bool bDescending);
-void
-SortSongPointerArrayByWifeScore(vector<Song*>& vpSongsInOut, bool bDescending);
+SortSongPointerArrayByWifeScore(vector<Song*>& v);
 void
 SortSongPointerArrayByArtist(vector<Song*>& vpSongsInOut);
 void