Overview
Comment: | Made some changes to the parser. Don't remember what. |
---|---|
Timelines: | family | ancestors | master |
Files: | files | file ages | folders |
SHA1: |
87435601e4038963fe1778ef7599b834 |
User & Date: | brian on 2011-06-12 20:32:21 |
Other Links: | branch diff | manifest | tags |
Context
2011-06-12
| ||
20:32 | Made some changes to the parser. Don't remember what. Leaf check-in: 87435601e4 user: brian tags: master | |
2011-02-10
| ||
23:50 | Program generates a render order for the instruments based on their sync order check-in: 689adc054e user: brian@linux-85dd.site tags: master | |
Changes
Modified cfg.py from [e9b556b4f3] to [3cbe823f2f].
︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | + + + + + + + + + + + + + + + + + + + | try: render_order = topsort.topsort([[composition[movement][section][instrument]["sync"], instrument] if "sync" in composition[movement][section][instrument].keys() else [None, instrument] for instrument in composition[movement][section]]) except topsort.CycleError as ex: print "Your instruments are synced in a circle! This makes no sense!" print movement, section print ex sys.exit(1) while None in render_order: render_order.remove(None) for instrument in render_order: grammars = composition[movement][section][instrument]["grammars"] for grammar in grammars: if isinstance(grammars[grammar], list): for option in range(len(grammar)): grammars[grammar][option] = parse.parse(grammars[grammar][option]) else: grammars[grammar] = parse.parse(grammars[grammar]) print instrument, movement, section print grammars def generate_score_phrase(grammar, grammars): count_length = while count_length < 100000: # for comp_name in progression.split(): # comp_start_time = max_t # for instr_name, instr in composition[comp_name].iteritems(): # generated_score = generate_score(instr["score"], instr["grammars"]) # Fill in the scores by generating them based on the grammars ## print generated_score |
︙ |
Modified parse.py from [3ec57c3fbe] to [c06717e335].
︙ | |||
13 14 15 16 17 18 19 | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | - + + - - + + + | class Chord(): def __init__(self, value, duration=.5, chord_type="major", octave=5): self.value = value self.duration = duration self.chord_type = chord_type self.octave = octave def __repr__(self): |
︙ | |||
67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | + + + + + + + | # Parse (yacc) def p_note_list(p): '''score : score note | score chord | score rest | score node ''' p[0] = p[1] + [p[2]] def p_score(p): '''score : note | chord | rest ''' p[0] = [p[1]] def p_node(p): '''node : NODE ''' p[0] = p[1] def p_chord_length(p): ''' chord : chord NOTE_LENGTH ''' new_note = p[1] new_note.duration = p[2] p[0] = new_note |
︙ | |||
101 102 103 104 105 106 107 | 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 | - + - + + | def p_chord(p): '''chord : PAREN note PAREN | PAREN note CHORD_TYPE PAREN ''' pitch = p[2].value pitch = pitch.upper() p[0] = Chord(value=pitch, octave=default_octave) |
︙ |
Added score.yaml version [29fd4ba47c].
|