Changes In Branch develop Through [0021a3fe22] Excluding Merge-Ins
This is equivalent to a diff from 689adc054e to 0021a3fe22
2011-11-03
| ||
19:23 | Added a very, very bad set of violin samples check-in: 8293931a34 user: brian tags: develop | |
18:50 | Merged in diskin2 mode for cfg.orc check-in: 0021a3fe22 user: brian tags: develop | |
18:49 | By magic, fixed problem with not all bass notes playing via diskin2 Closed-Leaf check-in: 1bc01ba9c9 user: brian tags: feature/diskin2 | |
2011-11-01
| ||
18:54 | Imported the todo list from MUS306 check-in: 072fa6ad30 user: brian tags: develop | |
2011-06-12
| ||
20:32 | Made some changes to the parser. Don't remember what. Leaf check-in: 87435601e4 user: brian tags: master | |
20:31 | Create new branch named "develop" check-in: 9f4c4666c5 user: brian tags: develop | |
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 | |
22:34 | Added lexical support for parens instead of quotes for chords, cleaned up the yacc parser, added lex tokens for syncopation check-in: 702d933446 user: brian@linux-85dd.site tags: master | |
Modified cfg.orc from [9f49be1cae] to [c58361434c].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | sr=44100 ksmps=20 nchnls=1 instr 1 asound pluck p4, cpspch(p5), cpspch(p6), p7, p8 p9 p10 out asound endin instr 2 kenv linen p4, .1, p3, .2; envelope asound oscili kenv, cpspch(p5), p6; oscillator out asound endin | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | < | 1 2 3 4 5 6 7 8 9 10 11 12 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 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | sr=44100 ksmps=20 nchnls=1 instr 3 if p5=105 then asig diskin2 "samples/bass/1.05.wav", 1 elseif p5=1.06 then asig diskin2 "samples/bass/1.06.wav", 1 elseif p5=1.07 then asig diskin2 "samples/bass/1.07.wav", 1 elseif p5=1.08 then asig diskin2 "samples/bass/1.08.wav", 1 elseif p5=1.08 then asig diskin2 "samples/bass/1.09.wav", 1 elseif p5=1.10 then asig diskin2 "samples/bass/1.10.wav", 1 elseif p5=1.11 then asig diskin2 "samples/bass/1.11.wav", 1 elseif p5=2.00 then asig diskin2 "samples/bass/2.00.wav", 1 elseif p5=2.01 then asig diskin2 "samples/bass/2.01.wav", 1 elseif p5=2.02 then asig diskin2 "samples/bass/2.02.wav", 1 elseif p5=2.03 then asig diskin2 "samples/bass/2.03.wav", 1 elseif p5=2.04 then asig diskin2 "samples/bass/2.04.wav", 1 elseif p5=2.05 then asig diskin2 "samples/bass/2.05.wav", 1 elseif p5=2.06 then asig diskin2 "samples/bass/2.06.wav", 1 elseif p5=2.07 then asig diskin2 "samples/bass/2.07.wav", 1 elseif p5=2.08 then asig diskin2 "samples/bass/2.08.wav", 1 elseif p5=2.09 then asig diskin2 "samples/bass/2.09.wav", 1 elseif p5=2.10 then asig diskin2 "samples/bass/2.10.wav", 1 elseif p5=2.11 then asig diskin2 "samples/bass/2.11.wav", 1 elseif p5=3.00 then asig diskin2 "samples/bass/3.00.wav", 1 elseif p5=3.01 then asig diskin2 "samples/bass/3.01.wav", 1 elseif p5=3.02 then asig diskin2 "samples/bass/3.02.wav", 1 elseif p5=3.03 then asig diskin2 "samples/bass/3.03.wav", 1 elseif p5=3.04 then asig diskin2 "samples/bass/3.04.wav", 1 elseif p5=3.05 then asig diskin2 "samples/bass/3.05.wav", 1 elseif p5=3.06 then asig diskin2 "samples/bass/3.06.wav", 1 elseif p5=3.07 then asig diskin2 "samples/bass/3.07.wav", 1 elseif p5=3.08 then asig diskin2 "samples/bass/3.08.wav", 1 elseif p5=3.09 then asig diskin2 "samples/bass/3.09.wav", 1 elseif p5=3.10 then asig diskin2 "samples/bass/3.10.wav", 1 elseif p5=3.11 then asig diskin2 "samples/bass/3.11.wav", 1 endif outs asig endin instr 1 asound pluck p4, cpspch(p5), cpspch(p6), p7, p8 p9 p10 out asound endin instr 2 kenv linen p4, .1, p3, .2; envelope asound oscili kenv, cpspch(p5), p6; oscillator out asound endin instr 4 aFMinst foscili p4, cpspch(p5), p6, p7, p8, p9 endin |
Deleted cfg.py version [e9b556b4f3].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Modified parse.py from [3ec57c3fbe] to [a8d0994825].
1 2 3 4 | #!/usr/bin/env python from ply import lex, yacc class Note(): | > > | < | | > | | | > | 1 2 3 4 5 6 7 8 9 10 11 12 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 61 | #!/usr/bin/env python import tree from ply import lex, yacc class Note(): def __init__(self, value, duration=1, octave=8): self.value = value self.duration = duration self.octave = octave def __repr__(self): return "Note %s %s %s" % (self.value, self.duration, self.octave) class Chord(): def __init__(self, value, duration=1, chord_type="major", octave=5): self.value = value self.duration = duration self.chord_type = chord_type self.octave = octave def __repr__(self): return "Chord %s %s %s" % (self.value, self.duration, self.chord_type, self.octave) class Rest(): def __init__(self, duration=1): self.duration = duration def __repr__(self): return "Rest node %s" % self.duration def parse(score, default_octave=8): # Tokenize (lex) tokens = ( "NOTE_LENGTH", "BASENOTE", "ACCIDENTAL", "REST", "OCTAVE", "CHORD_TYPE", "PAREN", "SYNCOPATE", "NODE", ) t_ignore = " |" t_BASENOTE = r"[A-Ga-g]" # t_BASENOTE = r"I+V?|VI*|i+v?|vi*" t_ACCIDENTAL = r"\^{1}|_{1}|=" t_REST = r"z" t_OCTAVE = r"'+|,+" t_CHORD_TYPE = r"m|7|m7|0|o|\+|mb5|sus|sus4|maj7|mmaj7|7sus4|dim|dim7|7b5|m7b5|6|b6|m6|mb6|46|maj9|9|add9|7b9|m9" t_PAREN = "\(|\)" t_SYNCOPATE = "\+|-" t_NODE = r"\([a-zA-Z0-9_-]+\)" def t_NOTE_LENGTH(t): r"/?\d+" multiplier = float(t.value.strip("/")) if t.value.startswith("/"): multiplier = 1/multiplier t.value = multiplier |
︙ | ︙ | |||
67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | # Parse (yacc) def p_note_list(p): '''score : score note | score chord | score rest ''' p[0] = p[1] + [p[2]] def p_score(p): '''score : note | chord | rest ''' p[0] = [p[1]] def p_chord_length(p): ''' chord : chord NOTE_LENGTH ''' | > > | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | # 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 | node ''' p[0] = [p[1]] def p_chord_length(p): ''' chord : chord NOTE_LENGTH ''' |
︙ | ︙ | |||
114 115 116 117 118 119 120 | ''' note.syncopate = p[2] def p_accidental(p): '''note : ACCIDENTAL note ''' | | > > > | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | ''' note.syncopate = p[2] def p_accidental(p): '''note : ACCIDENTAL note ''' if p[1] == "^": p[2].value += "#" else: p[2].value += "b" p[0] = p[2] def p_octave(p): '''note : note OCTAVE ''' count = len(p[2]) increment_or_decrement = 1 if p[2].startswith("'") else -1 |
︙ | ︙ | |||
137 138 139 140 141 142 143 144 145 146 147 148 149 150 | def p_rest(p): ''' rest : REST | REST NOTE_LENGTH ''' p[0] = Rest() if len(p) > 2: p[0].duration = p[2] def p_error(p): raise Exception("Syntax error at '%s' of element type %s" % (p.value, p.type)) yacc.yacc() return yacc.parse(score) | > > > > > > > > > | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | def p_rest(p): ''' rest : REST | REST NOTE_LENGTH ''' p[0] = Rest() if len(p) > 2: p[0].duration = p[2] def p_node(p): '''node : NODE ''' p[0] = tree.Tree(p[1].strip("(").strip(")")) def p_error(p): # import ipdb # ipdb.set_trace() print p raise Exception("Syntax error at '%s' of element type %s" % (p.value, p.type)) yacc.yacc() return yacc.parse(score) |
Added samples/bass/1.05.wav version [e6f01c2d0c].
cannot compute difference between binary files
Added samples/bass/1.06.wav version [589b4c9c16].
cannot compute difference between binary files
Added samples/bass/1.07.wav version [b5bd0e0b28].
cannot compute difference between binary files
Added samples/bass/1.08.wav version [4e22c8e289].
cannot compute difference between binary files
Added samples/bass/1.09.wav version [8eafba8350].
cannot compute difference between binary files
Added samples/bass/1.10.wav version [6c9d557273].
cannot compute difference between binary files
Added samples/bass/1.11.wav version [d210644e57].
cannot compute difference between binary files
Added samples/bass/2.00.wav version [df0ad67bd3].
cannot compute difference between binary files
Added samples/bass/2.01.wav version [5e4bdb6301].
cannot compute difference between binary files
Added samples/bass/2.02.wav version [2787d975d6].
cannot compute difference between binary files
Added samples/bass/2.03.wav version [6ce7982e46].
cannot compute difference between binary files
Added samples/bass/2.04.wav version [3c3feb5b24].
cannot compute difference between binary files
Added samples/bass/2.05.wav version [569b7181fc].
cannot compute difference between binary files
Added samples/bass/2.06.wav version [297d4f860f].
cannot compute difference between binary files
Added samples/bass/2.07.wav version [1ac14e3cd2].
cannot compute difference between binary files
Added samples/bass/2.08.wav version [b92037909c].
cannot compute difference between binary files
Added samples/bass/2.09.wav version [760599b161].
cannot compute difference between binary files
Added samples/bass/2.10.wav version [3b900ab89f].
cannot compute difference between binary files
Added samples/bass/2.11.wav version [bcaf91186d].
cannot compute difference between binary files
Added samples/bass/3.00.wav version [5d028b32a1].
cannot compute difference between binary files
Added samples/bass/3.01.wav version [9d6dded4d3].
cannot compute difference between binary files
Added samples/bass/3.02.wav version [78dab72fb7].
cannot compute difference between binary files
Added samples/bass/3.03.wav version [9476ff14fb].
cannot compute difference between binary files
Added samples/bass/3.04.wav version [0822a77edf].
cannot compute difference between binary files
Added samples/bass/3.05.wav version [dc233966b5].
cannot compute difference between binary files
Added samples/bass/3.06.wav version [c254ae3482].
cannot compute difference between binary files
Added samples/bass/3.07-old1.wav version [7e77a9e339].
cannot compute difference between binary files
Added samples/bass/3.07.wav version [23ec2fdb73].
cannot compute difference between binary files
Added samples/bass/3.08.wav version [c799d64faf].
cannot compute difference between binary files
Added samples/bass/3.09.wav version [cedce4e5ea].
cannot compute difference between binary files
Added samples/bass/3.10.wav version [bbc1ef4a09].
cannot compute difference between binary files
Added samples/bass/3.11.wav version [f679f5a61b].
cannot compute difference between binary files
Added samples/bass/Bass.arco.mf.sulE.C2B2.aiff version [b705aee00e].
cannot compute difference between binary files
Added samples/bass/Bass.arco.mf.sulE.C3D3.aiff version [17eacace3a].
cannot compute difference between binary files
Added samples/bass/Bass.arco.mf.sulG.C3B3.aiff version [8b429011eb].
cannot compute difference between binary files
Added samples/bass/Bass.arco.mf.sulG.G2B2.aiff version [8c3a1d88c6].
cannot compute difference between binary files
Added samples/bass/test.orc version [2795c8cc70].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | sr=44100 ksmps=20 nchnls=2 gifn ftgen 105, 0, 524288, -1, "8.05.wav", 0, 0, 1 ; Middle C gifn ftgen 106, 0, 524288, -1, "8.06.wav", 0, 0, 1 ; Middle C gifn ftgen 107, 0, 524288, -1, "8.07.wav", 0, 0, 1 ; Middle C gifn ftgen 108, 0, 524288, -1, "8.08.wav", 0, 0, 1 ; Middle C gifn ftgen 109, 0, 524288, -1, "8.09.wav", 0, 0, 1 ; Middle C gifn ftgen 110, 0, 524288, -1, "8.10.wav", 0, 0, 1 ; Middle C gifn ftgen 111, 0, 524288, -1, "8.18.wav", 0, 0, 1 ; Middle C instr 1 ; if p5=8.05 then ; asig diskin "8.05.wav" ; elseif p5=8.06 then ; asig diskin "8.06.wav" ; elseif p5=8.07 then ; asig diskin "8.07.wav" ; elseif p5=8.08 then ; asig diskin "8.08.wav" ; elseif p5=8.09 then ; asig diskin "8.09.wav" ; elseif p5=8.11 then ; asig diskin "8.10.wav" ; elseif p5=8.11 then ; asig diskin "8.18.wav" ; endif inum = p5*100 asig loscil 1, 1, inum, 1 outs asig, asig endin |
Added samples/bass/test.sco version [f5f91e8863].
> > > > > > > | 1 2 3 4 5 6 7 | f1 0 512 10 1 f2 0 8192 10 .24 .64 .88 .76 .06 .5 .34 .08 f3 0 1025 10 1 t 0 100 i1 0.000000 0.50000 7000 1.05 i1 0.500000 1.0000 7000 1.11 |
Added samples/bass/test.wav version [550291acb7].
cannot compute difference between binary files
Added score.yaml version [29fd4ba47c].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 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 | --- chorus: core: rhythm: csound_line: i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6 max_duration: 80 sync: timbre octave: 7 sustain: 1 grammars: u: - (I) (ii)/4 (ii)/4 (IV)/2 (V)2 (IV) (ii) x u - (I) (vii) (III) y u - (I) (v) (IV) u u w: (i) (VII)2 (VI)/4 (V)/4 (i)/4 (VII)2 (VI) (V) w u x: (III/2) (VI)/2 (III)/2 (vii)2 (i)2 (V) u y: (I) (vi)2 (IV) (V) y y u timbre: csound_line: i3 %(time)f %(duration)f 2000 %(octave)d.%(note)s 2 3 5 3 max_duration: 80 sync: melody sustain: 1 octave: 6 grammars: u: - I2+ VII2 V2 VI2 I2 IV/2 V/2 III2 u - I2- IV2 V2 IV I V2 III2 II2. u melody: csound_line: i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 2 max_duration: 80 octave: 8 grammars: u: - I V/2 V/2 V/2 I VII - IV' I IV I VII IV w: III/4 VI/4 II/4 V/4 VI/4 IV/4 VII2 x: I/2 I/2 VI IV/2 V2 z I/2 I/2 VI IV/2 V |
Added spiffyscore.py version [d189f30210].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 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 61 62 63 64 65 66 67 68 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 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 | #!/usr/bin/env python from __future__ import division import ipdb import os import random import sys import time import parse import topsort import yaml import tree random.seed(time.time()) def main(): composition = { "fm_test": { "intro": { "melody": { # Instrument 'melody' "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 2 6 5 1", "octave": 8, "duration": 10, "grammars": { # Notes for this instrument to use in this piece "u": ["G/2 G/2 | G/4 G/4 A/4 A/4 | A/2 A/2 | G | G | A | A | A3 (w)"], "w": ["E | E | F | F | G/2 G/2 | G3 (u)"], }, }, }, }, "verse1": { "intro": { "melody": { # Instrument 'melody' "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 1", "octave": 8, "duration": 10, "grammars": { # Notes for this instrument to use in this piece "u": ["G/2 G/2 | G/4 G/4 A/4 A/4 | A/2 A/2 | G | G | A | A | A3 (w)"], "w": ["E | E | F | F | G/2 G/2 | G3 (u)"], }, }, }, "body": { "melody": { # Instrument 'melody' "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 1", "octave": 8, "duration": 10, "grammars": { # Notes for this instrument to use in this piece "u": ["C | G/2 G/2 | G/2 G/2 | C | B, | F' | C | F | C | B | F | (w)"], "w": ["E/4 A/4 D/4 G/4 | F/4 F/4 B2 | (u)"], }, }, }, "outro": { "melody": { # Instrument 'melody' "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 1", "octave": 8, "duration": 10, "grammars": { # Notes for this instrument to use in this piece "u": ["C/4 C/4 C/4 C/4 | z2"], }, }, }, }, "verse2": { "body": { "melody": { # Instrument 'melody' "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 1", "octave": 8, "duration": 30, "grammars": { # Notes for this instrument to use in this piece "u": ["C | C | C | C | F/2 F/2 | F/2 F/2 | (u)", "D | D | G/2 A/2 | D | D | (u)"], }, }, "harmony": { # Instrument 'melody' "score_line": "i3 %(time)f %(duration)f 4000 %(octave)d.%(note)s 2 3 5 3", "octave": 8, "duration": 30, "grammars": { # Notes for this instrument to use in this piece "u": ["C | C | z | C | C | z/2 F/4 F/2 F/2 | F/2 F/2 | z (u)", "D | D | G/2 A/2 | D | D | z (u)"], }, }, "percussion": { # Instrument 'melody' "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6", "octave": 8, "duration": 30, "grammars": { # Notes for this instrument to use in this piece "u": ["C/4 C/4 C/4 C/4 | F/2 F/2 | F/2 F/2 | (u)", "D/4 D/4 G/4 A/4 | D | D | (v)"], "v": ["C | D | E | F | E | D | C | (u)",], }, }, }, "outro": { "percussion": { # Instrument 'melody' "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6", "octave": 8, "duration": 30, "grammars": { # Notes for this instrument to use in this piece "u": ["C/4 C/4 C/4 C/4"], }, }, }, }, "sync_test": { "body": { # "lead_instr": { # Instrument 'melody' # "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6", # "octave": 8, # "duration": 30, # "grammars": { # Notes for this instrument to use in this piece # "u": ["A/4, B/4, C/4 D/4 (u)", "D/4' D/4' D/4' D/4' (v)"], # "v": ["C/4 C/4 C/4 C/4 (w)"], # "w": ["E/4 F/4 E/4 F/4 (u)"], # }, # }, "follow_instr": { # Instrument 'melody' "score_line": "i3 %(time)f %(duration)f 7000 %(octave)d.%(note)s", # "sync": "lead_instr", "octave": 2, "duration": 30, "grammars": { # Notes for this instrument to use in this piece "u": ["A ^A B C ^C D ^D E F ^F G ^G"], # "u": ["E F G E (v)"], # "v": ["G A A A (e)", "G A A A (v)"], # "e": ["B A G A (v)"], }, }, }, }, } print '''f1 0 512 10 1 f2 0 8192 10 .24 .64 .88 .76 .06 .5 .34 .08 f3 0 1025 10 1 t 0 100 ''' section_start = 0 # for section in ["verse1", "verse2"]: for section in ["sync_test"]: print "; Section " + section subsection_start = section_start section = composition[section] for subsection in ["intro", "body", "outro"]: try: print "; Subsection " + subsection subsection = section[subsection] unordered_instrs = [] for instr in subsection: subsection[instr]["name"] = instr if not "sync" in subsection[instr].keys(): subsection[instr]["sync"] = None unordered_instrs.append([subsection[instr]["sync"], instr]) ordered_instrs = topsort.topsort(unordered_instrs) ordered_instrs.remove(None) # None used as a placeholder for sort order for instruments with no sync setting instrs = [] syncs = {} for instr in ordered_instrs: print ";Instrument " + instr instr = subsection[instr] max_time = instr["duration"] instr_score, syncs = render_instr(instr, syncs, max_time) instrs.append(instr_score) for line in generate_csound_score(instr_score, instr["score_line"], subsection_start): print line longest_score = max(instrs, key=lambda i: score_len(i)) subsection_start += score_len(longest_score) section_start += score_len(longest_score) except KeyError: pass def render_instr(instr, syncs, max_time): for g in instr["grammars"]: for i in range(len(instr["grammars"][g])): instr["grammars"][g][i] = parse.parse(instr["grammars"][g][i], default_octave=instr["octave"]) score= [] try: score, syncs = choose_phrase(instr, syncs, 0, max_time, None) while True: score_index_to_replace = None for item in range(len(score)): # Optimize this by caching the index of the last node I replaced and startng there if isinstance(score[item], tree.Tree): # Also, make this use the find_next_node() function (or whatever I called it) score_index_to_replace = item if score_index_to_replace is None: raise ValueError("No more nodes to fill in") time_remaining = max_time - score_len(score) new_phrase, syncs = choose_phrase(instr, syncs, score_len(score), time_remaining, score) score = score[:score_index_to_replace] + new_phrase + score[score_index_to_replace+1:] except ValueError: return (score, syncs) def choose_phrase(instr, syncs, current_time, time_remaining, score): '''Filters grammars for ones that match the sync option, and phrases that fit the time remaining in the score''' time_filtered_grammars = {} for grammar in instr["grammars"]: fitting_phrases = get_phrases_that_fit(instr["grammars"][grammar], time_remaining) if len(fitting_phrases) > 0: time_filtered_grammars[grammar] = fitting_phrases if len(time_filtered_grammars.keys()) == 0: raise ValueError("No available grammars that will fit in the score") grammar = None if instr["sync"] is not None: guiding_instr = instr["sync"] sync_node = get_sync_node_at_time(syncs[guiding_instr], current_time) if sync_node in time_filtered_grammars.keys(): grammar = sync_node else: grammar = random.choice(time_filtered_grammars.keys()) if score is None: grammar = random.choice(time_filtered_grammars.keys()) elif instr["sync"] is None: grammar = get_next_node(score); phrases = time_filtered_grammars[grammar] if instr["name"] not in syncs.keys(): syncs[instr["name"]] = [] syncs[instr["name"]].append({"node": grammar, "time": current_time}) return random.choice(phrases), syncs def get_phrases_that_fit(grammar, time_remaining): valid_phrases = [] for phrase in grammar: if score_len(phrase) <= time_remaining: valid_phrases.append(phrase) return valid_phrases def get_sync_node_at_time(syncs, t): for s in range(len(syncs)): if syncs[s]["time"] >= t: return syncs[s]["node"] def get_next_node(score): for token in score: if isinstance(token, tree.Tree): return token.name def score_len(score): total = 0 for n in score: if not isinstance(n, tree.Tree): total += n.duration return total def generate_csound_score(score, score_line, t): csound_note_values = { "C": "00", "C#": "01", "Db": "01", "D": "02", "D#": "03", "Eb": "03", "E": "04", "F": "05", "F#": "06", "Gb": "06", "G": "07", "G#": "08", "Ab": "08", "A": "09", "A#": "10", "Bb": "10", "B": "11", } csound_score = [] for token in score: if isinstance(token, parse.Chord): # Chords for note in token.chord: note = csound_note_values[note] csound_score.append(score_line % {"time": t, "octave": token.octave, "note": note, "duration": token.duration}) csound_score.append(score_line % {"time": t, "octave": token.octave, "note": note, "duration": token.duration}) elif isinstance(token, parse.Note): # Individual notes note = csound_note_values[token.value] csound_score.append(score_line % {"time": t, "octave": token.octave, "note": note, "duration": token.duration}) elif isinstance(token, tree.Tree): continue t += token.duration return csound_score if __name__ == "__main__": main() |
Deleted test.sco version [c92bf3908c].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted todo.org version [510751b73f].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Added tree.py version [29c78902c8].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | import pdb class Tree(): def __init__(self, name): self.nodes = [] self.name = name def traverse_depth_first(self): all_nodes = [] for node in self.nodes: if isinstance(node, Node): all_nodes.append(node) elif isinstance(node, Tree): # pdb.set_trace() all_nodes.extend(node.traverse_depth_first()) return all_nodes def __str__(self): return str(self.__unicode__()) def __unicode__(self): return self.nodes class Node(): def __init__(self, parent, data): self.parent = parent self.data = data def __str__(self): return str(self.__unicode__()) def __unicode__(self): return self.data |