Changes In Branch feature/abc Through [4b32d1483b] Excluding Merge-Ins
This is equivalent to a diff from 843dabad43 to 4b32d1483b
|
2011-09-22
| ||
| 18:04 | Fixed bug that prevented more than two sections from working properly check-in: b2ce9522e9 user: brian tags: feature/abc | |
| 17:58 | Fixed tempo for realz this time check-in: 4b32d1483b user: brian tags: feature/abc | |
| 17:49 | Fixed note duration calculation- whole is now 4, quarter is 1 check-in: 2906c127b7 user: brian tags: feature/abc | |
|
2011-09-13
| ||
| 18:29 | Create new branch named "feature/abc" check-in: 3833b59ec2 user: brian tags: feature/abc | |
|
2011-02-10
| ||
| 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 | |
|
2010-11-30
| ||
| 17:33 | This is what I submitted as my final piece for MUS 306 check-in: 843dabad43 user: spiffytech@gmail.com tags: master | |
| 06:22 | Added a timbre instrument, doubled the length of the piece, added intros and outro check-in: de7c009e4d user: spiffytech@gmail.com tags: master | |
Modified cfg.py from [019c552e42] to [b052479df1].
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 |
#!/usr/bin/env python
from __future__ import division
import os
import pdb
import random
import sys
import time
import parse
import tree
random.seed(time.time())
def main():
composition = {
"verse1": {
"melody": { # Instrument 'melody'
"score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 2",
"octave": 8,
"duration": 10,
"grammars": { # Notes for this instrument to use in this piece
"u": ["C 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)"],
},
},
},
"verse2": {
"melody": { # Instrument 'melody'
"score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 2",
"octave": 8,
"duration": 10,
"grammars": { # Notes for this instrument to use in this piece
"u": ["C C C C F/2 F/2 F/2 (u)", "D D G/2 A/2 D D (u)"],
},
},
"harmony": { # Instrument 'melody'
"score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 2",
"octave": 8,
"duration": 10,
"grammars": { # Notes for this instrument to use in this piece
"u": ["C C C C F/2 F/2 F/2 (u)", "D D G/2 A/2 D D (u)"],
},
},
},
}
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 60
'''
start = 0
for section in ["verse1", "verse2"]:
section = composition[section]
# for subsection in section
instrs = []
for instr in section.values():
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"], start):
print line
longest_score = max(instrs, key=lambda i: score_len(i))
start = score_len(longest_score)
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)
except ValueError:
break
return score
def choose_node(score, grammars, time_remaining):
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")
phrase = random.choice(options)
score = score[:node_index-1] + phrase + score[node_index+1:]
return score
# movement_start = 0
# progression = "verse1 verse2"
# for comp_name in progression.split():
# # We need an arbitrary grammar from this instrument to start the score with
# max_instr = 0
# for instr_name, instr in composition[comp_name].iteritems():
# for grammar in instr["grammars"]:
# for g in range(len(instr["grammars"][grammar])):
# instr["grammars"][grammar][g] = parse.parse(instr["grammars"][grammar][g], default_octave=instr["octave"])
# g = random.choice(instr["grammars"].keys())
# ins_score = random.choice(instr["grammars"][g])
## ins_score = instr["grammars"][g]
# score_complete = False
# while score_complete is False:
# if score_len(ins_score) >= instr["duration"]:
# score_complete = True
# break
# for i in range(len(ins_score)):
# if isinstance(ins_score[i], tree.Tree):
# unrolled_score = select_node(instr["grammars"][ins_score[i].name])
# new_score = ins_score[:i-1] + unrolled_score + ins_score[i+1:]
# ins_score = new_score
# if i == len(ins_score):
# score_complete = True
# break
#
#
# ins_score = [n for n in ins_score if not isinstance(n, tree.Tree)]
# composition[comp_name][instr_name]["score"] = ins_score
#
# if score_len(ins_score) > max_instr:
# max_instr = score_len(ins_score)
# for line in generate_csound_score(composition[comp_name][instr_name]["score"], instr["score_line"], movement_start):
# print line
#
# movement_start += max_instr
def score_len(score):
total = 0
for n in score:
if not isinstance(n, tree.Tree):
total += n.duration
return total
def select_node(grammar):
return random.choice(grammar)
def generate_score(score, grammars):
while 1:
found_substitution = False
for key,value in grammars.iteritems():
if score.find(key) != -1:
found_substitution = True
while score.find(key) != -1:
score = score.replace(key, random.choice(grammars[key]), 1)
# print scoe
if len(score.split()) > 2000:
for k in grammars.keys():
score = score.replace(k, "")
return score
if found_substitution is False:
break
return score
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 [9c47a4ff24] to [8a5aef4235].
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
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",
"QUOTE",
"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_QUOTE = '"'
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
|
| ︙ | ︙ | |||
74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 |
# Parse (yacc)
def p_pitch_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_note(p):
'''note : pitch
'''
| > > | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 |
# Parse (yacc)
def p_pitch_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_note(p):
'''note : pitch
'''
|
| ︙ | ︙ | |||
143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 |
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()
#print yacc.parse("GFG B'AB,, | g/2fg gab | GFG BAB | d2A AFD")
return yacc.parse(score)
| > > > > > > > | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 |
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()
#print yacc.parse("GFG B'AB,, | g/2fg gab | GFG BAB | d2A AFD")
return yacc.parse(score)
|
Modified test.sco from [c92bf3908c] to [ec3cdf0cc7].
|
| | | | > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | < < < < < < < | < | < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < | < < < < < | < < < < < | < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 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 |
f1 0 512 10 1
f2 0 8192 10 .24 .64 .88 .76 .06 .5 .34 .08
f3 0 1025 10 1
t 0 60
i2 0.000000 0.250000 7000 8.04 2
i2 0.250000 0.250000 7000 8.09 2
i2 0.500000 0.250000 7000 8.02 2
i2 0.750000 0.250000 7000 8.07 2
i2 1.000000 0.250000 7000 8.05 2
i2 1.250000 0.250000 7000 8.05 2
i2 1.500000 2.000000 7000 8.11 2
i2 3.500000 1.000000 7000 8.02 2
i2 4.500000 1.000000 7000 8.02 2
i2 5.500000 0.500000 7000 8.07 2
i2 6.000000 0.500000 7000 8.09 2
i2 6.500000 1.000000 7000 8.02 2
i2 7.500000 1.000000 7000 8.02 2
i2 8.500000 1.000000 7000 8.02 2
i2 9.500000 0.500000 7000 8.07 2
i2 10.000000 0.500000 7000 8.09 2
i2 10.500000 1.000000 7000 8.02 2
i2 11.500000 1.000000 7000 8.02 2
i2 3.500000 1.000000 7000 8.02 2
i2 4.500000 1.000000 7000 8.02 2
i2 5.500000 0.500000 7000 8.07 2
i2 6.000000 0.500000 7000 8.09 2
i2 6.500000 1.000000 7000 8.02 2
i2 7.500000 1.000000 7000 8.02 2
i2 8.500000 1.000000 7000 8.02 2
i2 9.500000 0.500000 7000 8.07 2
i2 10.000000 0.500000 7000 8.09 2
i2 10.500000 1.000000 7000 8.02 2
i2 11.500000 1.000000 7000 8.02 2
|
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
|