Skip to content

Move error function from osu.Game.Utils to osu.Game.Rulesets.Difficulty.Utils #31520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 17, 2025
Merged

Move error function from osu.Game.Utils to osu.Game.Rulesets.Difficulty.Utils #31520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac8013e
Move error function implementation to osu.Game.Rulesets.Difficulty.Utils
Natelytle Jan 14, 2025
4fe9108
I'm not commit farming i promise
Natelytle Jan 14, 2025
351a895
Rename ErrorFunction.cs to DifficultyCalculationUtils_ErrorFunction.cs
Natelytle Jan 17, 2025
c128689
Merge branch 'pp-dev' into move-error-function
tsunyoku Jan 17, 2025
319b823
Merge branch 'pp-dev' into move-error-function
stanriders Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Rulesets.Scoring;
using osu.Game.Scoring;
using osu.Game.Utils;

namespace osu.Game.Rulesets.Osu.Difficulty
{
Expand Down Expand Up @@ -371,10 +370,10 @@ private double computeFlashlightValue(ScoreInfo score, OsuDifficultyAttributes a

// Compute the deviation assuming greats and oks are normally distributed, and mehs are uniformly distributed.
// Begin with greats and oks first. Ignoring mehs, we can be 99% confident that the deviation is not higher than:
double deviation = hitWindowGreat / (Math.Sqrt(2) * SpecialFunctions.ErfInv(pLowerBound));
double deviation = hitWindowGreat / (Math.Sqrt(2) * DifficultyCalculationUtils.ErfInv(pLowerBound));

double randomValue = Math.Sqrt(2 / Math.PI) * hitWindowOk * Math.Exp(-0.5 * Math.Pow(hitWindowOk / deviation, 2))
/ (deviation * SpecialFunctions.Erf(hitWindowOk / (Math.Sqrt(2) * deviation)));
/ (deviation * DifficultyCalculationUtils.Erf(hitWindowOk / (Math.Sqrt(2) * deviation)));

deviation *= Math.Sqrt(1 - randomValue);

Expand Down
6 changes: 3 additions & 3 deletions osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
using System.Collections.Generic;
using System.Linq;
using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Difficulty.Utils;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.Taiko.Objects;
using osu.Game.Scoring;
using osu.Game.Utils;

namespace osu.Game.Rulesets.Taiko.Difficulty
{
Expand Down Expand Up @@ -99,7 +99,7 @@ private double computeDifficultyValue(ScoreInfo score, TaikoDifficultyAttributes
double accScalingExponent = 2 + attributes.MonoStaminaFactor;
double accScalingShift = 500 - 100 * attributes.MonoStaminaFactor;

return difficultyValue * Math.Pow(SpecialFunctions.Erf(accScalingShift / (Math.Sqrt(2) * estimatedUnstableRate.Value)), accScalingExponent);
return difficultyValue * Math.Pow(DifficultyCalculationUtils.Erf(accScalingShift / (Math.Sqrt(2) * estimatedUnstableRate.Value)), accScalingExponent);
}

private double computeAccuracyValue(ScoreInfo score, TaikoDifficultyAttributes attributes, bool isConvert)
Expand Down Expand Up @@ -139,7 +139,7 @@ private double computeAccuracyValue(ScoreInfo score, TaikoDifficultyAttributes a
double pLowerBound = (n * p + z * z / 2) / (n + z * z) - z / (n + z * z) * Math.Sqrt(n * p * (1 - p) + z * z / 4);

// We can be 99% confident that the deviation is not higher than:
return attributes.GreatHitWindow / (Math.Sqrt(2) * SpecialFunctions.ErfInv(pLowerBound));
return attributes.GreatHitWindow / (Math.Sqrt(2) * DifficultyCalculationUtils.ErfInv(pLowerBound));
}

private int totalHits => countGreat + countOk + countMeh + countMiss;
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Rulesets/Difficulty/Utils/DifficultyCalculationUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace osu.Game.Rulesets.Difficulty.Utils
{
public static class DifficultyCalculationUtils
public static partial class DifficultyCalculationUtils
{
/// <summary>
/// Converts BPM value into milliseconds
Expand Down
7 changes: 2 additions & 5 deletions osu.Game/Utils/SpecialFunctions.cs → ...fficultyCalculationUtils_ErrorFunction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

// All code is referenced from the following:
// https://github.com/mathnet/mathnet-numerics/blob/master/src/Numerics/SpecialFunctions/Erf.cs
// https://github.com/mathnet/mathnet-numerics/blob/master/src/Numerics/Optimization/NelderMeadSimplex.cs

/*
Copyright (c) 2002-2022 Math.NET
Expand All @@ -14,12 +13,10 @@ The above copyright notice and this permission notice shall be included in all c

using System;

namespace osu.Game.Utils
namespace osu.Game.Rulesets.Difficulty.Utils
{
public class SpecialFunctions
public partial class DifficultyCalculationUtils
{
private const double sqrt2_pi = 2.5066282746310005024157652848110452530069867406099d;

/// <summary>
/// **************************************
/// COEFFICIENTS FOR METHOD ErfImp *
Expand Down
Loading