Changes In Branch refactor Through [42c3ba150c] Excluding Merge-Ins
This is equivalent to a diff from fde4a012ea to 42c3ba150c
2011-10-20
| ||
18:38 | Merged the refactor branch into the main develop branch check-in: 8c559c112b user: brian tags: develop | |
18:37 | Syncing now works Closed-Leaf check-in: 4f5bc3936f user: brian tags: refactor | |
2011-10-18
| ||
20:19 | Broke the score generator by not initialing a first phrase in an empty score. Checkpointing so I can refactor and clean things up to make more progress. check-in: 42c3ba150c user: brian tags: refactor | |
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 | |
Modified cfg.py from [52bf709d42] to [368187a13f].
1 2 3 4 | #!/usr/bin/env python from __future__ import division import os | | | 1 2 3 4 5 6 7 8 9 10 11 12 | #!/usr/bin/env python from __future__ import division import os import ipdb import random import sys import time import parse import topsort import yaml |
︙ | ︙ | |||
99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | "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"]: | > > > > > > > > > > > > > > > > > > > > > > > | > | | | > | | | < | < | < | < | > | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | > > > > < | | | | > > | | 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 | "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": ["D/4 D/4 D/4 D/4"], "v": ["C/4 C/4 C/4 C/4"], }, }, "follow_instr": { # Instrument 'melody' "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 1", "sync": "lead_instr", "octave": 8, "duration": 30, "grammars": { # Notes for this instrument to use in this piece "u": ["D/4 D/4 D/4 D/4"], "v": ["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 ["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: 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] # ipdb.set_trace() 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]) score = [] while True: # ipdb.set_trace() time_remaining = max_time - score_len(score) try: score, syncs = choose_node(score, instr, time_remaining, syncs) except ValueError: break return (score, syncs) def choose_node(score, instr, time_remaining, syncs): # ipdb.set_trace() grammars = instr["grammars"] if time_remaining <= 0: raise ValueError("No time remaining in the score") if len(score) == 0: options = get_node_choices(instr, syncs, score_len(score)) node = random.choice(options) phrase = random.choice(instr["grammars"][node]) # Find the next node in the score that needs choosing 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 = get_node_choices(instr, syncs, score_len(score)) node = random.choice(options) phrase = random.choice(instr["grammars"][node]) score = score[:node_index-1] + phrase + score[node_index+1:] return score def get_node_choices(instr, syncs, current_time): # If this instrument should follow another, choose a grammar node from the correct instrument # ipdb.set_trace() grammars = instr["grammars"] options = [] 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 instr["grammars"].keys(): options.append(sync_node) else: for g in range(len(grammars[node])): if score_len(grammars[node][g]) <= time_remaining: options.append(grammars[node][g]) else: 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") return options def get_sync_node_at_time(syncs, t): for s in len(syncs): if syncs[s]["time"] > t: return syncs[s]["node"] def score_len(score): total = 0 for n in score: if not isinstance(n, tree.Tree): total += n.duration return total |
︙ | ︙ |