Mercurial > hg > syncopation-dataset

diff Syncopation models/synpy/music_objects.py @ 71:9a60ca4ae0fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updating models and latex files. added results.csv
author christopherh <christopher.harte@eecs.qmul.ac.uk>
date Mon, 11 May 2015 23:36:25 +0100
parents e71028851131
children
line wrap: on
line diff
--- a/Syncopation models/synpy/music_objects.py	Mon Apr 27 20:32:10 2015 +0100
+++ b/Syncopation models/synpy/music_objects.py	Mon May 11 23:36:25 2015 +0100
@@ -177,12 +177,20 @@
 			self.velocitySequence = rhythmSequence
 			self.noteSequence = None 
 
-		self.tpq = ticksPerQuarter
-		self.qpm = qpmTempo
 		if isinstance(timeSignature, basestring):
 			self.timeSignature = TimeSignature(timeSignature)
 		else:
 			self.timeSignature = timeSignature
+		
+		if ticksPerQuarter==None:
+			self.tpq = len(self.get_velocity_sequence())*self.timeSignature.get_denominator()/(4*self.timeSignature.get_numerator())
+		else:
+			self.tpq = ticksPerQuarter
+		
+		self.qpm = qpmTempo
+		
+
+
 		self.nextBar = nextBar
 		self.prevBar = prevBar