comparison Syncopation models/music_objects.py @ 20:b959c2acb927

Refactored all models except for KTH, all past testing except for SG.

 
 	def get_subdivision_sequence(self):
 		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
 
 	def get_t_span(self):
 		# return the length of a bar in time units
 		return None # NEED TO IMPLEMENT
 
 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])
 			
 	def get_denominator(self):