Changes In Branch refactor Excluding Merge-Ins
This is equivalent to a diff from fde4a012ea to 4f5bc3936f
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 [6468589fde].
1 2 3 | #!/usr/bin/env python from __future__ import division | | | | 1 2 3 4 5 6 7 8 9 10 11 12 | #!/usr/bin/env python from __future__ import division import ipdb import os 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 | "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: 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]) score= [] try: score, syncs = choose_phrase(instr, syncs, 0, max_time) 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): 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[:node_index-1] + new_phrase + score[node_index+1:] except ValueError: return (score, syncs) def choose_phrase(instr, syncs, current_time, time_remaining): '''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"]: time_filtered_grammars[grammar] = get_phrases_that_fit(instr["grammars"][grammar], time_remaining) if len(time_filtered_grammars.keys()) == 0: raise ValueError("No available grammars that will fit in the score") grammar = None # if instr["name"] == "follow_instr": # ipdb.set_trace() 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 if grammar is None: grammar = random.choice(time_filtered_grammars.keys()) 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 score_len(score): total = 0 for n in score: if not isinstance(n, tree.Tree): total += n.duration |
︙ | ︙ |