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

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
comparison
equal deleted inserted replaced
70:c9615e237705 71:9a60ca4ae0fb
175 self.velocitySequence = None 175 self.velocitySequence = None
176 elif isinstance(rhythmSequence, VelocitySequence): 176 elif isinstance(rhythmSequence, VelocitySequence):
177 self.velocitySequence = rhythmSequence 177 self.velocitySequence = rhythmSequence
178 self.noteSequence = None 178 self.noteSequence = None
179 179
180 self.tpq = ticksPerQuarter
181 self.qpm = qpmTempo
182 if isinstance(timeSignature, basestring): 180 if isinstance(timeSignature, basestring):
183 self.timeSignature = TimeSignature(timeSignature) 181 self.timeSignature = TimeSignature(timeSignature)
184 else: 182 else:
185 self.timeSignature = timeSignature 183 self.timeSignature = timeSignature
184
185 if ticksPerQuarter==None:
186 self.tpq = len(self.get_velocity_sequence())*self.timeSignature.get_denominator()/(4*self.timeSignature.get_numerator())
187 else:
188 self.tpq = ticksPerQuarter
189
190 self.qpm = qpmTempo
191
192
193
186 self.nextBar = nextBar 194 self.nextBar = nextBar
187 self.prevBar = prevBar 195 self.prevBar = prevBar
188 196
189 def get_note_sequence(self): 197 def get_note_sequence(self):
190 if self.noteSequence == None: 198 if self.noteSequence == None: