Mercurial > hg > syncopation-dataset
diff Syncopation models/TMC.py @ 23:df1e7c378ee0
fixed KTH, and WNBD
| author | csong <csong@eecs.qmul.ac.uk> |
|---|---|
| date | Sun, 12 Apr 2015 13:06:17 +0100 |
| parents | b959c2acb927 |
| children | 5de1cb45c145 |
line wrap: on
line diff
--- a/Syncopation models/TMC.py Thu Apr 09 23:49:16 2015 +0100 +++ b/Syncopation models/TMC.py Sun Apr 12 13:06:17 2015 +0100 @@ -4,7 +4,7 @@ ''' -from basic_functions import get_H, ceiling, get_min_timeSpan, get_rhythm_category +from basic_functions import get_H, ceiling, velocity_sequence_to_min_timespan, get_rhythm_category # The get_metricity function calculates the metricity for a binary sequence with given sequence of metrical weights in a certain metrical level. def get_metricity(binarySequence, H): @@ -55,7 +55,7 @@ if get_rhythm_category(binarySequence, subdivisionSequence) == 'poly': print 'Warning: TMC model detects polyrhythms so returning None.' else: - binarySequence = get_min_timeSpan(binarySequence) # converting to the minimum time-span format + binarySequence = velocity_sequence_to_min_timespan(binarySequence) # converting to the minimum time-span format # If the parameters are not given, use the default settings if parameters == None: