Permalink
Browse files

CP1: Fixed tritone rules and confirmations

  • Loading branch information...
rualark committed Dec 5, 2017
1 parent 334861c commit 2e03448e317516e51775c3b371b833b0a7aeac51
View
@@ -2314,18 +2314,22 @@ void CGenCF1::GetTritoneResolution(int ta, int t1, int t2, int tb, int &res1, in
// Scan preparation
if (fleap_start > 0) {
int pos1 = max(0, fli[fleap_start] - rwin);
int pos2 = min(ep2, fli2[fleap_end] + 1 + rwin);
int pos2 = min(ep2, fli[fleap_end]);
for (int i = pos1; i < pos2; ++i) {
if (pcc[i] == ta2 && abs(cc[i] - cc[fli[fleap_start]]) < 5) {
res1 = 1;
break;
}
}
}
if (pcc[fli[fleap_start + 1]] == ta2) res1 = 1;
// Do not check if cut by scan window
if (fli2[fleap_end] + 1 + rwin > ep2 && ep2 < c_len) {
res2 = 1;
return;
}
// Scan resolution
if (fleap_end < fli_size - 1) {
int pos1 = max(0, fli[fleap_start] - rwin);
int pos1 = max(0, fli2[fleap_start] + 1);
int pos2 = min(ep2, fli2[fleap_end] + 1 + rwin);
for (int i = pos1; i < pos2; ++i) {
if (pcc[i] == tb2 && abs(cc[i] - cc[fli[fleap_end]]) < 5) {
@@ -2334,9 +2338,6 @@ void CGenCF1::GetTritoneResolution(int ta, int t1, int t2, int tb, int &res1, in
}
}
}
// Consider resolved if window cut and not fully generated
if (fli2[fleap_end] + npm >= ep2 && ep2 < c_len) res2 = 1;
if (pcc[fli[fleap_end - 1]] == tb2) res2 = 1;
}
// Check tritone t1-t2 which has to resolve from ta to tb
@@ -130,14 +130,14 @@ Set;Severity;Class;Group;Rule;Flag
1;371;0;Melody;CF/sp1 Tritone;Compound tritone framed;resolved;0;Tritone within measure with intermediate notes, framed by two melody direction changes;;;;;;;;;;;
1;372;60;Melody;CF/sp1 Tritone;Compound tritone framed;unresolved;0;Tritone within measure with intermediate notes, framed by two melody direction changes;;;;;;;;;371;;
1;373;100;Melody;CF/sp1 Tritone;Compound tritone framed;on climax;0;Tritone within measure with intermediate notes, framed by two melody direction changes;;;;;;;;;;;
1;368;0;Melody;sp2-5 Tritone;Adjacent tritone;resolved;0;Melodic tritone within measure, framed by two melody direction changes;;;;;;;;;365;;
1;368;0;Melody;sp2-5 Tritone;Adjacent tritone;resolved;0;Melodic tritone within measure, framed by two melody direction changes;;;;;;;;;;;
1;369;60;Melody;sp2-5 Tritone;Adjacent tritone;unresolved;0;Melodic tritone within measure, framed by two melody direction changes;;;;;;;;;368;;
1;370;100;Melody;sp2-5 Tritone;Adjacent tritone;on climax;0;Melodic tritone within measure, framed by two melody direction changes;;;;;;;;;;;
1;365;40;Melody;sp2-5 Tritone;Adjacent tritone framed;resolved;0;Melodic tritone within measure, framed by two melody direction changes;;;;;;;;;;;
1;366;100;Melody;sp2-5 Tritone;Adjacent tritone framed;unresolved;0;Melodic tritone within measure, framed by two melody direction changes;;;;;;;;;365;;
1;367;100;Melody;sp2-5 Tritone;Adjacent tritone framed;on climax;0;Melodic tritone within measure, framed by two melody direction changes;;;;;;;;;;;
1;360;40;Melody;sp2-5 Tritone;Adjacent tritone accented;resolved;0;Melodic tritone within measure, last note is long or repeated;;;;;;;;;368;;
1;361;100;Melody;sp2-5 Tritone;Adjacent tritone accented;unresolved;0;Melodic tritone within measure, last note is long or repeated;;;;;1;;;;360,368,365;;
1;361;100;Melody;sp2-5 Tritone;Adjacent tritone accented;unresolved;0;Melodic tritone within measure, last note is long or repeated;;;;;1;;;;360,368;;
1;362;100;Melody;sp2-5 Tritone;Adjacent tritone accented;on climax;0;Melodic tritone within measure, last note is long or repeated;;;;;;;;;;;
1;18;0;Melody;sp2-5 Tritone;Compound tritone framed;resolved;0;Tritone within measure with intermediate notes, framed by two melody direction changes;;;18;0;;;;;;;
1;19;60;Melody;sp2-5 Tritone;Compound tritone framed;unresolved;0;Tritone within measure with intermediate notes, framed by two melody direction changes;;;26;2;1;;;;18;;
View
BIN -35 Bytes (100%) MGen/configs/rules/rules.xlsm
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.

0 comments on commit 2e03448

Please sign in to comment.