get setup to operate both calcs side by side for testing purposes

jameskr97 · Jun 5, 2017 · dfb13f9 · dfb13f9
1 parent 22f2f72
commit dfb13f9
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 2 deletions.
diff --git a/extern/MinaCalc/MinaCalc.lib b/extern/MinaCalc/MinaCalc.lib
diff --git a/src/MinaCalc.h b/src/MinaCalc.h
@@ -159,4 +159,4 @@ MINACALC_API vector<float> MinaSDCalc(const vector<NoteInfo>& NoteInfo, int numT
 MINACALC_API MinaSD MinaSDCalc(const vector<NoteInfo>& NoteInfo, int numTracks, float goal, float timingscale, bool negbpms);
 MINACALC_API int GetCalcVersion();
 MINACALC_API string GenerateWeakValidationKey(const int* tns, const int* hns);
-MINACALC_API string MinaCalc2(MinaSD& output, vector<NoteInfo>& NoteInfo, float musicrate, float goal);
+MINACALC_API string MinaCalc2(MinaSD& output, vector<NoteInfo2>& NoteInfo, float musicrate, float goal);
diff --git a/src/NoteData.cpp b/src/NoteData.cpp
@@ -214,6 +214,31 @@ const vector<NoteInfo>& NoteData::SerializeNoteData(const vector<float>& etaner)
 	return SerializedNoteData;
 }
 
+vector<NoteInfo2>& NoteData::SerializeNoteData2(const vector<float>& etaner) {
+	SerializedNoteData2.reserve(NonEmptyRowVector.size());
+
+	int tracks = GetNumTracks();
+	for (size_t i = 0; i < NonEmptyRowVector.size(); i++)
+	{
+		int rowNotes = 0;
+		for (size_t q = 0; q < tracks; q++)
+		{
+			if (GetTapNote(q, NonEmptyRowVector[i]).IsNote())
+			{
+				rowNotes |= 1 << q;
+			}
+		}
+
+		if (rowNotes != 0)
+		{
+			NoteInfo2 rowOutput{ rowNotes, static_cast<int>(etaner[i] * 10000.f)};
+			SerializedNoteData2.emplace_back(rowOutput);
+		}
+	}
+
+	return SerializedNoteData2;
+}
+
 void NoteData::LogNonEmptyRows() {
 	NonEmptyRowVector.clear();
 	FOREACH_NONEMPTY_ROW_ALL_TRACKS(*this, row)

diff --git a/src/NoteData.h b/src/NoteData.h
@@ -165,6 +165,7 @@ class NoteData
 	// Mina stuf
 	vector<int> NonEmptyRowVector;
 	vector<NoteInfo> SerializedNoteData;
+	vector<NoteInfo2> SerializedNoteData2;
 
 public:
 	void Init();
@@ -173,10 +174,12 @@ class NoteData
 	void LogNonEmptyRows();
 	void UnsetNerv() { vector<int> tmp; NonEmptyRowVector.swap(tmp); }
 	void UnsetSerializedNoteData() { vector<NoteInfo> tmp; SerializedNoteData.swap(tmp); }
+	void UnsetSerializedNoteData2() { vector<NoteInfo2> tmp; SerializedNoteData2.swap(tmp); }
 	const vector<int>& BuildAndGetNerv() { LogNonEmptyRows(); return NonEmptyRowVector; }
 	int WifeTotalScoreCalc(TimingData *td, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW);
 	vector<int>& GetNonEmptyRowVector() { return NonEmptyRowVector; };
 	const vector<NoteInfo>& SerializeNoteData(const vector<float>& etaner);
+	vector<NoteInfo2>& SerializeNoteData2(const vector<float>& etaner);
 
 	int GetNumTracks() const { return m_TapNotes.size(); }
 	void SetNumTracks( int iNewNumTracks );

diff --git a/src/NoteDataStructures.h b/src/NoteDataStructures.h
@@ -8,5 +8,10 @@ struct NoteInfo {
 	float rowTime;
 };
 
+struct NoteInfo2 {
+	int notes;
+	int rowTime;
+};
+
 #endif 
 
diff --git a/src/Steps.cpp b/src/Steps.cpp
@@ -384,12 +384,18 @@ void Steps::CalcEtternaMetadata() {
 	const vector<float>& etaner = GetTimingData()->BuildAndGetEtaner(nerv);
 
 	stuffnthings = MinaSDCalc(GetNoteData().SerializeNoteData(etaner), GetNoteData().GetNumTracks(), 0.93f, 1.f, GetTimingData()->HasWarps());
+	vector<NoteInfo2> hoop = GetNoteData().SerializeNoteData2(etaner);
+
+	if (GetNoteData().GetNumTracks() == 4 && GetTimingData()->HasWarps() == false)
+		MinaCalc2(stuffnthings, hoop, 1.f, 0.93f);
+
 	ChartKey = GenerateChartKey(*m_pNoteData, GetTimingData());
 	for (int i = 0; i < 8; ++i)
 		SONGMAN->keyconversionmap.emplace(GenerateBustedChartKey(*m_pNoteData, GetTimingData(), i), ChartKey);
 
 	m_pNoteData->UnsetNerv();
 	m_pNoteData->UnsetSerializedNoteData();
+	m_pNoteData->UnsetSerializedNoteData2();
 	GetTimingData()->UnsetEtaner();
 }
 

diff --git a/src/Steps.h b/src/Steps.h
@@ -165,7 +165,7 @@ class Steps
 	data and timingdata in conjuction. Do it during load and save it in the steps data so
 	that we have to do it as few times as possible.*/
 	const string& GetChartKey() const { return ChartKey; }
-	vector<float> thestuffs = { 0.f,0.f,0.f,0.f,0.f };
+	vector<float> thestuffs = { 0.f,0.f,0.f,0.f,0.f,0.f,0.f,0.f };
 	MinaSD stuffnthings = { thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs, thestuffs };
 	void SetChartKey(const RString &k) { ChartKey = k; }
 	void SetAllMSD(const MinaSD &msd) { stuffnthings = msd; }