kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix duplicate language names in phoneme_rank calculation

Browse Source
This commit is contained in:
Yaman Qalieh 2018-05-27 01:33:07 -04:00
parent 61d0c3cb09
commit 43373de921
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SmearcarDB/server.py
View File

@ -100,9 +100,8 @@ def phoneme_rank(scatter=False, detail=1000, textOutput=False, title="Figure 2")
'Italian': 64.8 'Italian': 64.8
} }
total = sum(list(speakers.values())) total = sum(list(speakers.values()))
calculation = sorted([(phoneme.name, sum([frequency.value * speakers[Language.query.filter_by(id=frequency.language_id).first().name] / total for frequency in Frequency.query.filter_by(phoneme_id=phoneme.id).all()])) for phoneme in Phoneme.query.limit(detail).all()], key=lambda x:-x[1]) calculation = sorted([(phoneme.name, sum([frequency.value * speakers[Language.query.filter_by(id=frequency.language_id).first().name] / (total * len(Language.query.filter_by(name=Language.query.filter_by(id=frequency.language_id).first().name).all()) ) for frequency in Frequency.query.filter_by(phoneme_id=phoneme.id).all()])) for phoneme in Phoneme.query.limit(detail).all()], key=lambda x:-x[1])
labels, data = zip(*calculation) labels, data = zip(*calculation)
if textOutput: if textOutput:
return labels return labels
@ -124,6 +123,12 @@ def phoible_compare():
phonemes = [phoneme.name for phoneme in Phoneme.query.all()] phonemes = [phoneme.name for phoneme in Phoneme.query.all()]
return [x for x in phoible if x in phonemes] return [x for x in phoible if x in phonemes]
def rank_compare():
phoible = phoible_compare()
original = phoneme_rank(textOutput=True)
def database(): def database():
final = {'values': []} final = {'values': []}
final['languages'] = [f.name for f in Language.query.order_by(Language.name).all()] final['languages'] = [f.name for f in Language.query.order_by(Language.name).all()]