diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Evaluators/ColourEvaluator.cs b/osu.Game.Rulesets.Taiko/Difficulty/Evaluators/ColourEvaluator.cs
index 30094dc869..912a02f30e 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Evaluators/ColourEvaluator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Evaluators/ColourEvaluator.cs
@@ -26,25 +26,25 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Evaluators
}
///
- /// Evaluate the difficulty of the first note of a .
+ /// Evaluate the difficulty of the first note of a .
///
- public static double EvaluateDifficultyOf(MonoEncoding encoding)
+ public static double EvaluateDifficultyOf(MonoStreak encoding)
{
return sigmoid(encoding.Index, 2, 2, 0.5, 1) * EvaluateDifficultyOf(encoding.Parent!) * 0.5;
}
///
- /// Evaluate the difficulty of the first note of a .
+ /// Evaluate the difficulty of the first note of a .
///
- public static double EvaluateDifficultyOf(ColourEncoding encoding)
+ public static double EvaluateDifficultyOf(AlternatingMonoPattern encoding)
{
return sigmoid(encoding.Index, 2, 2, 0.5, 1) * EvaluateDifficultyOf(encoding.Parent!);
}
///
- /// Evaluate the difficulty of the first note of a .
+ /// Evaluate the difficulty of the first note of a .
///
- public static double EvaluateDifficultyOf(CoupledColourEncoding encoding)
+ public static double EvaluateDifficultyOf(RepeatingHitPatterns encoding)
{
return 2 * (1 - sigmoid(encoding.RepetitionInterval, 2, 2, 0.5, 1));
}
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/ColourEncoding.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/AlternatingMonoPattern.cs
similarity index 54%
rename from osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/ColourEncoding.cs
rename to osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/AlternatingMonoPattern.cs
index cd39a3d232..bb4ddc73d0 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/ColourEncoding.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/AlternatingMonoPattern.cs
@@ -7,20 +7,20 @@ using osu.Game.Rulesets.Taiko.Objects;
namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour.Data
{
///
- /// Encodes a list of s.
- /// s with the same are grouped together.
+ /// Encodes a list of s.
+ /// s with the same are grouped together.
///
- public class ColourEncoding
+ public class AlternatingMonoPattern
{
///
- /// s that are grouped together within this .
+ /// s that are grouped together within this .
///
- public readonly List Payload = new List();
+ public readonly List Payload = new List();
///
- /// The parent that contains this
+ /// The parent that contains this
///
- public CoupledColourEncoding? Parent;
+ public RepeatingHitPatterns? Parent;
///
/// Index of this encoding within it's parent encoding
@@ -28,10 +28,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour.Data
public int Index;
///
- /// Determine if this is a repetition of another . This
+ /// Determine if this is a repetition of another . This
/// is a strict comparison and is true if and only if the colour sequence is exactly the same.
///
- public bool IsRepetitionOf(ColourEncoding other)
+ public bool IsRepetitionOf(AlternatingMonoPattern other)
{
return HasIdenticalMonoLength(other) &&
other.Payload.Count == Payload.Count &&
@@ -40,9 +40,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour.Data
}
///
- /// Determine if this has the same mono length of another .
+ /// Determine if this has the same mono length of another .
///
- public bool HasIdenticalMonoLength(ColourEncoding other)
+ public bool HasIdenticalMonoLength(AlternatingMonoPattern other)
{
return other.Payload[0].RunLength == Payload[0].RunLength;
}
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/MonoEncoding.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/MonoStreak.cs
similarity index 81%
rename from osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/MonoEncoding.cs
rename to osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/MonoStreak.cs
index 0e998696f9..26175d9559 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/MonoEncoding.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/MonoStreak.cs
@@ -9,19 +9,19 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour.Data
{
///
/// Encode colour information for a sequence of s. Consecutive s
- /// of the same are encoded within the same .
+ /// of the same are encoded within the same .
///
- public class MonoEncoding
+ public class MonoStreak
{
///
- /// List of s that are encoded within this .
+ /// List of s that are encoded within this .
///
public List EncodedData { get; private set; } = new List();
///
- /// The parent that contains this
+ /// The parent that contains this
///
- public ColourEncoding? Parent;
+ public AlternatingMonoPattern? Parent;
///
/// Index of this encoding within it's parent encoding
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/CoupledColourEncoding.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/RepeatingHitPattern.cs
similarity index 59%
rename from osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/CoupledColourEncoding.cs
rename to osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/RepeatingHitPattern.cs
index 3f692e9d3d..91b41b80e7 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/CoupledColourEncoding.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/Data/RepeatingHitPattern.cs
@@ -7,33 +7,33 @@ using System.Collections.Generic;
namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour.Data
{
///
- /// Encodes a list of s, grouped together by back and forth repetition of the same
- /// . Also stores the repetition interval between this and the previous .
+ /// Encodes a list of s, grouped together by back and forth repetition of the same
+ /// . Also stores the repetition interval between this and the previous .
///
- public class CoupledColourEncoding
+ public class RepeatingHitPatterns
{
///
- /// Maximum amount of s to look back to find a repetition.
+ /// Maximum amount of s to look back to find a repetition.
///
private const int max_repetition_interval = 16;
///
- /// The s that are grouped together within this .
+ /// The s that are grouped together within this .
///
- public readonly List Payload = new List();
+ public readonly List Payload = new List();
///
- /// The previous . This is used to determine the repetition interval.
+ /// The previous . This is used to determine the repetition interval.
///
- public readonly CoupledColourEncoding? Previous;
+ public readonly RepeatingHitPatterns? Previous;
///
- /// How many between the current and previous identical .
+ /// How many between the current and previous identical .
/// If no repetition is found this will have a value of + 1.
///
public int RepetitionInterval { get; private set; } = max_repetition_interval + 1;
- public CoupledColourEncoding(CoupledColourEncoding? previous)
+ public RepeatingHitPatterns(RepeatingHitPatterns? previous)
{
Previous = previous;
}
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour.Data
/// Returns true if other is considered a repetition of this encoding. This is true if other's first two payloads
/// have identical mono lengths.
///
- private bool isRepetitionOf(CoupledColourEncoding other)
+ private bool isRepetitionOf(RepeatingHitPatterns other)
{
if (Payload.Count != other.Payload.Count) return false;
@@ -55,8 +55,8 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour.Data
}
///
- /// Finds the closest previous that has the identical .
- /// Interval is defined as the amount of chunks between the current and repeated encoding.
+ /// Finds the closest previous that has the identical .
+ /// Interval is defined as the amount of chunks between the current and repeated encoding.
///
public void FindRepetitionInterval()
{
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour.Data
return;
}
- CoupledColourEncoding? other = Previous;
+ RepeatingHitPatterns? other = Previous;
int interval = 1;
while (interval < max_repetition_interval)
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/TaikoColourDifficultyPreprocessor.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/TaikoColourDifficultyPreprocessor.cs
index 81ba219bc0..5ae659574d 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/TaikoColourDifficultyPreprocessor.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/TaikoColourDifficultyPreprocessor.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour
///
public static void ProcessAndAssign(List hitObjects)
{
- List encodings = encode(hitObjects);
+ List encodings = encode(hitObjects);
// Assign indexing and encoding data to all relevant objects. Only the first note of each encoding type is
// assigned with the relevant encodings.
@@ -33,14 +33,14 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour
// documentation.
for (int i = 0; i < coupledEncoding.Payload.Count; ++i)
{
- ColourEncoding colourEncoding = coupledEncoding.Payload[i];
+ AlternatingMonoPattern colourEncoding = coupledEncoding.Payload[i];
colourEncoding.Parent = coupledEncoding;
colourEncoding.Index = i;
colourEncoding.Payload[0].EncodedData[0].Colour.ColourEncoding = colourEncoding;
for (int j = 0; j < colourEncoding.Payload.Count; ++j)
{
- MonoEncoding monoEncoding = colourEncoding.Payload[j];
+ MonoStreak monoEncoding = colourEncoding.Payload[j];
monoEncoding.Parent = colourEncoding;
monoEncoding.Index = j;
monoEncoding.EncodedData[0].Colour.MonoEncoding = monoEncoding;
@@ -50,24 +50,24 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour
}
///
- /// Encodes a list of s into a list of s.
+ /// Encodes a list of s into a list of s.
///
- private static List encode(List data)
+ private static List encode(List data)
{
- List firstPass = encodeMono(data);
- List secondPass = encodeColour(firstPass);
- List thirdPass = encodeCoupledColour(secondPass);
+ List firstPass = encodeMono(data);
+ List secondPass = encodeColour(firstPass);
+ List thirdPass = encodeCoupledColour(secondPass);
return thirdPass;
}
///
- /// Encodes a list of s into a list of s.
+ /// Encodes a list of s into a list of s.
///
- private static List encodeMono(List data)
+ private static List encodeMono(List data)
{
- List encodings = new List();
- MonoEncoding? currentEncoding = null;
+ List encodings = new List();
+ MonoStreak? currentEncoding = null;
for (int i = 0; i < data.Count; i++)
{
@@ -79,7 +79,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour
// If this is the first object in the list or the colour changed, create a new mono encoding
if (currentEncoding == null || previousObject == null || (taikoObject.BaseObject as Hit)?.Type != (previousObject.BaseObject as Hit)?.Type)
{
- currentEncoding = new MonoEncoding();
+ currentEncoding = new MonoStreak();
encodings.Add(currentEncoding);
}
@@ -91,19 +91,19 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour
}
///
- /// Encodes a list of s into a list of s.
+ /// Encodes a list of s into a list of s.
///
- private static List encodeColour(List data)
+ private static List encodeColour(List data)
{
- List encodings = new List();
- ColourEncoding? currentEncoding = null;
+ List encodings = new List();
+ AlternatingMonoPattern? currentEncoding = null;
for (int i = 0; i < data.Count; i++)
{
// Start a new ColourEncoding if the previous MonoEncoding has a different mono length, or if this is the first MonoEncoding in the list.
if (currentEncoding == null || data[i].RunLength != data[i - 1].RunLength)
{
- currentEncoding = new ColourEncoding();
+ currentEncoding = new AlternatingMonoPattern();
encodings.Add(currentEncoding);
}
@@ -115,17 +115,17 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour
}
///
- /// Encodes a list of s into a list of s.
+ /// Encodes a list of s into a list of s.
///
- private static List encodeCoupledColour(List data)
+ private static List encodeCoupledColour(List data)
{
- List encodings = new List();
- CoupledColourEncoding? currentEncoding = null;
+ List encodings = new List();
+ RepeatingHitPatterns? currentEncoding = null;
for (int i = 0; i < data.Count; i++)
{
// Start a new CoupledColourEncoding. ColourEncodings that should be grouped together will be handled later within this loop.
- currentEncoding = new CoupledColourEncoding(currentEncoding);
+ currentEncoding = new RepeatingHitPatterns(currentEncoding);
// Determine if future ColourEncodings should be grouped.
bool isCoupled = i < data.Count - 2 && data[i].IsRepetitionOf(data[i + 2]);
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/TaikoDifficultyHitObjectColour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/TaikoDifficultyHitObjectColour.cs
index 41080eeb33..708ce8ecd0 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/TaikoDifficultyHitObjectColour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Colour/TaikoDifficultyHitObjectColour.cs
@@ -13,16 +13,16 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour
///
/// The that encodes this note, only present if this is the first note within a
///
- public MonoEncoding? MonoEncoding;
+ public MonoStreak? MonoEncoding;
///
/// The that encodes this note, only present if this is the first note within a
///
- public ColourEncoding? ColourEncoding;
+ public AlternatingMonoPattern? ColourEncoding;
///
/// The that encodes this note, only present if this is the first note within a
///
- public CoupledColourEncoding? CoupledColourEncoding;
+ public RepeatingHitPatterns? CoupledColourEncoding;
}
}