diff Syncopation models/synpy/syncopation.py @ 50:e71028851131

updating latex and bug fixes to main py files

--- a/Syncopation models/synpy/syncopation.py	Mon Apr 27 09:46:18 2015 +0100
+++ b/Syncopation models/synpy/syncopation.py	Mon Apr 27 09:51:15 2015 +0100
@@ -21,7 +21,9 @@
  		barlist = source
  		sourceType = "bar list"
  	elif isinstance(source, Bar):
- 		barlist = BarList().append(source)
+ 		barlist = BarList()
+ 		barlist.append(source)
+ 		print barlist
  		sourceType = "single bar"
 	elif isinstance(source, basestring):
 		#treat source as a filename
@@ -43,13 +45,19 @@
 	discardedlist = []
 	includedlist = []
 
+
 	if barlist!=None:
 		for bar in barlist:
-			if not bar.is_empty():
-				barSyncopation = sync_perbar_permodel(model, bar, parameters)
-			else:
-				barSyncopation = None
-				print 'Bar %d cannot be measured because it is empty, returning None.' % barlist.index(bar)
+			print 'processing bar %d' % (barlist.index(bar)+1)
+
+			barSyncopation = sync_perbar_permodel(model, bar, parameters)
+			
+
+			# if not bar.is_empty():
+			# 	barSyncopation = sync_perbar_permodel(model, bar, parameters)
+			# else:
+			# 	barSyncopation = None
+			# 	print 'Bar %d cannot be measured because it is empty, returning None.' % barlist.index(bar)
 			
 			barResults.append(barSyncopation)
 			if barSyncopation != None:
@@ -59,13 +67,16 @@
 			else:
 				barsDiscarded += 1
 				discardedlist.append(barlist.index(bar))
-				print 'Model could not measure bar %d, returning None.' % barlist.index(bar)
+				print 'Model could not measure bar %d, returning None.' % (barlist.index(bar)+1)
 
 		import WNBD
 		if model is WNBD:
 			total =  total / numberOfNotes
 
-		average = total / (len(barResults)-barsDiscarded)
+		if len(barResults)>barsDiscarded:
+			average = total / (len(barResults)-barsDiscarded)
+		else:
+			average = total
 
 	output = {
  			"model_name":model.__name__ , 
@@ -75,6 +86,7 @@
  			"number_of_bars":len(barResults), 
  			"number_of_bars_not_measured":barsDiscarded, 
  			"bars_with_valid_output":includedlist, 
+ 			"bars_without_valid_output":discardedlist, 
  			"syncopation_by_bar":barResults
  			}