Mercurial > hg > syncopation-dataset

diff Syncopation models/TOB.py @ 38:cc38b3047ed9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated syncopation.y to allow output of sync for a bar list also fixed some problems in models and other modules
author christopherh <christopher.harte@eecs.qmul.ac.uk>
date Mon, 13 Apr 2015 23:06:49 +0100
parents df1e7c378ee0
children
line wrap: on
line diff
--- a/Syncopation models/TOB.py	Mon Apr 13 22:36:51 2015 +0100
+++ b/Syncopation models/TOB.py	Mon Apr 13 23:06:49 2015 +0100
@@ -4,10 +4,10 @@
 
 '''
 
-from basic_functions import ceiling, find_divisor, is_prime
+from basic_functions import ceiling, find_divisor, is_prime, velocity_sequence_to_min_timespan
 
-def get_syncopation(bar, parameter = None):
-	binarySequence = bar.get_binary_sequence()
+def get_syncopation(bar, parameters = None):
+	binarySequence = velocity_sequence_to_min_timespan(bar.get_binary_sequence())
 	sequenceLength = len(binarySequence)
 
 	syncopation = 0