Skip to content

Commit 544b7e5

Browse files
StarrahStarrah
committed
修各种bug
1 parent 8ae8de1 commit 544b7e5

8 files changed

Lines changed: 69 additions & 28 deletions

File tree

‎chart/Duration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public Rational Seconds
106106
}
107107
set
108108
{
109-
_type = Type.Bar;
109+
_type = Type.Seconds;
110110
_data = value.CanonicalForm;
111111
}
112112
}

‎chart/Note.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected Note(Chart chart, Rational time)
3737
Time = time;
3838
}
3939

40-
public virtual string Modifiers => (IsBreak ? "b" : "") + (IsEx ? "b" : "");
40+
public virtual string Modifiers => (IsBreak ? "b" : "") + (IsEx ? "x" : "");
4141
}
4242

4343
[DebuggerDisplay("{DebuggerDisplay(),nq}")]

‎generator/MA2Generator.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ private void AddTap(Tap tap, int bar, int tick)
166166
var len = segIdx == slide.segments.Count - 1 ?
167167
totalLen : // 对于最后一段，剩的时间全给它。以保证总长是正确的。
168168
segmentValue[segIdx] ?? toAssignValue; // 除此之外，则是优先使用显式分配的时间、没有则使用平均时间
169+
totalLen -= len;
169170
int waitTime = 0;
170171

171172
var prefix = "NM";

‎parser/simai/SimaiParser.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ public sealed override object VisitSlideBody(P.SlideBodyContext context)
405405
}
406406
else throw Utils.Fail("duration的个数不对"); // 已经在语法层做过检查了，所以这个分支按说是永远不会命中的。
407407

408+
ApplyModifiers(context.modifiers(), slide);
408409
return true;
409410
}
410411

‎tests/testset/自制谱/Pre-STAR/015002_02.ma2‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ BRSUR 32 0 6 96 269 2
121121
CNSI_ 32 365 2 0 269 5
122122
CNSI_ 33 250 5 0 269 0
123123
CNSI_ 34 135 0 0 269 3
124-
CNSI_ 35 20 3 0 269 6
124+
CNSI_ 35 20 3 0 268 6
125125
EXTAP 36 0 0
126126
EXTAP 36 0 7
127127
NMTAP 36 144 1
@@ -398,8 +398,8 @@ NMSTR 97 240 7
398398
NMSTR 97 240 0
399399
NMSV_ 97 240 7 96 96 4
400400
NMSV_ 97 240 0 96 96 3
401-
NMSTR 98 96 5
402-
NMSTR 98 96 2
401+
EXSTR 98 96 5
402+
EXSTR 98 96 2
403403
NMSCR 98 96 5 96 96 7
404404
NMSCL 98 96 2 96 96 0
405405
NMTTP 99 0 0 C 1 M1
@@ -449,15 +449,15 @@ T_REC_HLD 42
449449
T_REC_XHO 5
450450
T_REC_BHO 1
451451
T_REC_BXH 0
452-
T_REC_STR 30
452+
T_REC_STR 28
453453
T_REC_BST 1
454-
T_REC_XST 10
454+
T_REC_XST 12
455455
T_REC_XBS 2
456456
T_REC_TTP 26
457457
T_REC_THO 2
458458
T_REC_SLD 42
459459
T_REC_BSL 2
460-
T_REC_ALL 418
460+
T_REC_ALL 417
461461
T_NUM_TAP 304
462462
T_NUM_BRK 22
463463
T_NUM_HLD 49

‎tests/testset/自制谱/Pre-STAR/015002_03.ma2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ T_REC_TTP 40
799799
T_REC_THO 2
800800
T_REC_SLD 54
801801
T_REC_BSL 20
802-
T_REC_ALL 763
802+
T_REC_ALL 762
803803
T_NUM_TAP 475
804804
T_NUM_BRK 143
805805
T_NUM_HLD 90

‎tests/自制谱测试.cs‎

Lines changed: 50 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using MuConvert.generator;
33
using MuConvert.maidata;
44
using MuConvert.parser.simai;
5+
using MuConvert.utils;
56
using Xunit.Abstractions;
67

78
namespace MuConvert.Tests;
@@ -85,33 +86,64 @@ private static string keepNotesOnly(string text)
8586
return result.ToString();
8687
}
8788

88-
private static void AssertTextEqual(string expected, string actual)
89+
private static (int, int, string) GetSlideTime(string slide)
8990
{
90-
if (string.Equals(expected, actual, StringComparison.Ordinal)) return;
91+
var values = slide.Split("\t");
92+
return (int.Parse(values[1]) * 384 + int.Parse(values[2]), int.Parse(values[5]),
93+
string.Join("\t", values[0], values[3], values[4], values[6]));
94+
}
9195

