diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJ.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJ.h index e1d0ef4a54..b18c57cccd 100644 --- a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJ.h +++ b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJ.h @@ -1,9 +1,5 @@ #pragma once -#include -#include - -#include "Etterna/MinaCalc/PatternModHelpers.h" -#include "Etterna/Models/NoteData/NoteDataStructures.h" +#include "../../PatternModHelpers.h" struct CJMod { @@ -34,7 +30,7 @@ struct CJMod float vibro_flag = 1.F; - const vector> _params{ + const std::vector> _params{ { "min_mod", &min_mod }, { "max_mod", &max_mod }, { "mod_base", &mod_base }, diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJDensity.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJDensity.h index afe6040c36..f4437479ee 100644 --- a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJDensity.h +++ b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJDensity.h @@ -1,9 +1,5 @@ #pragma once -#include -#include -#include - -#include "Etterna/Models/NoteData/NoteDataStructures.h" +#include "../../PatternModHelpers.h" struct CJDensityMod { @@ -22,7 +18,7 @@ struct CJDensityMod float hand_scaler = 0.95F; float quad_scaler = 0.95F; - const vector> _params{ + const std::vector> _params{ { "min_mod", &min_mod }, { "max_mod", &max_mod }, { "base", &base }, diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/FlamJam.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/FlamJam.h index da3028fe8d..10ddeeecf3 100644 --- a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/FlamJam.h +++ b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/FlamJam.h @@ -1,11 +1,6 @@ #pragma once -#include -#include -#include - -#include "Etterna/Models/NoteData/NoteDataStructures.h" -#include "Etterna/MinaCalc/PatternModHelpers.h" -#include "Etterna/MinaCalc/Agnostic/HA_Sequencers/FlamSequencing.h" +#include "../../PatternModHelpers.h" +#include "../HA_Sequencers/FlamSequencing.h" // MAKE FLAM WIDE RANGE? // ^ YES DO THIS @@ -23,7 +18,7 @@ struct FlamJamMod float group_tol = 35.F; float step_tol = 17.5F; - const vector> _params{ + const std::vector> _params{ { "min_mod", &min_mod }, { "max_mod", &max_mod }, { "scaler", &scaler }, diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/HS.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/HS.h index b0103238dc..22425ef0ff 100644 --- a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/HS.h +++ b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/HS.h @@ -1,10 +1,6 @@ #pragma once -#include -#include -#include - -#include "Etterna/MinaCalc/Agnostic/MetaIntervalInfo.h" -#include "Etterna/Models/NoteData/NoteDataStructures.h" +#include "../../PatternModHelpers.h" +#include "../MetaIntervalInfo.h" struct HSMod { @@ -39,7 +35,7 @@ struct HSMod float decay_factor = 0.05F; - const vector> _params{ + const std::vector> _params{ { "min_mod", &min_mod }, { "max_mod", &max_mod }, { "mod_base", &mod_base }, diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/JS.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/JS.h index 9738a7ae9b..46e3b5aec7 100644 --- a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/JS.h +++ b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/JS.h @@ -1,10 +1,5 @@ #pragma once -#include -#include -#include - -#include "Etterna/MinaCalc/PatternModHelpers.h" -#include "Etterna/Models/NoteData/NoteDataStructures.h" +#include "../../PatternModHelpers.h" struct JSMod { @@ -35,7 +30,7 @@ struct JSMod float decay_factor = 0.05F; - const vector> _params{ + const std::vector> _params{ { "min_mod", &min_mod }, { "max_mod", &max_mod }, { "mod_base", &mod_base }, diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/Stream.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/Stream.h index 4240f606b6..0df4dc2c58 100644 --- a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/Stream.h +++ b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/Stream.h @@ -1,10 +1,5 @@ #pragma once -#include -#include -#include - -#include "Etterna/MinaCalc/PatternModHelpers.h" -#include "Etterna/Models/NoteData/NoteDataStructures.h" +#include "../../PatternModHelpers.h" // since the calc skillset balance now operates on +- rather than // just - and then normalization, we will use this to depress the @@ -28,7 +23,7 @@ struct StreamMod float vibro_flag = 1.F; - const vector> _params{ + const std::vector> _params{ { "min_mod", &min_mod }, { "max_mod", &max_mod }, { "prop_buffer", &prop_buffer }, diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/TheThingFinder.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/TheThingFinder.h index 456f8e32c2..c7a8da1649 100644 --- a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/TheThingFinder.h +++ b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/TheThingFinder.h @@ -1,10 +1,6 @@ #pragma once -#include -#include -#include - -#include "Etterna/MinaCalc/PatternModHelpers.h" -#include "Etterna/MinaCalc/Agnostic/HA_Sequencers/ThingSequencing.h" +#include "../../PatternModHelpers.h" +#include "../HA_Sequencers/ThingSequencing.h" // the a things, they are there, we must find them... // probably add a timing check to this as well @@ -24,7 +20,7 @@ struct TheThingLookerFinderThing float step_tol = 17.5F; float scaler = 0.2F; - const vector> _params{ + const std::vector> _params{ { "min_mod", &min_mod }, { "max_mod", &max_mod }, { "base", &base }, @@ -81,7 +77,7 @@ struct TheThingLookerFinderThing2 float step_tol = 17.5F; float scaler = 0.2F; - const vector> _params{ + const std::vector> _params{ { "min_mod", &min_mod }, { "max_mod", &max_mod }, { "base", &base }, diff --git a/src/Etterna/MinaCalc/Agnostic/MetaRowInfo.h b/src/Etterna/MinaCalc/Agnostic/MetaRowInfo.h index 5467cad3f1..ec033e735c 100644 --- a/src/Etterna/MinaCalc/Agnostic/MetaRowInfo.h +++ b/src/Etterna/MinaCalc/Agnostic/MetaRowInfo.h @@ -1,7 +1,7 @@ #pragma once #include "HA_Sequencing.h" #include "MetaIntervalInfo.h" -#include "Etterna/MinaCalc/SequencingHelpers.h" +#include "../SequencingHelpers.h" /* counterpart to metahandinfo */ @@ -69,7 +69,7 @@ struct metaRowInfo ++mitvi.actual_jacks; twas_jack = true; // try to pick up gluts maybe? - if (count > 1 && column_count(last_notes) > 1U) { + if (count > 1 && column_count(last_notes) > 1) { ++mitvi.shared_chord_jacks; } } diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Balance.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Balance.h index 5e29c43269..8f32f3fbbe 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Balance.h +++ b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Balance.h @@ -1,9 +1,5 @@ #pragma once -#include -#include - -#include "Etterna/Models/NoteData/NoteDataStructures.h" -#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h" +#include "../IntervalHandInfo.h" struct BalanceMod { @@ -19,7 +15,7 @@ struct BalanceMod float scaler = 1.F; float other_scaler = 4.F; - const vector> _params{ + const std::vector> _params{ { "min_mod", &min_mod }, { "max_mod", &max_mod }, { "mod_base", &mod_base }, { "buffer", &buffer }, { "scaler", &scaler }, { "other_scaler", &other_scaler }, diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHJ.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHJ.h index 1fb12ef048..fec9c2e65b 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHJ.h +++ b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHJ.h @@ -1,11 +1,6 @@ #pragma once -#include -#include -#include - -#include "Etterna/Models/NoteData/NoteDataStructures.h" -#include "Etterna/MinaCalc/Dependent/MetaIntervalHandInfo.h" -#include "Etterna/MinaCalc/Dependent/HD_Sequencers/OHJSequencing.h" +#include "../IntervalHandInfo.h" +#include "../HD_Sequencers/OHJSequencing.h" /* initially copied from ohj but the logic should probably be adjusted on * multiple levels */ diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Chaos.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Chaos.h index 51cb80dcb6..2155be03ee 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Chaos.h +++ b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Chaos.h @@ -1,10 +1,5 @@ #pragma once -#include -#include -#include - -#include "Etterna/Models/NoteData/NoteDataStructures.h" -#include "Etterna/MinaCalc/CalcWindow.h" +#include "../IntervalHandInfo.h" // slightly different implementation of the old chaos mod, basically picks up // polyishness and tries to detect awkward transitions @@ -20,7 +15,7 @@ struct ChaosMod float max_mod = 1.05F; float base = -0.1F; - const vector> _params{ + const std::vector> _params{ { "min_mod", &min_mod }, { "max_mod", &max_mod }, { "base", &base }, diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/OHJ.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/OHJ.h index c8a4575124..f1c6578d5a 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/OHJ.h +++ b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/OHJ.h @@ -1,18 +1,10 @@ #pragma once -#include -#include -#include - -#include "Etterna/Models/NoteData/NoteDataStructures.h" -#include "Etterna/MinaCalc/Dependent/MetaIntervalHandInfo.h" -#include "Etterna/MinaCalc/Dependent/HD_Sequencers/OHJSequencing.h" +#include "../MetaIntervalHandInfo.h" +#include "../HD_Sequencers/OHJSequencing.h" struct OHJumpModGuyThing { const CalcPatternMod _pmod = OHJumpMod; - // const vector _dbg = { OHJBaseProp, OHJPropComp, - // OHJSeqComp, - // OHJMaxSeq, OHJCCTaps, OHJHTaps }; const std::string name = "OHJumpMod"; #pragma region params @@ -27,7 +19,7 @@ struct OHJumpModGuyThing float prop_pool = 1.4F; float prop_scaler = 1.F; - const vector> _params{ + const std::vector> _params{ { "min_mod", &min_mod }, { "max_mod", &max_mod }, diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/OHT.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/OHT.h index 8bf5232c40..4420484f59 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/OHT.h +++ b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/OHT.h @@ -1,10 +1,5 @@ #pragma once -#include -#include -#include - -#include "Etterna/Models/NoteData/NoteDataStructures.h" -#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h" +#include "../IntervalHandInfo.h" /* this is complex enough it should probably have its own sequencer, there's * also a fair bit of redundancy between this, wrjt, wrr. Currently this has the @@ -31,7 +26,7 @@ struct OHTrillMod float cv_reset = 1.F; float cv_threshhold = 0.5F; - const vector> _params{ + const std::vector> _params{ { "window_param", &window_param }, { "min_mod", &min_mod }, diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Roll.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Roll.h index 9dd07dc2a7..d7573e0bc1 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Roll.h +++ b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Roll.h @@ -1,11 +1,6 @@ #pragma once -#include -#include -#include - -#include "Etterna/Models/NoteData/NoteDataStructures.h" -#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h" -#include "Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h" +#include "../IntervalHandInfo.h" +#include "../HD_Sequencers/GenericSequencing.h" static const int max_seq_parts = 4; @@ -43,7 +38,7 @@ struct RollMod float cv_reset = 1.F; - const vector> _params{ + const std::vector> _params{ { "window_param", &window_param }, { "min_mod", &min_mod }, diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/RunningMan.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/RunningMan.h index 03a7d22ab3..e7c16216d4 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/RunningMan.h +++ b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/RunningMan.h @@ -1,10 +1,6 @@ #pragma once -#include -#include -#include - -#include "Etterna/MinaCalc/PatternModHelpers.h" -#include "Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h" +#include "../../PatternModHelpers.h" +#include "../HD_Sequencers/RMSequencing.h" /* Unlike other pattern mods runningman sequencing has 2 core purposes, the * primary one involves tracking the anchor speed of a runningman sequence and @@ -60,7 +56,7 @@ struct RunningManMod float max_jack_len = 3.F; float max_anch_len = 5.F; - const vector> _params{ + const std::vector> _params{ { "min_mod", &min_mod }, { "max_mod", &max_mod }, diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/VOHT.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/VOHT.h index 18781b960c..857e59f828 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/VOHT.h +++ b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/VOHT.h @@ -1,10 +1,5 @@ #pragma once -#include -#include -#include - -#include "Etterna/Models/NoteData/NoteDataStructures.h" -#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h" +#include "../IntervalHandInfo.h" /* retuned oht mod focus tuned to for catching vibro trills like bagatelle */ diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeAnchor.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeAnchor.h index c4ab4a15dc..d188070b69 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeAnchor.h +++ b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeAnchor.h @@ -1,10 +1,6 @@ #pragma once -#include -#include - -#include "Etterna/Models/NoteData/NoteDataStructures.h" -#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h" -#include "Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h" +#include "../IntervalHandInfo.h" +#include "../HD_Sequencers/GenericSequencing.h" // general mod, should maybe make cj specific one struct WideRangeAnchorMod @@ -24,7 +20,7 @@ struct WideRangeAnchorMod float diff_max = 8.F; float scaler = 0.1F; - const vector> _params{ + const std::vector> _params{ { "window_param", &window_param }, { "min_mod", &min_mod }, diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeBalance.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeBalance.h index d229417320..c73831809d 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeBalance.h +++ b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeBalance.h @@ -1,9 +1,5 @@ #pragma once -#include -#include - -#include "Etterna/Models/NoteData/NoteDataStructures.h" -#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h" +#include "../IntervalHandInfo.h" // this should mayb track offhand taps like the old behavior did struct WideRangeBalanceMod @@ -23,7 +19,7 @@ struct WideRangeBalanceMod float scaler = 1.F; float other_scaler = 4.F; - const vector> _params{ + const std::vector> _params{ { "window_param", &window_param }, { "min_mod", &min_mod }, diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeJumptrill.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeJumptrill.h index 053e5eabf5..5fe412e4d7 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeJumptrill.h +++ b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeJumptrill.h @@ -1,10 +1,5 @@ #pragma once -#include -#include -#include - -#include "Etterna/Models/NoteData/NoteDataStructures.h" -#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h" +#include "../IntervalHandInfo.h" // big brain stuff static const float wrjt_cv_factor = 3.F; @@ -25,7 +20,7 @@ struct WideRangeJumptrillMod float cv_threshhold = 0.05F; - const vector> _params{ + const std::vector> _params{ { "window_param", &window_param }, { "min_mod", &min_mod }, diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeRoll.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeRoll.h index f3f3a9ff9b..a514174a1f 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeRoll.h +++ b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeRoll.h @@ -1,9 +1,5 @@ #pragma once -#include "Etterna/Models/NoteData/NoteDataStructures.h" -#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h" - -#include -#include +#include "../IntervalHandInfo.h" // ok new plan we will incloop the joomp struct WideRangeRollMod @@ -24,7 +20,7 @@ struct WideRangeRollMod float cv_threshold = 0.35F; float other_cv_threshold = 0.3F; - const vector> _params{ + const std::vector> _params{ { "window_param", &window_param }, { "min_mod", &min_mod }, @@ -52,8 +48,8 @@ struct WideRangeRollMod float hi_im_a_float = 0.F; // WE CAN JUST MOVE THE TIMING CHECK FUNCTIONS INTO CALCWINDOW LUL - vector idk_ms = { 0.F, 0.F, 0.F, 0.F }; - vector seq_ms = { 0.F, 0.F, 0.F }; + std::vector idk_ms = { 0.F, 0.F, 0.F, 0.F }; + std::vector seq_ms = { 0.F, 0.F, 0.F }; float moving_cv = cv_reset; float pmod = min_mod; diff --git a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h index 00e5270faf..3fd9b5865b 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h +++ b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h @@ -1,7 +1,5 @@ #pragma once -#include "Etterna/MinaCalc/CalcWindow.h" - -#include +#include "../../CalcWindow.h" /* Contains generic sequencers passed to metahandinfo to be advanced in the row * loop */ diff --git a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h index 7a179aeb0e..116c756280 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h +++ b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h @@ -1,5 +1,5 @@ #pragma once -#include "Etterna/MinaCalc/Dependent/HD_MetaSequencing.h" +#include "../HD_MetaSequencing.h" static const float rma_diff_scaler = 1.21F; diff --git a/src/Etterna/MinaCalc/Dependent/IntervalHandInfo.h b/src/Etterna/MinaCalc/Dependent/IntervalHandInfo.h index b81412b869..87449a98c4 100644 --- a/src/Etterna/MinaCalc/Dependent/IntervalHandInfo.h +++ b/src/Etterna/MinaCalc/Dependent/IntervalHandInfo.h @@ -1,5 +1,5 @@ #pragma once -#include "Etterna/MinaCalc/CalcWindow.h" +#include "../CalcWindow.h" // accumulates hand specific info across an interval as it's processed by row struct ItvHandInfo diff --git a/src/Etterna/MinaCalc/MinaCalc.cpp b/src/Etterna/MinaCalc/MinaCalc.cpp index 18cae69e26..1a610dcca9 100644 --- a/src/Etterna/MinaCalc/MinaCalc.cpp +++ b/src/Etterna/MinaCalc/MinaCalc.cpp @@ -13,7 +13,6 @@ using std::max; using std::min; using std::pow; -using std::vector; static const std::array, 16> note_mapping = { { { 0U, "----" }, @@ -45,9 +44,9 @@ TotalMaxPoints(const Calc& calc) -> float } auto -Calc::CalcMain(const vector& NoteInfo, +Calc::CalcMain(const std::vector& NoteInfo, const float music_rate, - const float score_goal) -> vector + const float score_goal) -> std::vector { // in flux const auto grindscaler = @@ -67,7 +66,7 @@ Calc::CalcMain(const vector& NoteInfo, // for multi offset passes // const int fo_rizzy = ssr ? 3 : 1; const auto fo_rizzy = 1; - vector> the_hizzle_dizzles(fo_rizzy); + std::vector> the_hizzle_dizzles(fo_rizzy); for (auto WHAT_IS_EVEN_HAPPEN_THE_BOMB = 0; WHAT_IS_EVEN_HAPPEN_THE_BOMB < fo_rizzy; ++WHAT_IS_EVEN_HAPPEN_THE_BOMB) { @@ -85,7 +84,7 @@ Calc::CalcMain(const vector& NoteInfo, MaxPoints = TotalMaxPoints(*this); - vector mcbloop(NUM_Skillset); + std::vector mcbloop(NUM_Skillset); // overall and stam will be left as 0.f by this loop for (auto i = 0; i < NUM_Skillset; ++i) { mcbloop[i] = Chisel(0.1F, 10.24F, score_goal, i, false); @@ -193,9 +192,9 @@ Calc::CalcMain(const vector& NoteInfo, the_hizzle_dizzles[WHAT_IS_EVEN_HAPPEN_THE_BOMB].push_back(bagles); } } - vector yo_momma(NUM_Skillset); + std::vector yo_momma(NUM_Skillset); for (size_t farts = 0; farts < the_hizzle_dizzles[0].size(); ++farts) { - vector girls; + std::vector girls; girls.reserve(the_hizzle_dizzles.size()); for (auto& the_hizzle_dizzle : the_hizzle_dizzles) { girls.push_back(the_hizzle_dizzle[farts]); @@ -298,7 +297,7 @@ JackStamAdjust(const float x, Calc& calc, const int hi) -> std::vector const auto super_stam_ceil = 1.11F; const auto& diff = calc.jack_diff.at(hi); - vector doot(diff.size()); + std::vector doot(diff.size()); for (size_t i = 0; i < diff.size(); i++) { const auto avs1 = avs2; @@ -435,7 +434,7 @@ CalcInternal(float& gotpoints, } auto -Calc::InitializeHands(const vector& NoteInfo, +Calc::InitializeHands(const std::vector& NoteInfo, const float music_rate, const float offset) -> bool { @@ -634,7 +633,7 @@ Calc::Chisel(float player_skill, inline void Calc::InitAdjDiff(Calc& calc, const int& hi) { - static const std::array, NUM_Skillset> pmods_used = { { + static const std::array, NUM_Skillset> pmods_used = { { // overall, nothing, don't handle here {}, @@ -812,7 +811,7 @@ Calc::InitAdjDiff(Calc& calc, const int& hi) } inline void -make_debug_strings(const Calc& calc, vector& debugstrings) +make_debug_strings(const Calc& calc, std::vector& debugstrings) { debugstrings.resize(calc.numitv); @@ -834,10 +833,10 @@ make_debug_strings(const Calc& calc, vector& debugstrings) // Function to generate SSR rating auto -MinaSDCalc(const vector& NoteInfo, +MinaSDCalc(const std::vector& NoteInfo, const float musicrate, const float goal, - Calc* calc) -> vector + Calc* calc) -> std::vector { if (NoteInfo.size() <= 1) { return dimples_the_all_zero_output; @@ -850,7 +849,7 @@ MinaSDCalc(const vector& NoteInfo, // Wrap difficulty calculation for all standard rates auto -MinaSDCalc(const vector& NoteInfo, Calc* calc) -> MinaSD +MinaSDCalc(const std::vector& NoteInfo, Calc* calc) -> MinaSD { MinaSD allrates; const auto lower_rate = 7; @@ -873,12 +872,13 @@ MinaSDCalc(const vector& NoteInfo, Calc* calc) -> MinaSD // Debug output void -MinaSDCalcDebug(const vector& NoteInfo, - const float musicrate, - const float goal, - vector>>>& handInfo, - vector& debugstrings, - Calc& calc) +MinaSDCalcDebug( + const std::vector& NoteInfo, + const float musicrate, + const float goal, + std::vector>>>& handInfo, + std::vector& debugstrings, + Calc& calc) { if (NoteInfo.size() <= 1) { return; diff --git a/src/Etterna/MinaCalc/MinaCalcHelpers.h b/src/Etterna/MinaCalc/MinaCalcHelpers.h index 74cd5529e7..b3e776ceb1 100644 --- a/src/Etterna/MinaCalc/MinaCalcHelpers.h +++ b/src/Etterna/MinaCalc/MinaCalcHelpers.h @@ -10,13 +10,13 @@ static const float default_score_goal = 0.93F; static const float low_acc_cutoff = 0.9F; static const float ssr_goal_cap = 0.965F; -static const vector dimples_the_all_zero_output{ +static const std::vector dimples_the_all_zero_output{ min_rating, min_rating, min_rating, min_rating, min_rating, min_rating, min_rating, min_rating }; // unused atm but would be used for easily identifying scores on joke files -static const vector gertrude_the_all_max_output{ +static const std::vector gertrude_the_all_max_output{ max_rating, max_rating, max_rating, max_rating, max_rating, max_rating, max_rating, max_rating }; @@ -39,7 +39,7 @@ downscale_low_accuracy_scores(const float f, const float sg) -> float // kinda copied and pasted but also kinda use case specific inline auto -AggregateRatings(const vector& skillsets, +AggregateRatings(const std::vector& skillsets, float rating = 0.F, const float res = 10.24F, const int iter = 1.F) -> float diff --git a/src/Etterna/MinaCalc/PatternModHelpers.h b/src/Etterna/MinaCalc/PatternModHelpers.h index 8d97099ddf..141638a13d 100644 --- a/src/Etterna/MinaCalc/PatternModHelpers.h +++ b/src/Etterna/MinaCalc/PatternModHelpers.h @@ -1,4 +1,8 @@ #pragma once +#include "Etterna/Models/NoteData/NoteDataStructures.h" +#include +#include +#include #include #include #include @@ -34,21 +38,21 @@ fastsqrt(float _in) -> float template auto -sum(const vector& v) -> T +sum(const std::vector& v) -> T { return std::accumulate(begin(v), end(v), static_cast(0)); } template auto -mean(const vector& v) -> float +mean(const std::vector& v) -> float { return static_cast(sum(v)) / static_cast(v.size()); } // Coefficient of variation inline auto -cv(const vector& input) -> float +cv(const std::vector& input) -> float { auto sd = 0.F; const auto average = mean(input); diff --git a/src/Etterna/MinaCalc/SequencedBaseDiffCalc.h b/src/Etterna/MinaCalc/SequencedBaseDiffCalc.h index de7931df75..f6fde82b43 100644 --- a/src/Etterna/MinaCalc/SequencedBaseDiffCalc.h +++ b/src/Etterna/MinaCalc/SequencedBaseDiffCalc.h @@ -1,5 +1,5 @@ #pragma once -#include "Etterna/MinaCalc/SequencingHelpers.h" +#include "SequencingHelpers.h" #include /* MS difficulty bases are going to be sequence constructed row by row here, the diff --git a/src/Etterna/MinaCalc/SequencingHelpers.h b/src/Etterna/MinaCalc/SequencingHelpers.h index 395116bdf8..68d79f381c 100644 --- a/src/Etterna/MinaCalc/SequencingHelpers.h +++ b/src/Etterna/MinaCalc/SequencingHelpers.h @@ -60,19 +60,19 @@ ms_to_scaled_nps(const float& ms) -> float } inline auto -max_val(const vector& v) -> int +max_val(const std::vector& v) -> int { return *std::max_element(v.begin(), v.end()); } inline auto -max_val(const vector& v) -> float +max_val(const std::vector& v) -> float { return *std::max_element(v.begin(), v.end()); } inline auto -max_index(const vector& v) -> int +max_index(const std::vector& v) -> int { return static_cast( std::distance(v.begin(), std::max_element(v.begin(), v.end()))); diff --git a/src/Etterna/MinaCalc/Ulbu.h b/src/Etterna/MinaCalc/Ulbu.h index 72b54c907d..28cde78324 100644 --- a/src/Etterna/MinaCalc/Ulbu.h +++ b/src/Etterna/MinaCalc/Ulbu.h @@ -1,7 +1,6 @@ #pragma once // stepmania garbage -#include "Etterna/Globals/global.h" #include "Etterna/FileTypes/XmlFile.h" #include "Etterna/FileTypes/XmlFileUtil.h" #include "RageUtil/File/RageFile.h" @@ -42,7 +41,7 @@ #include "UlbuAcolytes.h" // a new thing -#include "Etterna/MinaCalc/SequencedBaseDiffCalc.h" +#include "SequencedBaseDiffCalc.h" /* I am ulbu, the great bazoinkazoink in the sky, and ulbu does everything, for * ulbu is all. Praise ulbu. */ @@ -446,7 +445,7 @@ struct TheGreatBazoinkazoinkInTheSky #pragma endregion [[nodiscard]] static auto make_mod_param_node( - const vector>& param_map, + const std::vector>& param_map, const std::string& name) -> XNode* { auto* pmod = new XNode(name); @@ -459,7 +458,7 @@ struct TheGreatBazoinkazoinkInTheSky static void load_params_for_mod( const XNode* node, - const vector>& param_map, + const std::vector>& param_map, const std::string& name) { auto boat = 0.F; diff --git a/src/Etterna/MinaCalc/UlbuAcolytes.h b/src/Etterna/MinaCalc/UlbuAcolytes.h index 3c83b53b86..a90d07a608 100644 --- a/src/Etterna/MinaCalc/UlbuAcolytes.h +++ b/src/Etterna/MinaCalc/UlbuAcolytes.h @@ -1,6 +1,4 @@ #pragma once -#include "Etterna/Models/NoteData/NoteDataStructures.h" - #include #include @@ -115,7 +113,7 @@ time_to_itv_idx(const float& time) -> int // checks to see if the noteinfo will fit in our static arrays, if it won't it's // some garbage joke file and we can throw it out, setting values to 0 inline auto -fast_walk_and_check_for_skip(const vector& ni, +fast_walk_and_check_for_skip(const std::vector& ni, const float& rate, Calc& calc, const float& offset = 0.F) -> bool