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

made some small changes to files

 '''
-Author: Chunyang Song
+Authors: Chunyang Song, Christopher Harte
 Institution: Centre for Digital Music, Queen Mary University of London
 '''
 
 # Parse the rhythm file and return a list of Bar objects
 #Piece = []

 
 def discard_spaces(line):
 	line = line.replace(" ", '').replace("\t", '')
 	return line
 
-def extractInfo(line):
-	try:
-		if '{' not in line and '}' not in line:
-			raise RhythmSyntaxError(line)
-		else:
-			return line[line.find('{')+1 : line.find('}')]
-	except RhythmSyntaxError:
-		print 'Rhythmic information needs to be enclosed by "{" and "}"'
-
+# def extractInfo(line):
+# 	try:
+# 		if '{' not in line and '}' not in line:
+# 			raise RhythmSyntaxError(line)
+# 		else:
+# 			return line[line.find('{')+1 : line.find('}')]
+# 	except RhythmSyntaxError:
+# 		print 'Rhythmic information needs to be enclosed by "{" and "}"'
 
 
 def read_rhythm(fileName):
 	fileContent = file(fileName)
 

 			barList.concat(newbarlist)
 
 	return barList
 
 def is_comment(line):
-	if discard_spaces(line)[0]=="#":
+	if discard_spaces(line)[0]==comment_sign:
 		return True
 	else:
 		return False
 
 def parse_line(line,  timeSignature=None, tempo=None, ticksPerQuarter=None):