move jack stuff to vectors

Author: MinaciousGrace

src/Etterna/MinaCalc/MinaCalc.cpp

@@ -59,8 +59,8 @@ TotalMaxPoints(const Calc& calc) -> float
 
 auto
 Calc::CalcMain(const vector<NoteInfo>& NoteInfo,
-			   float music_rate,
-			   float score_goal) -> vector<float>
+			   const float music_rate,
+			   const float score_goal) -> vector<float>
 {
 	// in flux
 	const auto grindscaler =
@@ -296,26 +296,36 @@ jackloss(const float& x, Calc& calc, const int& hi) -> float
 {
 	auto total = 0.F;
 
-	// interval loop
-	for (auto itv = 0; itv < calc.numitv; ++itv) {
-		auto itv_total = 0.F;
-
-		// rows per interval now
-		for (auto row = 0; row < calc.itv_jack_diff_size.at(hi).at(itv);
-			 ++row) {
-			const auto& y = calc.jack_diff.at(hi).at(itv).at(row);
-
-			if (x < y && y > 0.F) {
-				const float row_loss = hit_the_road(x, y);
-				itv_total += row_loss > 0.F ? row_loss : 0.F;
-			}
+	for (const auto& y : calc.jack_diff.at(hi)) {
+		if (x < y && y > 0.F) {
+			const auto zzerp = hit_the_road(x, y);
+			calc.jack_loss.at(hi).push_back(zzerp);
+			total += zzerp;
 		}
-
-		// this is per _interval_, but calculated by row scanning
-		calc.jack_loss.at(hi).at(itv) = itv_total;
-		total += itv_total;
 	}
+
 	return total;
+
+	//// interval loop
+	// for (auto itv = 0; itv < calc.numitv; ++itv) {
+	//	auto itv_total = 0.F;
+
+	//	// rows per interval now
+	//	for (auto row = 0; row < calc.itv_jack_diff_size.at(hi).at(itv);
+	//		 ++row) {
+	//		const auto& y = calc.jack_diff.at(hi).at(itv).at(row);
+
+	//		if (x < y && y > 0.F) {
+	//			const float row_loss = hit_the_road(x, y);
+	//			itv_total += row_loss > 0.F ? row_loss : 0.F;
+	//		}
+	//	}
+
+	//	// this is per _interval_, but calculated by row scanning
+	//	calc.jack_loss.at(hi).at(itv) = itv_total;
+	//	total += itv_total;
+	//}
+	// return total;
 }
 
 // debug bool here is NOT the one in Calc, it is passed from chisel

src/Etterna/MinaCalc/MinaCalc.h

@@ -138,16 +138,13 @@ class Calc
 	 * but that might just be too confusing idk */
 	std::array<float, max_intervals> stam_adj_diff{};
 
-	std::array<std::array<std::array<float, max_rows_for_single_interval>,
-						  max_intervals>,
-			   num_hands>
-	  jack_diff{};
+	std::array<std::vector<float>, num_hands> jack_diff{};
 
 	// number of jacks by hand for intervals
-	std::array<std::array<int, max_intervals>, num_hands> itv_jack_diff_size{};
+	// std::array<std::array<int, max_intervals>, num_hands>
+	// itv_jack_diff_size{};
 
-	// we may want to store this value for use in other skillset passes- maybe
-	std::array<std::array<float, max_intervals>, num_hands> jack_loss{};
+	std::array<std::vector<float>, num_hands> jack_loss{};
 
 	// base techdifficulty per row of current interval being scanned
 	std::array<float, max_rows_for_single_interval> tc_static{};

src/Etterna/MinaCalc/MinaCalcHelpers.h

@@ -67,14 +67,13 @@ set_jack_diff_debug(Calc& calc, const int& hi)
 		float diff_total = 0.F;
 		int counter = 0;
 
-		// rows per interval now
-		for (int row = 0; row < calc.itv_jack_diff_size.at(hi).at(itv); ++row) {
-			diff_total += calc.jack_diff.at(hi).at(itv).at(row);
-			++counter;
-		}
+		//// rows per interval now
+		// for (int row = 0; row < calc.itv_jack_diff_size.at(hi).at(itv);
+		// ++row) { 	diff_total += calc.jack_diff.at(hi).at(itv).at(row);
+		//	++counter;
+		//}
 
 		// technically this is kind of a waste of an array but whatever
-		calc.soap.at(hi)[JackBase].at(itv) =
-		  counter > 0 ? diff_total / static_cast<float>(counter) : 0.F;
+		calc.soap.at(hi)[JackBase].at(itv) = 1.F;
 	}
 }

src/Etterna/MinaCalc/Ulbu.h

@@ -321,9 +321,9 @@ struct TheGreatBazoinkazoinkInTheSky
 	{
 		// jack speed updates with highest anchor difficulty seen
 		// _between either column_ for _this row_
-		_calc.jack_diff.at(hand).at(itv).at(jack_counter) =
+		_calc.jack_diff.at(hand).push_back(
 		  ms_to_scaled_nps(_seq._as.get_lowest_anchor_ms()) *
-		  basescalers[Skill_JackSpeed];
+		  basescalers[Skill_JackSpeed]);
 
 		// tech updates with a convoluted mess of garbage
 		_diffz._tc.advance_base(_seq, ct, _calc);
@@ -359,6 +359,9 @@ struct TheGreatBazoinkazoinkInTheSky
 			auto ct = col_init;
 			full_hand_reset();
 
+			// arrays are super bug prone with jacks so try vectors for now
+			_calc.jack_diff.at(hand).clear();
+
 			nps::actual_cancer(_calc, hand);
 
 			// maybe we _don't_ want this smoothed before the tech pass? and so
@@ -429,7 +432,7 @@ struct TheGreatBazoinkazoinkInTheSky
 				}
 
 				// maybe this should go back into the diffz object...
-				_calc.itv_jack_diff_size.at(hand).at(itv) = jack_counter;
+				// _calc.itv_jack_diff_size.at(hand).at(itv) = jack_counter;
 
 				handle_dependent_interval_end(itv);
 			}