comparison Syncopation models/LHL.py @ 38:cc38b3047ed9

updated syncopation.y to allow output of sync for a bar list
also fixed some problems in models and other modules

 
 from basic_functions import concatenate, repeat, subdivide, ceiling, get_rhythm_category
 from parameter_setter import are_parameters_valid
 
 terminalNodes = []		# Global variable, storing all the terminal nodes from recursive tree structure in time order
+
+
 
 # Each terminnal node contains two properties: its node type (note or rest) and its metrical weight.
 class Node:
 	def __init__(self,nodeType,metricalWeight):
 		self.nodeType = nodeType

 
 		if not are_parameters_valid(Lmax, weightSequence, subdivisionSequence):
 			print 'Error: the given parameters are not valid.'
 		else:
 			# 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()
+			prevbar =  bar.get_previous_bar()
+			if prevbar != None and not prevbar.is_empty():
+				prebarBinarySequence = prevbar.get_binary_sequence()
 				recursive_tree(ceiling(prebarBinarySequence), subdivisionSequence, weightSequence, weightSequence[0],0)
 				
-				# Only keep the last note-type node
-				while terminalNodes[-1].nodeType != 'N':
-					del terminalNodes[-1]
-				del terminalNodes[0:-1]
+				if len(terminalNodes)>0:
+					# Only keep the last note-type node
+					while terminalNodes[-1].nodeType != 'N':
+						del terminalNodes[-1]
+					del terminalNodes[0:-1]
 
 			# For the rhythm in the current bar, process its tree structure and store the terminal nodes 
 			recursive_tree(ceiling(binarySequence), subdivisionSequence, weightSequence, weightSequence[0],0)
 			
 			# for t in terminalNodes: