diff Syncopation models/PRS.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 cc38b3047ed9
line wrap: on
line diff
--- a/Syncopation models/PRS.py	Thu Apr 09 23:49:16 2015 +0100
+++ b/Syncopation models/PRS.py	Sun Apr 12 13:06:17 2015 +0100
@@ -3,10 +3,10 @@
 Institution: Centre for Digital Music, Queen Mary University of London
 '''
 
-from basic_functions import repeat, subdivide, ceiling, get_min_timeSpan, get_rhythm_category
+from basic_functions import repeat, subdivide, ceiling, velocity_sequence_to_min_timespan, get_rhythm_category
 
 def get_cost(sequence,nextSequence):
-	sequence = get_min_timeSpan(sequence)					# converting to the minimum time-span format
+	sequence = velocity_sequence_to_min_timespan(sequence)					# converting to the minimum time-span format
 	
 	if sequence[1:] == repeat([0],len(sequence)-1):		# null prototype
 		cost = 0