[+&R] 实现音击的T_xxx谱面物量统计计算逻辑。

Starrah · Starrah · commit 71f0b9ac202d · 2026-05-27T14:35:03.000+08:00
同时重构了Mai的Statistics.cs，抽取出一个StatisticsUtils工具类，从而使得mai和ongeki共用相同的CalcHoldJudgeCount逻辑、计算Hold的中间判定个数。
diff --git a/chart/mai/Note.cs b/chart/mai/Note.cs
@@ -45,26 +45,8 @@ protected Note(MaiChart chart, Rational time)
     public virtual string Modifiers => (IsBreak ? "b" : "") + (IsEx ? "x" : "");
 
     // 当前音符落在了哪些BPM区间内、分别有多长。
-    public List<(int bpmIdx, decimal bpm, Rational start, Rational len)> BpmRanges
-    {
-        get
-        {
-            List<(int, decimal, Rational, Rational)> result = [];
-            var now = Time.CanonicalForm;
-            var end = (Time + Duration.Bar).CanonicalForm;
-            var isFirstRange = true; // 通过这个变量和对应的逻辑，确保返回的BpmRanges至少含有一个元素。即使note本身是0长度的，返回的BpmRanges也能有一个len=0的元素。
-            while (now < end || isFirstRange) 
-            {
-                var bpmIdx = Chart.BpmList.FindIndex(now);
-                var curBpmRangeEnd = bpmIdx < Chart.BpmList.Count - 1 ? Chart.BpmList[bpmIdx + 1].Time : 999999; // 当前BPM区间的结束时刻
-                var len = Utils.Min(end, curBpmRangeEnd) - now; // 音符落在本区间内的长度为，从当前时刻开始，到（本区间结束或音符结束的较早者）
-                result.Add((bpmIdx, Chart.BpmList[bpmIdx].Bpm, now, len.CanonicalForm));
-                now = (now + len).CanonicalForm;
-                isFirstRange = false;
-            }
-            return result;
-        }
-    }
+    public List<(int bpmIdx, decimal bpm, Rational start, Rational len)> BpmRanges =>
+        StatisticsUtils.CalcBpmRanges(Time, EndTime, Chart);
     
     internal virtual string DebuggerDisplay() => "";
 
diff --git a/chart/mai/Statistics.cs b/chart/mai/Statistics.cs
@@ -47,14 +47,7 @@ private void AddNote(Note note)
         // T_JUDGE_HLD 原理应该是游戏DLL中的Manager.NotesReader.getProgJudgeGrid。
         // 但是具体的机制研究的也不是太明白，只是尽力实现了下
         if (note is Hold or TouchHold)
-        {
-            var bpmRanges = note.BpmRanges;
-            foreach (var (_, bpm, _, len) in bpmRanges)
-            {
-                var gridSize = new Rational(getProgJudgeGrid(bpm), 384);
-                T_JUDGE_HLD += Math.Max((int)(len / gridSize).Ceil(), 1);
-            }
-        }
+            T_JUDGE_HLD += StatisticsUtils.CalcHoldJudgeCount(note.Time, note.EndTime, note.Chart);
     }
 
     public Statistics(MaiChart chart)
@@ -127,11 +120,4 @@ public override string ToString()
     
     private Rational _now = -1; // 计算双押个数用
     private int _nowFalseEachIndex = 0;
-    
-    private int getProgJudgeGrid(decimal bpm)
-    {
-        if (bpm < 15) return 3;
-        int exp = (int)Math.Min(Math.Floor(Math.Log2((double)bpm / 15)), 6);
-        return 6 * (int)Math.Pow(2, exp);
-    }
 }
diff --git a/chart/ogk/OgkChart.cs b/chart/ogk/OgkChart.cs
@@ -1,4 +1,4 @@
-﻿using MuConvert.chart;
+using MuConvert.chart;
 using MuConvert.utils;
 using Rationals;
 
@@ -41,8 +41,61 @@ public class OgkChart: BaseChart<OgkNote>
 
     public override decimal StartTime => Math.Min(base.StartTime, (decimal)ToSecond(Bullets.First().Time));
     public override decimal EndTime => Math.Max(base.EndTime, (decimal)ToSecond(Bullets.Last().Time));
-    public override int TotalNotes => throw new NotImplementedException();
+    public override int TotalNotes => CountNotes()["T_TOTAL"];
 
