diff Syncopation models/rhythm_parser.py @ 20:b959c2acb927

Refactored all models except for KTH, all past testing except for SG.
author csong <csong@eecs.qmul.ac.uk>
date Tue, 07 Apr 2015 19:05:07 +0100
parents a3ed7d2b57d8
children 7a1730bbf15a
line wrap: on
line diff
--- a/Syncopation models/rhythm_parser.py	Fri Apr 03 22:57:27 2015 +0100
+++ b/Syncopation models/rhythm_parser.py	Tue Apr 07 19:05:07 2015 +0100
@@ -6,7 +6,7 @@
 # Parse the rhythm file and return a list of Bar objects
 Piece = []
 
-from parameter_setter import timesigBase
+from parameter_setter import timeSignatureBase
 
 
 comment_sign = '#'
@@ -98,9 +98,9 @@
 #def checkTimesig(input):
 
 
-# TESTING
-line = 't{4/4}	q{1,0,0,1,0,0,1,0,0,0,1,0,0.8,0,0,0} t{2/4} # This is a comment'
-# print discardSpaces(discardComments(line))
-print line[line.find('{')+1:line.find('}')]
-#print readRhythm("rhythmbase/testrhythm.txt")
+# # TESTING
+# line = 't{4/4}	q{1,0,0,1,0,0,1,0,0,0,1,0,0.8,0,0,0} t{2/4} # This is a comment'
+# # print discardSpaces(discardComments(line))
+# print line[line.find('{')+1:line.find('}')]
+# #print readRhythm("rhythmbase/testrhythm.txt")