Mercurial > hg > syncopation-dataset
diff Syncopation models/music_objects.py @ 10:a3ed7d2b57d8
updating main py files to point at new
file names
| author | christopherh <christopher.harte@eecs.qmul.ac.uk> |
|---|---|
| date | Fri, 03 Apr 2015 16:02:10 +0100 |
| parents | c2843ef4de2c |
| children | 4fb9c00e4ef0 |
line wrap: on
line diff
--- a/Syncopation models/music_objects.py Fri Apr 03 11:41:01 2015 +0100 +++ b/Syncopation models/music_objects.py Fri Apr 03 16:02:10 2015 +0100 @@ -1,12 +1,12 @@ -from BasicFuncs import ceiling +from basic_functions import ceiling, string_to_sequence -import ParameterSetter -import RhythmParser +import parameter_setter +import rhythm_parser class Note(): def __init__(self, argstring): - intlist = map(int,argstring.split(',')) + intlist = string_to_sequence(argstring) self.startTime = intlist[0] self.duration = intlist[1] self.velocity = intlist[2] @@ -20,7 +20,7 @@ self.string_to_note_sequence(noteSequenceString) def string_to_note_sequence(self, noteSequenceString): - noteSequenceString = RhythmParser.discardSpaces(noteSequenceString) + noteSequenceString = rhythm_parser.discardSpaces(noteSequenceString) # try: # Turning "(1,2,3),(4,5,6),(7,8,9)" into ["1,2,3","4,5,6,","7,8,9"] listStrings = noteSequenceString[1:-1].split("),(") @@ -30,13 +30,14 @@ # toString() -print NoteSequence("(1,2,3),(4,5,6),(7,8,9)") -# class VelocitySequence(list): -# def __init__(self, noteSequenceString=None): -# if noteSequenceString!=None: -# self.string_to_note_sequence(noteSequenceString) +#print NoteSequence("(1,2,3),(4,5,6),(7,8,9)") +class VelocitySequence(list): + def __init__(self, noteSequenceString=None): + if noteSequenceString!=None: + self.string_to_note_sequence(noteSequenceString) -# def string_to_note_sequence(string): + def string_to_note_sequence(self,inputString): + self.extend(string_to_sequence(inputString)) class BarList(list):