Changes In Branch develop Through [192b8b1639] Excluding Merge-Ins
This is equivalent to a diff from 689adc054e to 192b8b1639
|
2011-10-13
| ||
| 18:15 | Program now renders instruments according to sync order check-in: fde4a012ea user: brian tags: develop | |
|
2011-10-11
| ||
| 15:31 | Merged in rewrite of core functionality check-in: 192b8b1639 user: brian tags: develop | |
| 15:19 | Played around a little with melodies and instruments Closed-Leaf check-in: 29231e328a user: brian tags: feature/abc | |
|
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 [8f705f0ccb].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 |
out asound
endin
instr 3
asound foscili p4, cpspch(p5), 5, 2, 3, p9
out asound
endin
| > > > > | 13 14 15 16 17 18 19 20 21 22 23 |
out asound
endin
instr 3
asound foscili p4, cpspch(p5), 5, 2, 3, p9
out asound
endin
instr 4
aFMinst foscili p4, cpspch(p5), p6, p7, p8, p9
endin
|
Modified cfg.py from [e9b556b4f3] to [24a74756aa].
1 2 3 4 5 6 7 | #!/usr/bin/env python from __future__ import division import os import random import sys import time | > < > > > > | | | > > > | | > > > > > > > > > | | < | | > > > > > > | > > | < > > > > > > | < < | > > | < < | > > > | < > | | | | | < > | | < < > > > > > | > > > > > > > | | > > > > > > | > > | < < < < < > > > > > > | < | | | > | | | | | > | < | > | | | < | > | | < | | | | > > > > > > | | < > | > > | > | | | < < | > | < | < < < < < < < < < < < < | > > > | > | | | > | > | < > > | < > > | < > | > | | | | > > > > > | | | | > > > | 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 |
#!/usr/bin/env python
from __future__ import division
import os
import pdb
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"],
},
},
},
},
}
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 ["fm_test"]:
print "; Section " + section
subsection_start = section_start
section = composition[section]
for subsection in ["intro", "body", "outro"]:
try:
print "; Subsection " + subsection
subsection = section[subsection]
instrs = []
for instr in subsection:
print ";Instrument " + instr
instr = subsection[instr]
sync = None
max_time = instr["duration"]
instr_score = render_instr(instr, sync, 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, sync, max_time):
grammars = instr["grammars"]
for g in instr["grammars"]:
for i in range(len(grammars[g])):
grammars[g][i] = parse.parse(grammars[g][i])
init_node = random.choice(instr["grammars"].keys())
init_score = random.choice(instr["grammars"][init_node])
score = init_score
while True:
time_remaining = max_time - score_len(score)
try:
score = choose_node(score, grammars, time_remaining, sync)
except ValueError:
break
return score
def choose_node(score, grammars, time_remaining, sync):
if time_remaining <= 0:
raise ValueError("No time remaining in the score")
node = None
node_index = None
for item in range(len(score)):
if isinstance(score[item], tree.Tree):
node = score[item].name
node_index = item
if node is None:
raise ValueError("No more nodes to fill in")
options = []
for g in range(len(grammars[node])):
if score_len(grammars[node][g]) <= time_remaining:
options.append(grammars[node][g])
if len(options) == 0:
raise ValueError("No available grammars that will fit in the score")
if sync:
pass
else:
phrase = random.choice(options)
score = score[:node_index-1] + phrase + score[node_index+1:]
return score
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",
"D": "02",
"D#": "03",
"E": "04",
"F": "05",
"F#": "06",
"G": "07",
"G#": "08",
"A": "09",
"A#": "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})
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()
|
Modified parse.py from [3ec57c3fbe] to [2afbfc4534].
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 62 |
#!/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
self.accidental = None
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,2}|_{1,2}|="
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
'''
| > > | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 |
# 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
'''
|
| ︙ | ︙ | |||
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)
| > > > > > > > | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 |
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):
print p
raise Exception("Syntax error at '%s' of element type %s" % (p.value, p.type))
yacc.yacc()
return yacc.parse(score)
|
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
|
Modified test.sco from [c92bf3908c] to [e27e42951e].
|
| | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < | < < < < < < < < | < < < < < | < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 |
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 fm_test
; Subsection intro
;Instrument melody
i2 0.000000 1.000000 7000 8.04 2 6 5 1
i2 1.000000 1.000000 7000 8.04 2 6 5 1
i2 2.000000 1.000000 7000 8.05 2 6 5 1
i2 3.000000 1.000000 7000 8.05 2 6 5 1
i2 4.000000 0.500000 7000 8.07 2 6 5 1
i2 4.500000 0.500000 7000 8.07 2 6 5 1
i2 5.000000 3.000000 7000 8.07 2 6 5 1
; Subsection body
; Subsection outro
|
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
|