diff options
| author | Jackson Moore <jacksonmoore@tuta.io> | 2018-06-09 15:17:03 +0200 |
|---|---|---|
| committer | Jackson Moore <jacksonmoore@tuta.io> | 2018-06-09 15:17:03 +0200 |
| commit | 2a6446bd77f0e330784d14a291d6db7b9bee91df (patch) | |
| tree | 2dda4c7cfec184663e3c7c0536adf951324b4191 /passage.py | |
| parent | 63ce35f3f7ced2200464613654968690328e3973 (diff) | |
reprojected features don't inherit value
Diffstat (limited to 'passage.py')
| -rw-r--r-- | passage.py | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -80,9 +80,16 @@ class Passage(object): node.right.unify[feat] = node.lexeme.cadence.path[feat] spellout = [] - # now read out nodes into list, with prolonged features replacing lexical features + # read out nodes into list for node in self.tree.inorder: next_lexeme = node.lexeme # deepcopy(node.lexeme) + # prolonged features replace lexical features, unless lexeme projects that feature itself + reprojectedFeatures = [] + for feat in node.unify.keys(): + if feat in next_lexeme.government['prolongation'] or next_lexeme.government['anticipation']: + reprojectedFeatures.append(feat) + for feat in reprojectedFeatures: + del node.unify[feat] for feat in node.unify.keys(): if feat == 'ligature': next_lexeme.cadence.ligature = node.unify[feat] @@ -98,11 +105,8 @@ class Passage(object): return spellout def setHarmony(self): - print("\nsetHarmony\n----------") for i, node in enumerate(self.tree.levelorder): node.lexeme.realization['lens'] = harmony.makeLens(node.lexeme.cadence.function, node.lexeme.cadence.ligature) - print('lens', node.lexeme.realization['lens']) - def setFigure(self): for i, node in enumerate(self.tree.levelorder): @@ -165,9 +169,9 @@ class Passage(object): elif i == len(bars)-1 or next > len(bars)-1: right = False else: - if bars[i]+bars[next] < 5.5 and bars[i]+bars[prev] > 5.5: + if bars[i]+bars[next] <= 5.0 and bars[i]+bars[prev] > 5.0: right = True - elif bars[i]+bars[next] > 5.5 and bars[i]+bars[prev] < 5.5: + elif bars[i]+bars[next] > 5.0 and bars[i]+bars[prev] <= 5.0: right = False else: if (scores[i] > scores[prev]) and (next not in prolongedIndices): |