comparison Syncopation models/syncopation.py @ 35:3a878de00d19

made some small changes to files

 Author: Chunyang Song
 Institution: Centre for Digital Music, Queen Mary University of London
 
 '''
 
-def sync_perbar_permodel (model, bar, parameters):
+def sync_perbar_permodel (model, bar, parameters=None):
 	return model.get_syncopation(bar, parameters)
 
- def syncopation_barlist_permodel(model, source, parameters):
+ def syncopation_barlist_permodel(model, source, parameters=None):
  	total = 0
  	numberOfNotes = 0
 
- 	
+	
 
  	for bar in barlist:
  		if sync_perbar_permodel(model, bar, parameters) != None:
  			total += sync_perbar_permodel(model, bar, parameters)
  			numberOfNotes += sum(bar.get_binary_sequence())

 # 		if sync_perbar != None:
 # 			syncopation = syncopation + sync_perbar
 
 # 	return syncopation
 
-
-### TESTING
-# clave = [1,0,0,1,0,0,1,0,0,0,1,0,1,0,0,0]
-# bf = [0,0,0,1,0,0,0,0,0,0,1,0]
-# rhythm = [0,1,0,1,0,1,0,1]
-# classic1 = [1,0,1,1]*3 + [1,0,0,0]
-# classic2 = [1,0,0,1]*3 + [1,0,0,0]
-# shiko = [1,0,1,1,0,1,1,0]
-# rumba = [1,0,0,1,0,0,0,1,0,0,1,0,1,0,0,0]
-# soukous = [1,0,0,1,0,0,1,0,0,0,1,1,0,0,0,0]
-# gahu = [1,0,0,1,0,0,1,0,0,0,1,0,0,0,1,0]
-# bossanova = [1,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0]
-
-# classic12 = [1,0,0,1,1,1,1,0,0,1,1,1]
-# soli = [1,0,1,0,1,0,1,0,1,1,0,1]
-
-# print sync_perbar(seq = clave, model = 'WNBD', timesig = '4/4')