Skip to content

Commit

Permalink
add rma base to debug output
Browse files Browse the repository at this point in the history
  • Loading branch information
MinaciousGrace committed Jun 23, 2020
1 parent 3e63861 commit 9b1a247
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
6 changes: 6 additions & 0 deletions src/Etterna/Globals/MinaCalc/SequencedBaseDiffCalc.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@ struct techyo
rm_itv_max_diff = max(rm_itv_max_diff, rm_diff);
}

// for debug
[[nodiscard]] inline auto get_itv_rma_diff() const -> float
{
return rm_itv_max_diff;
}

// final output difficulty for this interval, merges base diff, runningman
// anchor diff
[[nodiscard]] inline auto get_itv_diff(const float& nps_base) const -> float
Expand Down
6 changes: 6 additions & 0 deletions src/Etterna/Globals/MinaCalc/Ulbu.h
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,9 @@ struct TheGreatBazoinkazoinkInTheSky
// really silly stuff from becoming outliers
_calc.soap.at(hand)[TechBase].at(itv) =
_diffz._tc.get_itv_diff(_calc.soap.at(hand)[NPSBase].at(itv));

// mostly for debug output.. optimize later
_calc.soap.at(hand)[RMABase].at(itv) = _diffz._tc.get_itv_rma_diff();
}

inline void run_dependent_pmod_loop()
Expand All @@ -350,6 +353,9 @@ struct TheGreatBazoinkazoinkInTheSky
full_hand_reset();

nps::actual_cancer(_calc, hand);

// maybe we _don't_ want this smoothed before the tech pass? and so
// it could be constructed parallel? NEEDS TEST
Smooth(_calc.soap.at(hand).at(NPSBase), 0.F, _calc.numitv);

for (int itv = 0; itv < _calc.numitv; ++itv) {
Expand Down
1 change: 1 addition & 0 deletions src/Etterna/Models/Misc/GameConstantsAndTypes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ static const char* CalcDiffValueNames[] = { "NPSBase",
"JackBase",
// "CJBase",
"TechBase",
"RMABase",
"MSD" };
XToString(CalcDiffValue);
LuaXType(CalcDiffValue);
Expand Down
9 changes: 5 additions & 4 deletions src/Etterna/Models/NoteData/NoteDataStructures.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,11 @@ enum CalcPatternMod
};
enum CalcDiffValue
{
NPSBase, // unadjusted base nps difficulty
JackBase, // unadjusted base ms difficulty
// CJBase, // unadjusted weighted values
TechBase, // pattern and stam adjusted difficulty values
NPSBase,
JackBase,
// CJBase,
TechBase,
RMABase,
MSD,
NUM_CalcDiffValue,
CalcDiffValue_Invalid,
Expand Down

0 comments on commit 9b1a247

Please sign in to comment.