comparison Syncopation models/LHL.py @ 19:9030967a05f8

Refactored parameter_setter, basic_functions. Halfway fixing parameter argument in LHL model.

 		subBinarySequences = subdivide(binarySequence, subdivisionSequence[level+1])	
 		subWeightSequences = concatenate([metricalWeight],repeat([weightSequence[level+1]],subdivisionSequence[level+1]-1))
 		for a in range(len(subBinarySequences)):
 			recursive_tree(subBinarySequences[a], subdivisionSequence, weightSequence, subWeightSequences[a], level+1)
 
-def get_syncopation(bar, weightSequence = None, LMax = None):
+def are_parameters_valid(parameters):
+	areValid = False
+	if 'Lmax' not in parameters :
+
+def get_syncopation(bar, parameters = None):
 	'''
 	The get_syncopation function calculates syncopation value . 
 	'''
 #def get_syncopation(seq, subdivision_seq, weight_seq, prebar_seq, rhythm_category):
 	syncopation = None

 	subdivisionSequence = bar.get_subdivision_sequence()
 
 	if get_rhythm_category(binarySequence, subdivisionSequence) == 'poly':
 		print 'Warning: LHL model detects polyrhythms so returning None.'
 	else:
-		if weightSequence == None:
-			if LMax == None:
-				LMax  = 5
-				weightSequence = range(0,-LMax,-1)
+		# If the parameters are not given, use the default settings
+		if parameters == None:
+			Lmax  = 5
+			weightSequence = range(0,-Lmax,-1)
+		else:
+			if are_parameters_valid(parameters):
+				Lmax = parameters['Lmax']
+				weightSequence = parameters['W']
+			else:
+				pass
+				#raise InvalidParameterError
 
 		# If there is rhythm in previous bar, process its tree structure
 		if bar.get_previous_bar() != None:
 			prebarBinarySequence = bar.get_previous_bar().get_binary_sequence()
 			recursive_tree(ceiling(prebarBinarySequence), subdivisionSequence, weightSequence, weightSequence[0],0)