comparison Syncopation models/rhythm_parser.py @ 20:b959c2acb927

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

 '''
 
 # Parse the rhythm file and return a list of Bar objects
 Piece = []
 
-from parameter_setter import timesigBase
+from parameter_setter import timeSignatureBase
 
 
 comment_sign = '#'
 def discardComments(line):
 	if comment_sign in line:

 
 # To check whether the given time-signature is existed; if not then requires user to add in the new time-signature
 #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")