actually do rates properly with calctest

etternagame · May 13, 2020 · 172bbf8 · 172bbf8
1 parent 68f592d
commit 172bbf8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/Etterna/Models/StepsAndStyles/Steps.cpp b/src/Etterna/Models/StepsAndStyles/Steps.cpp
@@ -419,7 +419,7 @@ Steps::CalcEtternaMetadata()
 }
 
 float
-Steps::DoATestThing(float ev, Skillset ss)
+Steps::DoATestThing(float ev, Skillset ss, float rate)
 {
 	// This is 4k only
 	if (m_StepsType != StepsType_dance_single)
@@ -430,8 +430,8 @@ Steps::DoATestThing(float ev, Skillset ss)
 	const vector<float>& etaner = GetTimingData()->BuildAndGetEtaner(nerv);
 	const vector<NoteInfo>& cereal = m_pNoteData->SerializeNoteData(etaner);
 
-	auto newcalc = MinaSDCalc(cereal, 1.f, 0.93f);
-	auto oldcalc = MinaSDCalc_OLD(cereal, 1.f, 0.93f);
+	auto newcalc = MinaSDCalc(cereal, rate, 0.93f);
+	auto oldcalc = MinaSDCalc_OLD(cereal, rate, 0.93f);
 	LOG->Trace("%+0.2f (%+06.2f%%): %+0.2f %s",
 			   newcalc[0] - ev,
 			   (newcalc[0] - ev) / ev * 100.f,

diff --git a/src/Etterna/Models/StepsAndStyles/Steps.h b/src/Etterna/Models/StepsAndStyles/Steps.h
@@ -211,7 +211,7 @@ class Steps
 													  bool includeoverall);
 
 	void CalcEtternaMetadata();
-	float DoATestThing(float ev, Skillset ss);
+	float DoATestThing(float ev, Skillset ss, float rate);
 	void GetCalcDebugOutput(); // now spits out everything with 1 calc call
 	vector<vector<vector<vector<float>>>>
 	  calcdebugoutput; // probably should clear this periodically

diff --git a/src/Etterna/Screen/Others/ScreenSelectMusic.cpp b/src/Etterna/Screen/Others/ScreenSelectMusic.cpp
@@ -1078,7 +1078,7 @@ ScreenSelectMusic::HandleScreenMessage(const ScreenMessage SM)
 							   SkillsetToString(ss).c_str()));
 					SONGMAN->SaveCalcTestXmlToDir();
 					float woo =
-					  GAMESTATE->m_pCurSteps->DoATestThing(target, ss);
+					  GAMESTATE->m_pCurSteps->DoATestThing(target, ss, 1.f);
 				}
 			} catch (...) {
 				SCREENMAN->SystemMessage("you messed up (input exception)");
@@ -1109,7 +1109,7 @@ ScreenSelectMusic::HandleScreenMessage(const ScreenMessage SM)
 							   rate));
 					SONGMAN->SaveCalcTestXmlToDir();
 					float woo =
-					  GAMESTATE->m_pCurSteps->DoATestThing(target, ss);
+					  GAMESTATE->m_pCurSteps->DoATestThing(target, ss, rate);
 				}
 			} catch (...) {
 				SCREENMAN->SystemMessage("you messed up (input exception)");

diff --git a/src/Etterna/Singletons/SongManager.cpp b/src/Etterna/Singletons/SongManager.cpp
@@ -447,7 +447,7 @@ SongManager::CalcTestStuff()
 			if (StepsByKey.count(chart.first))
 				test_vals[ss].emplace_back(
 				  StepsByKey[chart.first]->DoATestThing(chart.second.first,
-														ss));
+														ss, chart.second.second));
 		}
 	}