96+
private static bool CompareLine(string exp, string act)
97+
{
98+
var result = string.Equals(exp, act, StringComparison.Ordinal);
99+
if (!result && exp[..5] == act[..5] && SlideTypeTool.IsSlide(exp))
100+
{ // 如果是星星，则允许一定范围的误差。具体而言：
101+
var (expTime, expLen, expExtra) = GetSlideTime(exp);
102+
var (actTime, actLen, actExtra) = GetSlideTime(act);
103+
if (expExtra != actExtra) return result; // 首先任何情况下，waitTime和按键等信息必须相等
104+
if (exp[..2] == "CN")
105+
{ // CN星星则要么尾时刻完全对，要么长度至多差1。
106+
if (expTime + expLen == actTime + actLen || Math.Abs(expLen - actLen) <= 1) result = true;
107+
}
108+
else
109+
{ // 第一段星星则开始时刻必须对且长度至多差1
110+
if (expTime == actTime && Math.Abs(expLen - actLen) <= 1) result = true;
111+
}
112+
}
113+
return result;
114+
}
115+
116+
private static void AssertTextEqual(string expected, string actual)
117+
{
92118
var expectedLines = expected.Split('\n');
93119
var actualLines = actual.Split('\n');
94-
var min = Math.Min(expectedLines.Length, actualLines.Length);
120+
var max = Math.Max(expectedLines.Length, actualLines.Length);
95121

96-
var firstDiff = -1;
97-
for (var i = 0; i < min; i++)
122+
for (var i = 0; i < max; i++)
98123
{
99-
if (!string.Equals(expectedLines[i], actualLines[i], StringComparison.Ordinal))
124+
var exp = i < expectedLines.Length ? expectedLines[i] : "<EOF>";
125+
var act = i < actualLines.Length ? actualLines[i] : "<EOF>";
126+
var result = CompareLine(exp, act);
127+
if (!result)
100128
{
101-
firstDiff = i;
102-
break;
129+
// 尝试下面五行之内有无相同的，如果有，交换之
130+
for (int j = 1; j < Math.Min(expectedLines.Length, i+5); j++)
131+
{
132+
if (CompareLine(expectedLines[j], act))
133+
{
134+
(expectedLines[j], expectedLines[i]) = (expectedLines[i], expectedLines[j]);
135+
result = true;
136+
break;
137+
}
138+
}
103139
}
104-
}
105-
if (firstDiff == -1) firstDiff = min;
106-
107-
var exp = firstDiff < expectedLines.Length ? expectedLines[firstDiff] : "<EOF>";
108-
var act = firstDiff < actualLines.Length ? actualLines[firstDiff] : "<EOF>";
109140

110-
Assert.Fail(
111-
$"First difference at line {firstDiff + 1}:{Environment.NewLine}" +
112-
$"EXPECTED: {exp}{Environment.NewLine}" +
113-
$"ACTUAL : {act}"
114-
);
141+
if (!result) Assert.Fail(
142+
$"First difference at line {i + 1}:{Environment.NewLine}" +
143+
$"EXPECTED: {exp}{Environment.NewLine}" +
144+
$"ACTUAL : {act}"
145+
);
146+
}
115147
}
116148

117149
private static DirectoryInfo FindRepoRoot()

‎utils/Enum.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,19 @@ public static SlideType FromSimai(string s, int? startKey)
8484
if (!int.TryParse(s[1..2], out var midKey)) throw new ArgumentException(string.Format(Locale.InvalidSlide, $"{startKey}{s}"));
8585
distance = (midKey - startKey!.Value + 8) % 8; // 先假设按顺时针的方向走，看看距离
8686
if (distance == 2) return SlideType.SLR;
87-
else if (distance == 6) return SlideType.SSL;
87+
else if (distance == 6) return SlideType.SLL;
8888
else throw new ArgumentException(string.Format(Locale.InvalidSlide, $"{startKey}{s}"));
8989
case 's': return SlideType.SSL;
9090
case 'z': return SlideType.SSR;
9191
case 'w': return SlideType.SF_;
9292
}
9393
throw new ArgumentException(string.Format(Locale.InvalidSlide, $"{startKey}{s}"));
9494
}
95+
96+
public static HashSet<string> SlideNames = Enum.GetNames<SlideType>().ToHashSet();
97+
98+
public static bool IsSlide(string MA2Name)
99+
{
100+
return SlideNames.Contains(MA2Name[2..5]);
101+
}
95102
}

0 commit comments

Comments
 (0)