Progress on #83: Dminor and Fmajor tests fixed

oggy22 · Aug 21, 2019 · 4b2628b · 4b2628b
1 parent 2725533
commit 4b2628b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/MusicCore.Tests/ChomskyAnalysisTest.cs b/MusicCore.Tests/ChomskyAnalysisTest.cs
@@ -16,8 +16,8 @@ public void Albinoni_Adagio(string filename)
         }
 
         [DataRow(@"Bach_invention_1_Cmajor.mid")]
-        //[DataRow(@"Bach_invention_4_Dminor.mid")]
-        //[DataRow(@"Bach_invention_8_Fmajor.mid")]
+        [DataRow(@"Bach_invention_4_Dminor.mid")]
+        [DataRow(@"Bach_invention_8_Fmajor.mid")]
         [DataRow(@"Bach_invention_10_Gmajor.mid")]
         [DataRow(@"Bach_invention_13_Aminor.mid")]
         //[DataRow(@"Bach_invention_14_Bbmajor.mid")]

diff --git a/MusicCore/IMelodyPart.cs b/MusicCore/IMelodyPart.cs
@@ -146,7 +146,7 @@ Fraction duration
             }
         }
 
-        public bool IsIdentical(MelodyPartList node) => this.children.SequenceEqual(node.children);
+        public bool IsIdentical(MelodyPartList node) => this.children.SequenceEqual(node.children) && this.IsDiatonic == node.IsDiatonic;
 
         public bool IsLeaf => !GetChildren().Any();
-Original file line number
+Diff line change
@@ Expand Up / @@ -146,7 +146,7 @@ Fraction duration @@
                 }
             }
-            public bool IsIdentical(MelodyPartList node) => this.children.SequenceEqual(node.children);
+            public bool IsIdentical(MelodyPartList node) => this.children.SequenceEqual(node.children) && this.IsDiatonic == node.IsDiatonic;
             public bool IsLeaf => !GetChildren().Any();
@@ Expand Down @@