+    /**
+     * 基于谱面IR，计算ogkr中T_xxx的几个统计量（即谱面的"物量"信息）。
+     *
+     * 返回的字典将包含以下七个key：
+     * - T_TAP：非侧键Tap类判定数量。等于"Tap数量+Hold数量"（即Hold的头判也计入），不包括任何侧键
+     * - T_HOLD：非侧键Hold类判定数量。等于每条非侧键Hold的"头判定+中间判定"之和
+     * - T_SIDE：侧键Tap类判定数量。同T_TAP，但只计侧键
+     * - T_SHOLD：侧键Hold类判定数量。同T_HOLD，但只计侧键
+     * - T_FLICK：Flick数量
+     * - T_BELL：Bell数量
+     * - T_TOTAL：T_TAP + T_HOLD + T_SIDE + T_SHOLD + T_FLICK（注意，T_BELL不计入T_TOTAL）
+     */
+    public Dictionary<string, int> CountNotes()
+    {
+        int tTap = 0, tSide = 0, tHold = 0, tShold = 0, tFlick = 0, tBell = 0;
+
+        foreach (var note in Notes)
+        {
+            switch (note)
+            {
+                case Bell:
+                    tBell++;
+                    break;
+                case Flick:
+                    tFlick++;
+                    break;
+                case Hold hold:
+                {
+                    var judges = StatisticsUtils.CalcHoldJudgeCount(hold.Time, hold.EndTime, this, (int)ProgJudgeBpm);
+                    if (hold.Lane.Type == LaneType.Wall) { tSide++; tShold += judges; }
+                    else { tTap++; tHold += judges; }
+                    break;
+                }
+                case Tap tap:
+                {
+                    if (tap.Lane.Type == LaneType.Wall) tSide++;
+                    else tTap++;
+                    break;
+                }
+            }
+        }
+        return new Dictionary<string, int>
+        {
+            ["T_TOTAL"] = tTap + tHold + tSide + tShold + tFlick,
+            ["T_TAP"] = tTap,
+            ["T_HOLD"] = tHold,
+            ["T_SIDE"] = tSide,
+            ["T_SHOLD"] = tShold,
+            ["T_FLICK"] = tFlick,
+            ["T_BELL"] = tBell,
+        };
+    }
+    
     public override void Sort()
     {
         base.Sort();
diff --git a/tests/ogk/OgkrTestUtils.cs b/tests/ogk/OgkrTestUtils.cs
@@ -11,7 +11,7 @@ public static DirectoryInfo FindTestsetRoot()
         return new DirectoryInfo(Path.Combine(dir ?? throw new DirectoryNotFoundException("Could not locate repo root."), "ogk", "testset"));
     }
 
-    public static IEnumerable<object[]> GetTestInputs(string dataDir)
+    public static IEnumerable<OgkrTestInput[]> GetTestInputs(string dataDir)
     {
         var testsetRoot = Path.Combine(FindTestsetRoot().FullName, dataDir);
         if (!Directory.Exists(testsetRoot))
diff --git a/tests/ogk/Ogkr测试.cs b/tests/ogk/Ogkr测试.cs
@@ -12,6 +12,9 @@ public class Ogkr测试
     public Ogkr测试(ITestOutputHelper output) => _output = output;
 
     public static IEnumerable<object[]> GetTestInputs(string dataDir) => OgkrTestUtils.GetTestInputs(dataDir);
+    
+    public static IEnumerable<object[]> GetTestInputsOnlyLv3(string dataDir) => GetTestInputs(dataDir)
+        .Where(x=>int.TryParse(((OgkrTestInput)x[0]).DifficultyId, out var id) && id == 3);
 
     [Theory(Skip = "ogkr的解析和生成还没实现完，所以暂时跳过")]
     [MemberData(nameof(GetTestInputs), "官谱")]
@@ -21,18 +24,56 @@ public void 解析Ogkr再生成回去(OgkrTestInput c)
 
         var (chart, parseAlerts) = new OgkrParser().Parse(ogkrText);
         var (resultText, generateAlerts) = new OgkrGenerator().Generate(chart);
-
-        // 转出来的IR的基本健全性检查
-        Assert.NotEmpty(chart.BpmList);
-        Assert.True(chart.BpmList[0].Time == 0, "BpmList首项必须为0时刻");
-        Assert.NotEmpty(chart.Notes);
-        Assert.DoesNotContain(parseAlerts, a => a.Level == Alert.LEVEL.Error);
+        AssertOgkChartOk(chart, parseAlerts.Concat(generateAlerts));
         
         _output.WriteLine(string.Join('\n', parseAlerts));
         _output.WriteLine(string.Join('\n', generateAlerts));
         
         OgkrTextComparer.AssertOgkrEqual(ogkrText, resultText);
     }
