diff --git a/testing/data/ia6cho.tja b/testing/data/ia6cho.tja index b16c4dd..9dfbb98 100644 --- a/testing/data/ia6cho.tja +++ b/testing/data/ia6cho.tja @@ -1,7 +1,7 @@ // This song features mid-measure BPMCHANGE commands. // It also mixes in SCROLL and MEASURE commands next to the BPMCHANGE commands. -BPM:186 -OFFSET:-11.430 +BPM:185.9998 +OFFSET:-11.4302 COURSE:Edit LEVEL:9 diff --git a/testing/data/linda.tja b/testing/data/linda.tja index 1e4043b..da12637 100644 --- a/testing/data/linda.tja +++ b/testing/data/linda.tja @@ -17,125 +17,125 @@ SCOREDIFF:187 0000100010001100, #BPMCHANGE 61.6047 0000112200000000, -#BPMCHANGE 63.35 +#BPMCHANGE 63.3481 00112211, -#BPMCHANGE 62.34 +#BPMCHANGE 62.3355 1000002200000000, -#BPMCHANGE 61.36 +#BPMCHANGE 61.3590 0000101100002200, -#BPMCHANGE 60.41 +#BPMCHANGE 60.4130 0000112200000000, -#BPMCHANGE 63.21 +#BPMCHANGE 63.2111 0000101011200001, #SCROLL 1.07 -#BPMCHANGE 59.1 +#BPMCHANGE 59.1014 11220000, #GOGOSTART #SCROLL 1 -#BPMCHANGE 193.86 +#BPMCHANGE 193.8642 3333, -#BPMCHANGE 201.69 +#BPMCHANGE 201.6868 10201120, 3112, -#BPMCHANGE 196.83 +#BPMCHANGE 196.8317 11101110, -#BPMCHANGE 197.73 +#BPMCHANGE 197.7314 3333, 10201120, 3112, -#BPMCHANGE 198.47 +#BPMCHANGE 198.4705 1010100010101111, #GOGOEND -#BPMCHANGE 197.26 +#BPMCHANGE 197.2646 1000200010102010, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 10221120, 10221020, -#BPMCHANGE 195.81 +#BPMCHANGE 195.8084 10221120, -#BPMCHANGE 197.9 +#BPMCHANGE 197.9022 1000200010102010, 10221120, -#BPMCHANGE 199.03 +#BPMCHANGE 199.0340 10221020, -#BPMCHANGE 196.78 +#BPMCHANGE 196.7839 1010100010001111, -#BPMCHANGE 197.9 +#BPMCHANGE 197.9022 1000200010102010, 10221120, 10221020, 1000202010102000, 1000200010102010, -#BPMCHANGE 198.51 +#BPMCHANGE 198.5072 10221120, -#BPMCHANGE 200.29 +#BPMCHANGE 200.2918 10221020, -#BPMCHANGE 195.55 +#BPMCHANGE 195.5474 11111111, #GOGOSTART -#BPMCHANGE 198.41 +#BPMCHANGE 198.4167 3333, 10201120, 3112, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 11101110, -#BPMCHANGE 199.18 +#BPMCHANGE 199.1761 3333, -#BPMCHANGE 197.83 +#BPMCHANGE 197.8324 10201120, -#BPMCHANGE 199.31 +#BPMCHANGE 199.3150 1112, -#BPMCHANGE 197.54 +#BPMCHANGE 197.5406 11, #GOGOEND -#BPMCHANGE 195.28 +#BPMCHANGE 195.2769 9, -#BPMCHANGE 198.31 +#BPMCHANGE 198.3065 , 08, , -#BPMCHANGE 198 +#BPMCHANGE 198.0002 10112211, -#BPMCHANGE 199.94 +#BPMCHANGE 199.9433 10221122, -#BPMCHANGE 197.36 +#BPMCHANGE 197.3613 10112211, 1000200010101111, 10221020, -#BPMCHANGE 196.11 +#BPMCHANGE 196.1130 10221120, -#BPMCHANGE 198.48 +#BPMCHANGE 198.4777 1000200010102010, 10221120, 10221020, 10221120, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 1000200010102010, -#BPMCHANGE 196.47 +#BPMCHANGE 196.4662 1000222010002220, -#BPMCHANGE 197.65 +#BPMCHANGE 197.6467 10221020, 10221120, 1000200010102010, 10221120, -#BPMCHANGE 200.1 +#BPMCHANGE 200.1027 10221020, -#BPMCHANGE 194.7 +#BPMCHANGE 194.7021 10221120, -#BPMCHANGE 198.21 +#BPMCHANGE 198.2134 3333, -#BPMCHANGE 196.01 +#BPMCHANGE 196.0073 1110111011111110, #GOGOSTART -#BPMCHANGE 201.07 +#BPMCHANGE 201.0676 3333, 10201120, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 3112, 10201120, 3333, @@ -144,13 +144,13 @@ SCOREDIFF:187 1111, #GOGOEND -#BPMCHANGE 196.11 +#BPMCHANGE 196.1130 6, -#BPMCHANGE 198.96 +#BPMCHANGE 198.9588 0008, -#BPMCHANGE 196.02 +#BPMCHANGE 196.0221 10201120, -#BPMCHANGE 199.45 +#BPMCHANGE 199.4502 11111111, #BPMCHANGE 170 #SCROLL 1.17 @@ -165,127 +165,127 @@ SCOREDIFF:187 0000100010001100, -#BPMCHANGE 61.6 +#BPMCHANGE 61.6047 0000112200000000, -#BPMCHANGE 63.35 +#BPMCHANGE 63.3481 00112211, -#BPMCHANGE 62.34 +#BPMCHANGE 62.3355 1000002200000000, -#BPMCHANGE 61.36 +#BPMCHANGE 61.3590 0000101100002200, -#BPMCHANGE 60.41 +#BPMCHANGE 60.4130 0000112200000000, -#BPMCHANGE 63.21 +#BPMCHANGE 63.2111 0000101011200001, #SCROLL 1.07 -#BPMCHANGE 59.1 +#BPMCHANGE 59.1014 11220000, #GOGOSTART #SCROLL 1 -#BPMCHANGE 193.86 +#BPMCHANGE 193.8642 3333, -#BPMCHANGE 201.69 +#BPMCHANGE 201.6868 10201120, 3112, -#BPMCHANGE 196.83 +#BPMCHANGE 196.8317 11101110, -#BPMCHANGE 197.73 +#BPMCHANGE 197.7314 3333, 10201120, 3112, -#BPMCHANGE 198.47 +#BPMCHANGE 198.4705 1010100010101111, #GOGOEND -#BPMCHANGE 197.26 +#BPMCHANGE 197.2646 10221020, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 10221120, 10201121, -#BPMCHANGE 195.81 +#BPMCHANGE 195.8084 10221120, -#BPMCHANGE 197.9 +#BPMCHANGE 197.9022 10221020, 10221120, -#BPMCHANGE 199.03 +#BPMCHANGE 199.0340 10201121, -#BPMCHANGE 196.78 +#BPMCHANGE 196.7839 1010100010001111, -#BPMCHANGE 197.9 +#BPMCHANGE 197.9022 10221020, 10221120, 10201121, 10221120, 10221020, -#BPMCHANGE 198.51 +#BPMCHANGE 198.5072 10221120, -#BPMCHANGE 200.29 +#BPMCHANGE 200.2918 10221020, -#BPMCHANGE 195.55 +#BPMCHANGE 195.5474 11111111, #GOGOSTART -#BPMCHANGE 198.41 +#BPMCHANGE 198.4167 3333, 10201120, 3112, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 11101110, -#BPMCHANGE 199.18 +#BPMCHANGE 199.1761 3333, -#BPMCHANGE 197.83 +#BPMCHANGE 197.8324 10201120, -#BPMCHANGE 199.31 +#BPMCHANGE 199.3150 1112, -#BPMCHANGE 197.54 +#BPMCHANGE 197.5406 11, #GOGOEND -#BPMCHANGE 195.28 +#BPMCHANGE 195.2769 9, -#BPMCHANGE 198.31 +#BPMCHANGE 198.3065 , 08, , -#BPMCHANGE 198 +#BPMCHANGE 198.0002 10112211, -#BPMCHANGE 199.94 +#BPMCHANGE 199.9433 10221122, -#BPMCHANGE 197.36 +#BPMCHANGE 197.3613 10112211, 1000200010101111, 10201121, -#BPMCHANGE 196.11 +#BPMCHANGE 196.1130 10221120, -#BPMCHANGE 198.48 +#BPMCHANGE 198.4777 10221020, 10221120, 10201121, 10221120, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 10221020, -#BPMCHANGE 196.47 +#BPMCHANGE 196.4662 1000222010002220, -#BPMCHANGE 197.65 +#BPMCHANGE 197.6467 10201121, 10221120, 10221020, 10221120, -#BPMCHANGE 200.1 +#BPMCHANGE 200.1027 10201121, -#BPMCHANGE 194.7 +#BPMCHANGE 194.7021 10221120, -#BPMCHANGE 198.21 +#BPMCHANGE 198.2134 3333, -#BPMCHANGE 196.01 +#BPMCHANGE 196.0073 1110111011111110, #GOGOSTART -#BPMCHANGE 201.07 +#BPMCHANGE 201.0676 3333, 10201120, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 3112, 10201120, 3333, @@ -294,13 +294,13 @@ SCOREDIFF:187 1111, #GOGOEND -#BPMCHANGE 196.11 +#BPMCHANGE 196.1130 6, -#BPMCHANGE 198.96 +#BPMCHANGE 198.9588 0008, -#BPMCHANGE 196.02 +#BPMCHANGE 196.0221 10201120, -#BPMCHANGE 199.45 +#BPMCHANGE 199.4502 11111111, #BPMCHANGE 170 #SCROLL 1.17 @@ -323,125 +323,125 @@ SCOREDIFF:200 0000100010001100, #BPMCHANGE 61.6047 0000112200000000, -#BPMCHANGE 63.35 +#BPMCHANGE 63.3481 00112211, -#BPMCHANGE 62.34 +#BPMCHANGE 62.3355 1000002200000000, -#BPMCHANGE 61.36 +#BPMCHANGE 61.3590 0000101100002200, -#BPMCHANGE 60.41 +#BPMCHANGE 60.4130 0000112200000000, -#BPMCHANGE 63.21 +#BPMCHANGE 63.2111 0000101011200001, #SCROLL 1.07 -#BPMCHANGE 59.1 +#BPMCHANGE 59.1014 11220000, #GOGOSTART #SCROLL 1 -#BPMCHANGE 193.86 +#BPMCHANGE 193.8642 3333, -#BPMCHANGE 201.69 +#BPMCHANGE 201.6868 10201120, 3112, -#BPMCHANGE 196.83 +#BPMCHANGE 196.8317 11101110, -#BPMCHANGE 197.73 +#BPMCHANGE 197.7314 3333, 10201120, 3112, -#BPMCHANGE 198.47 +#BPMCHANGE 198.4705 1010100010101111, #GOGOEND -#BPMCHANGE 197.26 +#BPMCHANGE 197.2646 1000200010102010, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 10221120, 10221020, -#BPMCHANGE 195.81 +#BPMCHANGE 195.8084 10221120, -#BPMCHANGE 197.9 +#BPMCHANGE 197.9022 1000200010102010, 10221120, -#BPMCHANGE 199.03 +#BPMCHANGE 199.0340 10221020, -#BPMCHANGE 196.78 +#BPMCHANGE 196.7839 1010100010001111, -#BPMCHANGE 197.9 +#BPMCHANGE 197.9022 1000200010102010, 10221120, 10221020, 1000202010102000, 1000200010102010, -#BPMCHANGE 198.51 +#BPMCHANGE 198.5072 10221120, -#BPMCHANGE 200.29 +#BPMCHANGE 200.2918 10221020, -#BPMCHANGE 195.55 +#BPMCHANGE 195.5474 11111111, #GOGOSTART -#BPMCHANGE 198.41 +#BPMCHANGE 198.4167 3333, 10201120, 3112, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 11101110, -#BPMCHANGE 199.18 +#BPMCHANGE 199.1761 3333, -#BPMCHANGE 197.83 +#BPMCHANGE 197.8324 10201120, -#BPMCHANGE 199.31 +#BPMCHANGE 199.3150 1112, -#BPMCHANGE 197.54 +#BPMCHANGE 197.5406 11, #GOGOEND -#BPMCHANGE 195.28 +#BPMCHANGE 195.2769 9, -#BPMCHANGE 198.31 +#BPMCHANGE 198.3065 , 08, , -#BPMCHANGE 198 +#BPMCHANGE 198.0002 10112211, -#BPMCHANGE 199.94 +#BPMCHANGE 199.9433 10221122, -#BPMCHANGE 197.36 +#BPMCHANGE 197.3613 10112211, 1000200010101111, 10221020, -#BPMCHANGE 196.11 +#BPMCHANGE 196.1130 10221120, -#BPMCHANGE 198.48 +#BPMCHANGE 198.4777 1000200010102010, 10221120, 10221020, 10221120, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 1000200010102010, -#BPMCHANGE 196.47 +#BPMCHANGE 196.4662 1000222010002220, -#BPMCHANGE 197.65 +#BPMCHANGE 197.6467 10221020, 10221120, 1000200010102010, 10221120, -#BPMCHANGE 200.1 +#BPMCHANGE 200.1027 10221020, -#BPMCHANGE 194.7 +#BPMCHANGE 194.7021 10221120, -#BPMCHANGE 198.21 +#BPMCHANGE 198.2134 3333, -#BPMCHANGE 196.01 +#BPMCHANGE 196.0073 1110111011111110, #GOGOSTART -#BPMCHANGE 201.07 +#BPMCHANGE 201.0676 3333, 10201120, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 3112, 10201120, 3333, @@ -450,13 +450,13 @@ SCOREDIFF:200 1111, #GOGOEND -#BPMCHANGE 196.11 +#BPMCHANGE 196.1130 6, -#BPMCHANGE 198.96 +#BPMCHANGE 198.9588 0008, -#BPMCHANGE 196.02 +#BPMCHANGE 196.0221 10201120, -#BPMCHANGE 199.45 +#BPMCHANGE 199.4502 11111111, #BPMCHANGE 170 #SCROLL 1.17 @@ -475,127 +475,127 @@ SCOREDIFF:215 #START 0000100010001100, -#BPMCHANGE 61.6 +#BPMCHANGE 61.6047 0000111100000000, -#BPMCHANGE 63.35 +#BPMCHANGE 63.3481 00112211, -#BPMCHANGE 62.34 +#BPMCHANGE 62.3355 1000002200000000, -#BPMCHANGE 61.36 +#BPMCHANGE 61.3590 0000101100002200, -#BPMCHANGE 60.41 +#BPMCHANGE 60.4130 0000111100000000, -#BPMCHANGE 63.21 +#BPMCHANGE 63.2111 0000101011100001, #SCROLL 1.07 -#BPMCHANGE 59.1 +#BPMCHANGE 59.1014 11220000, #GOGOSTART #SCROLL 1 -#BPMCHANGE 193.86 +#BPMCHANGE 193.8642 3333, -#BPMCHANGE 201.69 +#BPMCHANGE 201.6868 1212, 1111, -#BPMCHANGE 196.83 +#BPMCHANGE 196.8317 5008, -#BPMCHANGE 197.73 +#BPMCHANGE 197.7314 3333, 1212, 1111, -#BPMCHANGE 198.47 +#BPMCHANGE 198.4705 50081010, #GOGOEND -#BPMCHANGE 197.26 +#BPMCHANGE 197.2646 10101120, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 10101120, 10111020, -#BPMCHANGE 195.81 +#BPMCHANGE 195.8084 1110, -#BPMCHANGE 197.9 +#BPMCHANGE 197.9022 10101120, 10101120, -#BPMCHANGE 199.03 +#BPMCHANGE 199.0340 10111020, -#BPMCHANGE 196.78 +#BPMCHANGE 196.7839 1210, -#BPMCHANGE 197.9 +#BPMCHANGE 197.9022 10101120, 10101120, 10111020, 1110, 10101120, -#BPMCHANGE 198.51 +#BPMCHANGE 198.5072 10101120, -#BPMCHANGE 200.29 +#BPMCHANGE 200.2918 1111, -#BPMCHANGE 195.55 +#BPMCHANGE 195.5474 11115008, #GOGOSTART -#BPMCHANGE 198.41 +#BPMCHANGE 198.4167 3333, 1212, 1112, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 5008, -#BPMCHANGE 199.18 +#BPMCHANGE 199.1761 3333, -#BPMCHANGE 197.83 +#BPMCHANGE 197.8324 1212, -#BPMCHANGE 199.31 +#BPMCHANGE 199.3150 1111, -#BPMCHANGE 197.54 +#BPMCHANGE 197.5406 11, #GOGOEND -#BPMCHANGE 195.28 +#BPMCHANGE 195.2769 9, -#BPMCHANGE 198.31 +#BPMCHANGE 198.3065 , , 98, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 10101110, -#BPMCHANGE 199.94 +#BPMCHANGE 199.9433 10101110, -#BPMCHANGE 197.36 +#BPMCHANGE 197.3613 10101110, 10105008, 10111020, -#BPMCHANGE 196.11 +#BPMCHANGE 196.1130 10101120, -#BPMCHANGE 198.48 +#BPMCHANGE 198.4777 10101120, 1110, 10111020, 10101120, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 10101120, -#BPMCHANGE 196.47 +#BPMCHANGE 196.4662 1000111010001110, -#BPMCHANGE 197.65 +#BPMCHANGE 197.6467 10111020, 10101120, 10101120, 1110, -#BPMCHANGE 200.1 +#BPMCHANGE 200.1027 10111020, -#BPMCHANGE 194.7 +#BPMCHANGE 194.7021 10101120, -#BPMCHANGE 198.21 +#BPMCHANGE 198.2134 3333, -#BPMCHANGE 196.01 +#BPMCHANGE 196.0073 11115008, #GOGOSTART -#BPMCHANGE 201.07 +#BPMCHANGE 201.0676 3333, 1212, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 1111, 5008, 3333, @@ -604,13 +604,13 @@ SCOREDIFF:215 33, #GOGOEND -#BPMCHANGE 196.11 +#BPMCHANGE 196.1130 6, -#BPMCHANGE 198.96 +#BPMCHANGE 198.9588 08, -#BPMCHANGE 196.02 +#BPMCHANGE 196.0221 1111, -#BPMCHANGE 199.45 +#BPMCHANGE 199.4502 11101110, #BPMCHANGE 170 #SCROLL 1.17 @@ -629,127 +629,127 @@ SCOREDIFF:215 #START 0111, -#BPMCHANGE 61.6 +#BPMCHANGE 61.6047 0000101100000000, -#BPMCHANGE 63.35 +#BPMCHANGE 63.3481 0111, -#BPMCHANGE 62.34 +#BPMCHANGE 62.3355 1000002200000000, -#BPMCHANGE 61.36 +#BPMCHANGE 61.3590 0111, -#BPMCHANGE 60.41 +#BPMCHANGE 60.4130 0000101100000000, -#BPMCHANGE 63.21 +#BPMCHANGE 63.2111 0111, #SCROLL 1.07 -#BPMCHANGE 59.1 +#BPMCHANGE 59.1014 11220000, #GOGOSTART #SCROLL 1 -#BPMCHANGE 193.86 +#BPMCHANGE 193.8642 3333, -#BPMCHANGE 201.69 +#BPMCHANGE 201.6868 1120, 1111, -#BPMCHANGE 196.83 +#BPMCHANGE 196.8317 5008, -#BPMCHANGE 197.73 +#BPMCHANGE 197.7314 3333, 1120, 1111, -#BPMCHANGE 198.47 +#BPMCHANGE 198.4705 11, #GOGOEND -#BPMCHANGE 197.26 +#BPMCHANGE 197.2646 10001110, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 10101110, 10001110, -#BPMCHANGE 195.81 +#BPMCHANGE 195.8084 10101110, -#BPMCHANGE 197.9 +#BPMCHANGE 197.9022 10001110, 10101110, -#BPMCHANGE 199.03 +#BPMCHANGE 199.0340 10001110, -#BPMCHANGE 196.78 +#BPMCHANGE 196.7839 22202000, -#BPMCHANGE 197.9 +#BPMCHANGE 197.9022 10001110, 10101110, 10001110, 10101110, 10001110, -#BPMCHANGE 198.51 +#BPMCHANGE 198.5072 10101110, -#BPMCHANGE 200.29 +#BPMCHANGE 200.2918 1111, -#BPMCHANGE 195.55 +#BPMCHANGE 195.5474 22202000, #GOGOSTART -#BPMCHANGE 198.41 +#BPMCHANGE 198.4167 3333, 1120, 1111, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 5008, -#BPMCHANGE 199.18 +#BPMCHANGE 199.1761 3333, -#BPMCHANGE 197.83 +#BPMCHANGE 197.8324 1120, -#BPMCHANGE 199.31 +#BPMCHANGE 199.3150 1111, -#BPMCHANGE 197.54 +#BPMCHANGE 197.5406 11, #GOGOEND -#BPMCHANGE 195.28 +#BPMCHANGE 195.2769 9, -#BPMCHANGE 198.31 +#BPMCHANGE 198.3065 , 98, , -#BPMCHANGE 198 +#BPMCHANGE 198.0002 10101110, -#BPMCHANGE 199.94 +#BPMCHANGE 199.9433 10101110, -#BPMCHANGE 197.36 +#BPMCHANGE 197.3613 10101110, 1, 10001110, -#BPMCHANGE 196.11 +#BPMCHANGE 196.1130 10101110, -#BPMCHANGE 198.48 +#BPMCHANGE 198.4777 10001110, 10101110, 10001110, 10101110, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 10001110, -#BPMCHANGE 196.47 +#BPMCHANGE 196.4662 1212, -#BPMCHANGE 197.65 +#BPMCHANGE 197.6467 10001110, 10101110, 10001110, 10101110, -#BPMCHANGE 200.1 +#BPMCHANGE 200.1027 10001110, -#BPMCHANGE 194.7 +#BPMCHANGE 194.7021 10101110, -#BPMCHANGE 198.21 +#BPMCHANGE 198.2134 1122, -#BPMCHANGE 196.01 +#BPMCHANGE 196.0073 22202000, #GOGOSTART -#BPMCHANGE 201.07 +#BPMCHANGE 201.0676 3333, 1120, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 1111, 5008, 3333, @@ -758,13 +758,13 @@ SCOREDIFF:215 11, #GOGOEND -#BPMCHANGE 196.11 +#BPMCHANGE 196.1130 5, -#BPMCHANGE 198.96 +#BPMCHANGE 198.9588 08, -#BPMCHANGE 196.02 +#BPMCHANGE 196.0221 1111, -#BPMCHANGE 199.45 +#BPMCHANGE 199.4502 11101110, #BPMCHANGE 170 #SCROLL 1.17 @@ -783,127 +783,127 @@ SCOREDIFF:287 #START 0111, -#BPMCHANGE 61.6 +#BPMCHANGE 61.6047 0100, -#BPMCHANGE 63.35 +#BPMCHANGE 63.3481 0111, -#BPMCHANGE 62.34 +#BPMCHANGE 62.3355 1, -#BPMCHANGE 61.36 +#BPMCHANGE 61.3590 0111, -#BPMCHANGE 60.41 +#BPMCHANGE 60.4130 0100, -#BPMCHANGE 63.21 +#BPMCHANGE 63.2111 0111, #SCROLL 1.07 -#BPMCHANGE 59.1 +#BPMCHANGE 59.1014 1, #GOGOSTART #SCROLL 1 -#BPMCHANGE 193.86 +#BPMCHANGE 193.8642 33, -#BPMCHANGE 201.69 +#BPMCHANGE 201.6868 1110, 11, -#BPMCHANGE 196.83 +#BPMCHANGE 196.8317 5008, -#BPMCHANGE 197.73 +#BPMCHANGE 197.7314 33, 1110, 11, -#BPMCHANGE 198.47 +#BPMCHANGE 198.4705 58, #GOGOEND -#BPMCHANGE 197.26 +#BPMCHANGE 197.2646 11, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 1100, 1011, -#BPMCHANGE 195.81 +#BPMCHANGE 195.8084 2200, -#BPMCHANGE 197.9 +#BPMCHANGE 197.9022 11, 1100, -#BPMCHANGE 199.03 +#BPMCHANGE 199.0340 11, -#BPMCHANGE 196.78 +#BPMCHANGE 196.7839 2220, -#BPMCHANGE 197.9 +#BPMCHANGE 197.9022 1011, 1100, 11, 2200, 1011, -#BPMCHANGE 198.51 +#BPMCHANGE 198.5072 1100, -#BPMCHANGE 200.29 +#BPMCHANGE 200.2918 11, -#BPMCHANGE 195.55 +#BPMCHANGE 195.5474 2220, #GOGOSTART -#BPMCHANGE 198.41 +#BPMCHANGE 198.4167 33, 1110, 11, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 5008, -#BPMCHANGE 199.18 +#BPMCHANGE 199.1761 33, -#BPMCHANGE 197.83 +#BPMCHANGE 197.8324 1110, -#BPMCHANGE 199.31 +#BPMCHANGE 199.3150 11, -#BPMCHANGE 197.54 +#BPMCHANGE 197.5406 11, #GOGOEND -#BPMCHANGE 195.28 +#BPMCHANGE 195.2769 9, -#BPMCHANGE 198.31 +#BPMCHANGE 198.3065 , 09, 8, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 11, -#BPMCHANGE 199.94 +#BPMCHANGE 199.9433 1100, -#BPMCHANGE 197.36 +#BPMCHANGE 197.3613 11, 1100, 11, -#BPMCHANGE 196.11 +#BPMCHANGE 196.1130 1100, -#BPMCHANGE 198.48 +#BPMCHANGE 198.4777 1011, 2200, 11, 1100, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 11, -#BPMCHANGE 196.47 +#BPMCHANGE 196.4662 33, -#BPMCHANGE 197.65 +#BPMCHANGE 197.6467 1011, 1100, 11, 2200, -#BPMCHANGE 200.1 +#BPMCHANGE 200.1027 1011, -#BPMCHANGE 194.7 +#BPMCHANGE 194.7021 1100, -#BPMCHANGE 198.21 +#BPMCHANGE 198.2134 1111, -#BPMCHANGE 196.01 +#BPMCHANGE 196.0073 1, #GOGOSTART -#BPMCHANGE 201.07 +#BPMCHANGE 201.0676 33, 1110, -#BPMCHANGE 198 +#BPMCHANGE 198.0002 33, 5008, 33, @@ -912,13 +912,13 @@ SCOREDIFF:287 11, #GOGOEND -#BPMCHANGE 196.11 +#BPMCHANGE 196.1130 5, -#BPMCHANGE 198.96 +#BPMCHANGE 198.9588 8, -#BPMCHANGE 196.02 +#BPMCHANGE 196.0221 11, -#BPMCHANGE 199.45 +#BPMCHANGE 199.4502 1111, #BPMCHANGE 170 #SCROLL 1.17 diff --git a/testing/test_conversion.py b/testing/test_conversion.py index 4ba1951..75c0fa9 100644 --- a/testing/test_conversion.py +++ b/testing/test_conversion.py @@ -79,7 +79,7 @@ def test_converted_tja_vs_cached_fumen(id_song, tmp_path, entry_point): ca_measure = ca_song['measures'][i_measure] # 3a. Check measure metadata assert_song_property(co_measure, ca_measure, 'bpm', i_measure, abs=0.01) - assert_song_property(co_measure, ca_measure, 'fumenOffset', i_measure, abs=1.0) + assert_song_property(co_measure, ca_measure, 'fumenOffset', i_measure, abs=0.15) assert_song_property(co_measure, ca_measure, 'gogo', i_measure) assert_song_property(co_measure, ca_measure, 'barline', i_measure) assert_song_property(co_measure, ca_measure, 'branchInfo', i_measure) @@ -98,7 +98,7 @@ def test_converted_tja_vs_cached_fumen(id_song, tmp_path, entry_point): co_note = co_branch[i_note] ca_note = ca_branch[i_note] assert_song_property(co_note, ca_note, 'type', i_measure, i_branch, i_note, func=normalize_type) - assert_song_property(co_note, ca_note, 'pos', i_measure, i_branch, i_note, abs=0.2) + assert_song_property(co_note, ca_note, 'pos', i_measure, i_branch, i_note, abs=0.1) # NB: Drumroll duration doesn't always end exactly on a beat. Plus, TJA charters often eyeball # drumrolls, leading them to be often off by a 1/4th/8th/16th/32th/etc. These charting errors # are fixable, but tedious to do when writing tests. So, I've added a try/except so that they