From 37e30b00bf6d6a494847565036d3538fb1f1e939 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 6 Apr 2021 16:39:02 +0900
Subject: [PATCH] Refactor to keep a consistent API

---
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs  | 32 ++++---------------
 .../Rulesets/Difficulty/Skills/StrainSkill.cs | 13 --------
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index ebd389d823..9f0fb987a7 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -19,12 +19,9 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         protected readonly ReverseQueue<DifficultyHitObject> Previous;
 
         /// <summary>
-        /// Soft capacity of the <see cref="Previous"/> queue.
-        /// <see cref="Previous"/> will automatically resize if it exceeds capacity, but will do so at a very slight performance impact.
-        /// The actual capacity will be set to this value + 1 to allow for storage of the current object before the next can be processed.
-        /// Setting to zero (default) will cause <see cref="Previous"/> to be uninstanciated.
+        /// Number of previous <see cref="DifficultyHitObject"/>s to keep inside the <see cref="Previous"/> queue.
         /// </summary>
-        protected virtual int PreviousCollectionSoftCapacity => 0;
+        protected virtual int HistoryLength => 1;
 
         /// <summary>
         /// Mods for use in skill calculations.
@@ -36,32 +33,17 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         protected Skill(Mod[] mods)
         {
             this.mods = mods;
-
-            if (PreviousCollectionSoftCapacity > 0)
-                Previous = new ReverseQueue<DifficultyHitObject>(PreviousCollectionSoftCapacity + 1);
+            Previous = new ReverseQueue<DifficultyHitObject>(HistoryLength + 1);
         }
 
         internal void ProcessInternal(DifficultyHitObject current)
         {
-            RemoveExtraneousHistory(current);
+            while (Previous.Count > HistoryLength)
+                Previous.Dequeue();
+
             Process(current);
-            AddToHistory(current);
-        }
 
-        /// <summary>
-        /// Remove objects from <see cref="Previous"/> that are no longer needed for calculations from the current object onwards.
-        /// </summary>
-        /// <param name="current">The <see cref="DifficultyHitObject"/> to be processed.</param>
-        protected virtual void RemoveExtraneousHistory(DifficultyHitObject current)
-        {
-        }
-
-        /// <summary>
-        /// Add the current <see cref="DifficultyHitObject"/> to the <see cref="Previous"/> queue (if required).
-        /// </summary>
-        /// <param name="current">The <see cref="DifficultyHitObject"/> that was just processed.</param>
-        protected virtual void AddToHistory(DifficultyHitObject current)
-        {
+            Previous.Enqueue(current);
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
index 16816be35c..71cee36812 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
@@ -20,8 +20,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         protected abstract double SkillMultiplier { get; }
 
-        protected override int PreviousCollectionSoftCapacity => 1;
-
         /// <summary>
         /// Determines how quickly strain decays for the given skill.
         /// For example a value of 0.15 indicates that strain decays to 15% of its original value in one second.
@@ -54,17 +52,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         {
         }
 
-        protected override void RemoveExtraneousHistory(DifficultyHitObject current)
-        {
-            while (Previous.Count > 1)
-                Previous.Dequeue();
-        }
-
-        protected override void AddToHistory(DifficultyHitObject current)
-        {
-            Previous.Enqueue(current);
-        }
-
         /// <summary>
         /// Process a <see cref="DifficultyHitObject"/> and update current strain values accordingly.
         /// </summary>