+    
+    [Theory]
+    [MemberData(nameof(GetTestInputsOnlyLv3), "官谱")]
+    public void 物量统计测试(OgkrTestInput c)
+    {
+        var ogkrText = File.ReadAllText(c.OgkrPath, Encoding.UTF8);
+        var (chart, parseAlerts) = new OgkrParser().Parse(ogkrText);
+        AssertOgkChartOk(chart, parseAlerts);
+        
+        // 从HEADER段直接解析原谱面中标注的T_xxx的期望值
+        var expected = ParseExpectedTValues(ogkrText);
+        var actual = chart.CountNotes();
+        
+        // 收集所有不一致的项，统一报出，便于调试
+        var diffs = new List<string>();
+        foreach (var key in expected.Keys.OrderBy(k => k, StringComparer.Ordinal))
+        {
+            var a = actual.GetValueOrDefault(key, -1);
+            if (a != expected[key]) diffs.Add($"  {key}: expected={expected[key]}, actual={a}");
+        }
+        Assert.True(diffs.Count == 0, $"物量统计与原谱不一致:{Environment.NewLine}{string.Join(Environment.NewLine, diffs)}");
+    }
+
+    private static Dictionary<string, int> ParseExpectedTValues(string text)
+    {
+        var result = new Dictionary<string, int>();
+        foreach (var rawLine in text.Replace("\r\n", "\n").Split('\n'))
+        {
+            var parts = rawLine.Trim().Split('\t');
+            if (parts.Length >= 2 && parts[0].StartsWith("T_") && int.TryParse(parts[1], out var v))
+                result[parts[0]] = v;
+        }
+        return result;
+    }
+
+    private void AssertOgkChartOk(OgkChart chart, IEnumerable<Alert> alerts)
+    {
+        // 转出来的IR的基本健全性检查
+        Assert.NotEmpty(chart.BpmList);
+        Assert.True(chart.BpmList[0].Time == 0, "BpmList首项必须为0时刻");
+        Assert.NotEmpty(chart.Notes);
+        Assert.DoesNotContain(alerts, a => a.Level == Alert.LEVEL.Error);
+    }
 }
 
 /// <summary>
diff --git a/utils/StatisticsUtils.cs b/utils/StatisticsUtils.cs
@@ -0,0 +1,49 @@
+﻿using MuConvert.chart;
+using Rationals;
+
+namespace MuConvert.utils;
+
+public static class StatisticsUtils
+{
+    // 当前音符落在了哪些BPM区间内、分别有多长。
+    public static List<(int bpmIdx, decimal bpm, Rational start, Rational len)> CalcBpmRanges<T>(Rational time, Rational endTime, BaseChart<T> chart) where T: BaseNote
+    {
+        List<(int, decimal, Rational, Rational)> result = []; 
+        var now = time.CanonicalForm; 
+        var end = endTime.CanonicalForm; 
+        var isFirstRange = true; // 通过这个变量和对应的逻辑，确保返回的BpmRanges至少含有一个元素。即使note本身是0长度的，返回的BpmRanges也能有一个len=0的元素。
+        while (now < end || isFirstRange) 
+        { 
+            var bpmIdx = chart.BpmList.FindIndex(now); 
+            var curBpmRangeEnd = bpmIdx < chart.BpmList.Count - 1 ? chart.BpmList[bpmIdx + 1].Time : 999999; // 当前BPM区间的结束时刻
+            var len = Utils.Min(end, curBpmRangeEnd) - now; // 音符落在本区间内的长度为，从当前时刻开始，到（本区间结束或音符结束的较早者）
+            result.Add((bpmIdx, chart.BpmList[bpmIdx].Bpm, now, len.CanonicalForm)); 
+            now = (now + len).CanonicalForm; 
+            isFirstRange = false;
+        } 
+        return result;
+    }
+    
+    // 该实现等同于游戏DLL中的Manager.NotesReader.getProgJudgeGrid
+    private static Rational GetProgJudgeGrid(decimal bpm, int progJudgeBpm = 240)
+    {
+        int exp = (int)Math.Floor(Math.Log2((double)bpm / progJudgeBpm)); // 相比于一拍，应该加倍的次数
+        exp = Math.Clamp(exp, -5, 2); // 游戏DLL中的getProgJudgeGrid函数实现，满足输出范围一定在(3/384~384/384)之间（对应7.5<=bpm<1920），对超出上述范围的bpm会把结果clamp保持在这个范围内。因此我们也保持完全相同的实现。
+        return (Rational)Math.Pow(2, exp) / 4; // 除以4是因为，progJudgeBpm下的Grid是一拍，一拍是1/4小节
+    }
+    
+    // 具体的机制研究的也不是太明白，只是尽力实现了下
+    // 对该Hold所落入的每个BPM区间，都是每隔gridSize生成一个中间判定点
+    internal static int CalcHoldJudgeCount<T>(Rational time, Rational endTime, BaseChart<T> chart, int progJudgeBpm = 240) where T : BaseNote
+    {
+        var bpmRanges = CalcBpmRanges(time, endTime, chart);
+        
+        var result = 0;
+        foreach (var (_, bpm, _, len) in bpmRanges)
+        {
+            var gridSize = GetProgJudgeGrid(bpm, progJudgeBpm);
+            result += Math.Max((int)(len / gridSize).Ceil(), 1);
+        }
+        return result;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public static DirectoryInfo FindTestsetRoot()`
`11`	`11`	`return new DirectoryInfo(Path.Combine(dir ?? throw new DirectoryNotFoundException("Could not locate repo root."), "ogk", "testset"));`
`12`	`12`	`}`
`13`	`13`
`14`		`- public static IEnumerable<object[]> GetTestInputs(string dataDir)`
	`14`	`+ public static IEnumerable<OgkrTestInput[]> GetTestInputs(string dataDir)`
`15`	`15`	`{`
`16`	`16`	`var testsetRoot = Path.Combine(FindTestsetRoot().FullName, dataDir);`
`17`	`17`	`if (!Directory.Exists(testsetRoot))`