comparison Syncopation models/TMC.py @ 23:df1e7c378ee0

fixed KTH, and WNBD

 Author: Chunyang Song
 Institution: Centre for Digital Music, Queen Mary University of London
 
 '''
 
-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):
 	metricity = 0
 	for m in range(len(binarySequence)):

 	subdivisionSequence = bar.get_subdivision_sequence()
 
 	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:
 			Lmax  = 5
 			weightSequence = range(Lmax+1,0,-1) # i.e. [6,5,4,3,2,1]