Skip to content

Commit 82ac42c

Browse files
committed
Replace nested ternaries with ifs
1 parent 7852df6 commit 82ac42c

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/Rhythm/Data/SameRhythmHitObjectGrouping.cs

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class SameRhythmHitObjectGrouping : IHasInterval
4545
public readonly double HitObjectIntervalRatio;
4646

4747
/// <inheritdoc/>
48-
public double Interval { get; }
48+
public double Interval { get; } = double.PositiveInfinity;
4949

5050
public SameRhythmHitObjectGrouping(SameRhythmHitObjectGrouping? previous, List<TaikoDifficultyHitObject> hitObjects)
5151
{
@@ -66,23 +66,27 @@ public SameRhythmHitObjectGrouping(SameRhythmHitObjectGrouping? previous, List<T
6666
: 0;
6767

6868
// Calculate the average interval between hitobjects.
69-
HitObjectInterval = normalisedHitObjectDeltaTime.Count > 0
70-
? previous?.HitObjectInterval is double previousDelta && Math.Abs(modalDelta - previousDelta) <= snap_tolerance
71-
? previousDelta
72-
: modalDelta
73-
: null;
69+
if (normalisedHitObjectDeltaTime.Count > 0)
70+
{
71+
if (previous?.HitObjectInterval is double previousDelta && Math.Abs(modalDelta - previousDelta) <= snap_tolerance)
72+
HitObjectInterval = previousDelta;
73+
else
74+
HitObjectInterval = modalDelta;
75+
}
7476

7577
// Calculate the ratio between this group's interval and the previous group's interval
7678
HitObjectIntervalRatio = previous?.HitObjectInterval is double previousInterval && HitObjectInterval is double currentInterval
7779
? currentInterval / previousInterval
7880
: 1.0;
7981

8082
// Calculate the interval from the previous group's start time
81-
Interval = previous == null
82-
? double.PositiveInfinity
83-
: Math.Abs(StartTime - previous.StartTime) <= snap_tolerance
84-
? 0
85-
: StartTime - previous.StartTime;
83+
if (previous != null)
84+
{
85+
if (Math.Abs(StartTime - previous.StartTime) <= snap_tolerance)
86+
Interval = 0;
87+
else
88+
Interval = StartTime - previous.StartTime;
89+
}
8690
}
8791
}
8892
}

0 commit comments

Comments
 (0)