Change rounding to use a more general flooring approach

This commit is contained in:
Dean Herbert 2021-03-26 13:06:30 +09:00
parent 77888ae640
commit 6a7f926168
2 changed files with 7 additions and 4 deletions

View File

@ -12,7 +12,7 @@ namespace osu.Game.Tests.NonVisual
[TestCase(0, "0.00%")] [TestCase(0, "0.00%")]
[TestCase(0.01, "1.00%")] [TestCase(0.01, "1.00%")]
[TestCase(0.9899, "98.99%")] [TestCase(0.9899, "98.99%")]
[TestCase(0.989999, "99.00%")] [TestCase(0.989999, "98.99%")]
[TestCase(0.99, "99.00%")] [TestCase(0.99, "99.00%")]
[TestCase(0.9999, "99.99%")] [TestCase(0.9999, "99.99%")]
[TestCase(0.999999, "99.99%")] [TestCase(0.999999, "99.99%")]

View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System;
using Humanizer; using Humanizer;
namespace osu.Game.Utils namespace osu.Game.Utils
@ -14,9 +15,11 @@ namespace osu.Game.Utils
/// <returns>formatted accuracy in percentage</returns> /// <returns>formatted accuracy in percentage</returns>
public static string FormatAccuracy(this double accuracy) public static string FormatAccuracy(this double accuracy)
{ {
// we don't ever want to show 100% when the accuracy is below perfect, even if it rounds to 100%. // for the sake of display purposes, we don't want to show a user a "rounded up" percentage to the next whole number.
if (accuracy < 1 && accuracy > 0.9999) // ie. a score which gets 89.99999% shouldn't ever show as 90%.
accuracy = 0.9999; // the reasoning for this is that cutoffs for grade increases are at whole numbers and displaying the required
// percentile with a non-matching grade is confusing.
accuracy = Math.Floor(accuracy * 10000) / 10000;
return $"{accuracy:0.00%}"; return $"{accuracy:0.00%}";
} }