Merge pull request #42 from atheler/compound-meter-rework

Compound meter rework

Author: edudobay

doc/wiki/refMingusCoreMeter.rst

@@ -48,9 +48,11 @@ A meter is represented by a tuple. 4/4 time would look like (4,4), 3/4 like
       Examples:
 
       >>> is_compound((3,4))
-      True
+      False
       >>> is_compound((4,4))
       False
+      >>> is_compound((6,8))
+      True
 
 
 ----

doc/wiki/tutorialMeter.rst

@@ -188,9 +188,11 @@ Compound meter is a meter in which each measure is divided into three or more or
 
 
 >>> meter.is_compound((3, 4))
-True
+False
 >>> meter.is_compound((6, 8))
 True
+>>> meter.is_compound((9, 16))
+True
 >>> meter.is_compound((4, 4))
 False
 

mingus/core/meter.py

@@ -59,7 +59,7 @@ def is_compound(meter):
     >>> is_compound((4,4))
     False
     """
-    return is_valid(meter) and meter[0] % 3 == 0
+    return is_valid(meter) and meter[0] % 3 == 0 and 6 <= meter[0]
 
 
 def is_simple(meter):

unittest/test_meter.py

@@ -23,15 +23,12 @@ def setUp(self):
             (6, 4),
         ]
         self.compound_meters = [
-            (3, 4),
             (6, 4),
             (9, 4),
             (12, 4),
-            (3, 8),
             (6, 8),
             (9, 8),
             (12, 8),
-            (3, 16),
             (6, 16),
             (9, 16),
             (12, 16),