Mercurial > hg > syncopation-dataset
diff Syncopation models/music_objects.py @ 20:b959c2acb927
Refactored all models except for KTH, all past testing except for SG.
| author | csong <csong@eecs.qmul.ac.uk> |
|---|---|
| date | Tue, 07 Apr 2015 19:05:07 +0100 |
| parents | 43fa04812800 |
| children | b6daddeefda9 |
line wrap: on
line diff
--- a/Syncopation models/music_objects.py Fri Apr 03 22:57:27 2015 +0100 +++ b/Syncopation models/music_objects.py Tue Apr 07 19:05:07 2015 +0100 @@ -96,7 +96,7 @@ return self.timeSignature.get_subdivision_sequence() def get_beat_level(self): - return ParameterSetter.get_beat_level(self.timeSignature) + return self.timeSignature.get_beat_level() def get_time_signature(self): return self.timeSignature @@ -107,17 +107,17 @@ class TimeSignature(): def __init__(self, inputString): - if inputString in parameter_setter.readTimesig(): + if inputString in parameter_setter.read_time_signature(): self.tsString = inputString else: print "Error: undefined time-signature ", inputString raise NullTimeSignatureError def get_subdivision_sequence(self): - return parameter_setter.timesigBase[self.tsString][0] + return parameter_setter.timeSignatureBase[self.tsString][0] def get_beat_level(self): - return parameter_setter.timesigBase[self.tsString][1] + return parameter_setter.timeSignatureBase[self.tsString][1] def get_numerator(self): return int(self.tsString.split('/')[0])