Mercurial > hg > syncopation-dataset
diff Syncopation models/syncopation.py @ 10:a3ed7d2b57d8
updating main py files to point at new
file names
| author | christopherh <christopher.harte@eecs.qmul.ac.uk> |
|---|---|
| date | Fri, 03 Apr 2015 16:02:10 +0100 |
| parents | c2843ef4de2c |
| children | 4fb9c00e4ef0 |
line wrap: on
line diff
--- a/Syncopation models/syncopation.py Fri Apr 03 11:41:01 2015 +0100 +++ b/Syncopation models/syncopation.py Fri Apr 03 16:02:10 2015 +0100 @@ -16,7 +16,7 @@ else: while subdivision_seq == None: - from BasicFuncs import get_subdivision_seq + from basic_functions import get_subdivision_seq subdivision_seq = get_subdivision_seq(timesig, L_max) # The get_rhythm_category function is used to detect rhythm category: monorhythm or polyrhythm. @@ -25,7 +25,7 @@ # e.g. prime_factors of polyrhythm 100100101010 in 4/4 is [2,3] but subdivision_seq = [1,2,2] for 4/4 def get_rhythm_category(): rhythm_category = 'mono' - from BasicFuncs import get_min_timeSpan, find_prime_factors + from basic_functions import get_min_timeSpan, find_prime_factors for f in find_prime_factors(len(get_min_timeSpan(seq))): if not (f in subdivision_seq): rhythm_category = 'poly'