Skip to content
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

Jump to bottom

Stability weighting of highest strains in mania #2449

Closed
wants to merge 6 commits into from
Closed

Stability weighting of highest strains in mania #2449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7f08840
Stability weighting of highest strains in mania
AdrienBoitelle Apr 24, 2018
e452112
Whitespace ?
AdrienBoitelle Apr 24, 2018
792cd3f
Cleaner constants
AdrienBoitelle Apr 24, 2018
4eeae0b
constant naming rules
AdrienBoitelle Apr 24, 2018
1ba7672
More in depth explanation of constants
AdrienBoitelle Apr 24, 2018
feff1e2
Merge branch 'master' into master
Adrriii Apr 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
103 changes: 103 additions & 0 deletions osu.Game.Rulesets.Mania/ManiaDifficultyCalculator.cs
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mods;
using System;
using System.Linq;
using System.Collections.Generic;

namespace osu.Game.Rulesets.Mania
Expand All @@ -31,6 +32,51 @@ internal class ManiaDifficultyCalculator : DifficultyCalculator<ManiaHitObject>
/// </summary>
private readonly List<ManiaHitObjectDifficulty> difficultyHitObjects = new List<ManiaHitObjectDifficulty>();

/// <summary>
/// Number of sections to keep in memory for calculating average strain. 1 = 400ms
/// 150 = 60 seconds
/// </summary>
private const int memory = 150;

/// <summary>
/// Strain over AverageStrain factor threshold for applying a stability penalty
/// Increasing this value will add more leniency towards harder than normal patterns
/// </summary>
private const double overweight_factor = 1.4;

/// <summary>
/// Strain over AverageStrain factor minimum for not applying a stability penalty
/// Increasing this value will give more penalty for easier than normal patterns
/// </summary>
private const double underweight_factor = 0.7;


/// <summary>
/// The highest stability strain factor that can be applied
/// Increasing this value will encourage stable parts of the map
/// </summary>
private const double max_stability = 1.12;

/// <summary>
/// The lowest stability strain factor that can be applied
/// Increasing this value will encourage difficulty variation
/// </summary>
private const double min_stability = 0.9;

/// <summary>
/// The pace at which stability will decrease when on an over/underweighted part of the map
/// Increasing this value will result in quicker reaction to stability drop
/// The step is applied after each 400ms section
/// </summary>
private const double stability_step_decrease = 0.04;

/// <summary>
/// The pace at which stability will increase when on an normally weighted part of the map
/// Increasing this value will result in quicker reaction to stability recovery
/// The step is applied after each 400ms section
/// </summary>
private const double stability_step_increase = 0.01;

public ManiaDifficultyCalculator(Beatmap beatmap)
: base(beatmap)
{
Expand Down Expand Up @@ -130,14 +176,71 @@ private double calculateDifficulty()
// Build the weighted sum over the highest strains for each interval
double difficulty = 0;
double weight = 1;

// Averages the map strain, can be used instead of the moving average but needs commenting some code
//double averageStrain = highestStrains.Average(strain => strain);

Queue<double> currentStrains = new Queue<double>();

List<double> factors = new List<double>();

double stability = 1; // Stability base
// Weight strains according to the stability to avoid burst overrating
foreach (double strain in highestStrains)
{
// Use a queue tu keep "memory" seconds of strain
currentStrains.Enqueue(strain);
if (currentStrains.Count > memory)
{
currentStrains.Dequeue();
}
// Average those
double averageStrain = currentStrains.Average();

double factor = strain / averageStrain;

// Move the stability according to our constants
if (factor > overweight_factor)
{
stability -= stability_step_decrease;
}
else
if (factor < underweight_factor)
{
stability -= stability_step_decrease;
}
else
{
stability += stability_step_increase;
}

// The stability is capped
if (stability > max_stability) { stability = max_stability; }
if (stability < min_stability) { stability = min_stability; }

// Add difficulty according to strain and stability
factors.Add(stability);
}

// Apply stability to each strains - CAN be improved I'm sure
// The best would be applying it while going though the previous block
int index = 0;
foreach (double stabilityFactor in factors)
{
highestStrains[index] *= stabilityFactor;
index++;
}

highestStrains.Sort((a, b) => b.CompareTo(a)); // Sort from highest to lowest strain.

// Weighted sum
foreach (double strain in highestStrains)
{
difficulty += weight * strain;
weight *= decay_weight;
}


return difficulty;
}

Expand Down
52 changes: 26 additions & 26 deletions osu.Game/osu.nuspec
View file
Open in desktop
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>osulazer</id>
<version>0.0.0</version>
<title>osulazer</title>
<authors>ppy Pty Ltd</authors>
<owners>Dean Herbert</owners>
<projectUrl>https://osu.ppy.sh/</projectUrl>
<iconUrl>https://puu.sh/tYyXZ/9a01a5d1b0.ico</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>click the circles. to the beat.</description>
<summary>click the circles.</summary>
<releaseNotes>testing</releaseNotes>
<copyright>Copyright ppy Pty Ltd 2007-2018</copyright>
<language>en-AU</language>
</metadata>
<files>
<file src="*.exe" target="lib\net45\" exclude="**vshost**"/>
<file src="*.dll" target="lib\net45\"/>
<file src="*.config" target="lib\net45\"/>
<file src="x86\*.dll" target="lib\net45\x86\"/>
<file src="x64\*.dll" target="lib\net45\x64\"/>
</files>
</package>
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>osulazer</id>
<version>0.0.0</version>
<title>osulazer</title>
<authors>ppy Pty Ltd</authors>
<owners>Dean Herbert</owners>
<projectUrl>https://osu.ppy.sh/</projectUrl>
<iconUrl>https://puu.sh/tYyXZ/9a01a5d1b0.ico</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>click the circles. to the beat.</description>
<summary>click the circles.</summary>
<releaseNotes>testing</releaseNotes>
<copyright>Copyright ppy Pty Ltd 2007-2018</copyright>
<language>en-AU</language>
</metadata>
<files>
<file src="*.exe" target="lib\net45\" exclude="**vshost**"/>
<file src="*.dll" target="lib\net45\"/>
<file src="*.config" target="lib\net45\"/>
<file src="x86\*.dll" target="lib\net45\x86\"/>
<file src="x64\*.dll" target="lib\net45\x64\"/>
</files>
</package>

16 changes: 8 additions & 8 deletions osu.licenseheader
View file
Open in desktop
@@ -1,9 +1,9 @@
extensions: .cs
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
extensions: .xml .config .xsd
<!--
Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
extensions: .cs
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

extensions: .xml .config .xsd
<!--
Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->