comparison Syncopation models/parameter_setter.py @ 20:b959c2acb927

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

 # Set the parameters: subdivision_seq, weight_seq, L_max, strong_beat_level
 
 # {'key': time-signature} :  
 # {'value': [subdivision_seq, theoretical beat-level represented by index in the subdivision_seq list]}
 timeSignatureBase = {
-	'2/2': [[1,2,2,2,2],1],
-	'3/2': [[1,3,2,2,2],1],
-	'4/2': [[1,2,2,2,2],1],
-	'2/4': [[1,2,2,2,2],1],
-	'3/4': [[1,3,2,2,2],1],
-	'4/4': [[1,2,2,2,2],2],
-	'5/4': [[1,5,2,2,2],1],
-	'7/4': [[1,7,2,2,2],1],
-	'3/8': [[1,3,2,2,2],1],
-	'5/8': [[1,5,2,2,2],1],
-	'6/8': [[1,2,3,2,2],1],
-	'9/8': [[1,3,3,2,2],1],
-	'12/8':[[1,2,2,3,2],2],	
+	'2/2': [[1,2,2,2,2,2],1],
+	'3/2': [[1,3,2,2,2,2],1],
+	'4/2': [[1,2,2,2,2,2],1],
+	'2/4': [[1,2,2,2,2,2],1],
+	'3/4': [[1,3,2,2,2,2],1],
+	'4/4': [[1,2,2,2,2,2],2],
+	'5/4': [[1,5,2,2,2,2],1],
+	'7/4': [[1,7,2,2,2,2],1],
+	'3/8': [[1,3,2,2,2,2],1],
+	'5/8': [[1,5,2,2,2,2],1],
+	'6/8': [[1,2,3,2,2,2],1],
+	'9/8': [[1,3,3,2,2,2],1],
+	'12/8':[[1,2,2,3,2,2],2],	
 }
 
 def add_time_signature(timeSignature, subdivisionSequence, beatLevel):
 	if is_time_signature_valid(timeSignature,subdivisionSequence,beatLevel):
 		if timeSignature in timesigBase: