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

made some small changes to files
author csong <csong@eecs.qmul.ac.uk>
date Mon, 13 Apr 2015 17:43:18 +0100
parents 5de1cb45c145
children cc38b3047ed9
line wrap: on
line diff
--- a/Syncopation models/syncopation.py	Sun Apr 12 23:52:08 2015 +0100
+++ b/Syncopation models/syncopation.py	Mon Apr 13 17:43:18 2015 +0100
@@ -4,14 +4,14 @@
 
 '''
 
-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:
@@ -102,20 +102,3 @@
 
 # 	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')