From 446e3919c010d131a1683a7dfbc65c73d2bd7cae Mon Sep 17 00:00:00 2001 From: Miyazawa Akira Date: Sat, 25 Nov 2017 01:53:26 +0900 Subject: [PATCH] Fix command line --- README.md | 4 +- setup.py | 3 +- trf/__init__.py | 156 +++++++++++++++++++++++++++++++++++++++++++++++ trf/__init__.pyc | Bin 104 -> 0 bytes trf/__main__.py | 4 ++ trf/cmdline.py | 156 ----------------------------------------------- 6 files changed, 163 insertions(+), 160 deletions(-) delete mode 100644 trf/__init__.pyc create mode 100644 trf/__main__.py delete mode 100644 trf/cmdline.py diff --git a/README.md b/README.md index f977162..552d9d8 100644 --- a/README.md +++ b/README.md @@ -19,12 +19,12 @@ export PATH="${PATH}:$(pwd)/tools/bin" テキストを直接与えて実行する場合 ```bash -echo 'ごはんを食べるつもりです。' | python -m trf.cmdline +echo 'ごはんを食べるつもりです。' | python -m trf ``` テキストファイルを指定して実行する場合 ```bash -python -m trf.cmdline -f FILENAME +python -m trf -f FILENAME ``` ## TRFがサポートする指標一覧 diff --git a/setup.py b/setup.py index 1aef541..4b9db01 100644 --- a/setup.py +++ b/setup.py @@ -14,6 +14,5 @@ "numpy", "janome", "sqlalchemy" - ], - entry_points={"console_scripts": ["trf = trf.cmdline:main"]}) + ]) # package_data={'', ['']}, diff --git a/trf/__init__.py b/trf/__init__.py index e69de29..8717917 100644 --- a/trf/__init__.py +++ b/trf/__init__.py @@ -0,0 +1,156 @@ +import sys +import argparse +from typing import List + +from trf.analyser import Analyser +from trf.acceptability import Acceptability +from trf.util import check_executable + + +def translate(en: str): + + if en == 'n_sentences': + return '文数' + elif en == 'mean_n_mrphs': + return '平均文長' + elif en == 'n_tokens': + return 'トークン数' + elif en == 'n_types': + return 'タイプ数' + elif en == 'mean_tree_depths': + return '係り受け木の深さ' + elif en == 'r_conditional': + return '仮定節' + elif en == 'log_prob': + return '容認度 (LogProb)' + elif en == 'mean_lp': + return '容認度 (Mean LP)' + elif en == 'norm_lp_div': + return '容認度 (Norm LP (Div))' + elif en == 'norm_lp_sub': + return '容認度 (Norm LP (Sub))' + elif en == 'slor': + return '容認度 (SLOR)' + else: + return en + + +class Metric: + def __init__(self, name: str, val: str): + + self.name = name + self.val = val + self.name_ja = translate(name) + + def __str__(self): + return '\t'.join([self.name_ja, self.val]) + + +class Section: + + def __init__(self, cat: str, metrics: List[Metric]): + + self.cat = cat + self.metrics = metrics + if cat == 'basic': + self.cat_ja = '基本指標' + elif cat == 'vocabulary': + self.cat_ja = '語彙に基づく指標' + elif cat == 'syntax': + self.cat_ja = '統語情報に基づく指標' + elif cat == 'language_model': + self.cat_ja = '言語モデルに基づく指標' + else: + self.cat_ja = '' + + def show(self, lang: str='ja'): + if lang == 'ja': + print('[{}]'.format(self.cat_ja)) + for metric in self.metrics: + print('{}={}'.format(metric.name_ja, metric.val)) + else: + print('Unsupported language') + sys.exit(1) + + +def _f(score: float) -> str: + return 'None' if score is None else '{:.2f}'.format(score) + + +def main(): + + executables = ['juman', 'knp', 'rnnlm'] + for e in executables: + check_executable(e) + + parser = argparse.ArgumentParser() + + parser.add_argument('-f', + '--filename', + type=str, + help='target text') + + parser.add_argument('--delimiter', + type=str, + default='\n', + help='features to calculate') + + parser.add_argument('-m', + '--rnnlm-model-path', + type=str, + default='data/jawiki-20160818-100M-words', + help='RNNLM model path') + + parser.add_argument('--output-lang', + type=str, + default='ja', + help='ja') + + args = parser.parse_args() + + text = '' + if args.filename is not None: + with open(args.filename, mode='r') as f: + text = f.read().replace('\n', '') + else: + text = sys.stdin.read() + + analyser = Analyser(text, delimiter=args.delimiter) + + metrics = [] + metrics.append(Metric('n_sentences', analyser.n_sentences)) + metrics.append(Metric('mean_n_mrphs', analyser.mean_n_mrphs)) + metrics.append(Metric('n_tokens', analyser.n_chunks)) + metrics.append(Metric('n_types', analyser.n_types)) + Section('basic', metrics).show() + + metrics = [] + for k, v in analyser.rs_pos.items(): + metrics.append(Metric('品詞：{}'.format(k), + '{:.2f}'.format(v))) + Section('vocabulary', metrics).show() + + metrics = [] + metrics.append(Metric('mean_tree_depths', + '{:.2f}'.format(analyser.mean_tree_depths))) + metrics.append(Metric('r_conditional', + '{:.2f}'.format(analyser.r_conditional))) + for k, v in analyser.rs_modality.items(): + metrics.append(Metric('モダリティ：{}'.format(k), + '{:.2f}'.format(v))) + Section('syntax', metrics).show() + + metrics = [] + a = Acceptability(text, + args.delimiter, + args.rnnlm_model_path) + metrics.append(Metric('log_prob', _f(a.log_prob))) + metrics.append(Metric('mean_lp', _f(a.mean_lp))) + metrics.append(Metric('norm_lp_div', _f(a.norm_lp_div))) + metrics.append(Metric('norm_lp_sub', _f(a.norm_lp_sub))) + metrics.append(Metric('slor', _f(a.slor))) + Section('language_model', metrics).show() + + +if __name__ == '__main__': + main() diff --git a/trf/__init__.pyc b/trf/__init__.pyc deleted file mode 100644 index ed8b29e09e5ad4808922bf1f0356338d8140608d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmZSn%*%CY$^M9B1}I8{Y>FJjgrRm4VXXa&= b#K-FuRF-f6MQw8PQ%ZAE?Lc~qftUdRM5hrK diff --git a/trf/__main__.py b/trf/__main__.py new file mode 100644 index 0000000..47ed718 --- /dev/null +++ b/trf/__main__.py @@ -0,0 +1,4 @@ +import sys +from trf import main + +sys.exit(main()) diff --git a/trf/cmdline.py b/trf/cmdline.py deleted file mode 100644 index 8717917..0000000 --- a/trf/cmdline.py +++ /dev/null @@ -1,156 +0,0 @@ -import sys -import argparse -from typing import List - -from trf.analyser import Analyser -from trf.acceptability import Acceptability -from trf.util import check_executable - - -def translate(en: str): - - if en == 'n_sentences': - return '文数' - elif en == 'mean_n_mrphs': - return '平均文長' - elif en == 'n_tokens': - return 'トークン数' - elif en == 'n_types': - return 'タイプ数' - elif en == 'mean_tree_depths': - return '係り受け木の深さ' - elif en == 'r_conditional': - return '仮定節' - elif en == 'log_prob': - return '容認度 (LogProb)' - elif en == 'mean_lp': - return '容認度 (Mean LP)' - elif en == 'norm_lp_div': - return '容認度 (Norm LP (Div))' - elif en == 'norm_lp_sub': - return '容認度 (Norm LP (Sub))' - elif en == 'slor': - return '容認度 (SLOR)' - else: - return en - - -class Metric: - def __init__(self, name: str, val: str): - - self.name = name - self.val = val - self.name_ja = translate(name) - - def __str__(self): - return '\t'.join([self.name_ja, self.val]) - - -class Section: - - def __init__(self, cat: str, metrics: List[Metric]): - - self.cat = cat - self.metrics = metrics - if cat == 'basic': - self.cat_ja = '基本指標' - elif cat == 'vocabulary': - self.cat_ja = '語彙に基づく指標' - elif cat == 'syntax': - self.cat_ja = '統語情報に基づく指標' - elif cat == 'language_model': - self.cat_ja = '言語モデルに基づく指標' - else: - self.cat_ja = '' - - def show(self, lang: str='ja'): - if lang == 'ja': - print('[{}]'.format(self.cat_ja)) - for metric in self.metrics: - print('{}={}'.format(metric.name_ja, metric.val)) - else: - print('Unsupported language') - sys.exit(1) - - -def _f(score: float) -> str: - return 'None' if score is None else '{:.2f}'.format(score) - - -def main(): - - executables = ['juman', 'knp', 'rnnlm'] - for e in executables: - check_executable(e) - - parser = argparse.ArgumentParser() - - parser.add_argument('-f', - '--filename', - type=str, - help='target text') - - parser.add_argument('--delimiter', - type=str, - default='\n', - help='features to calculate') - - parser.add_argument('-m', - '--rnnlm-model-path', - type=str, - default='data/jawiki-20160818-100M-words', - help='RNNLM model path') - - parser.add_argument('--output-lang', - type=str, - default='ja', - help='ja') - - args = parser.parse_args() - - text = '' - if args.filename is not None: - with open(args.filename, mode='r') as f: - text = f.read().replace('\n', '') - else: - text = sys.stdin.read() - - analyser = Analyser(text, delimiter=args.delimiter) - - metrics = [] - metrics.append(Metric('n_sentences', analyser.n_sentences)) - metrics.append(Metric('mean_n_mrphs', analyser.mean_n_mrphs)) - metrics.append(Metric('n_tokens', analyser.n_chunks)) - metrics.append(Metric('n_types', analyser.n_types)) - Section('basic', metrics).show() - - metrics = [] - for k, v in analyser.rs_pos.items(): - metrics.append(Metric('品詞：{}'.format(k), - '{:.2f}'.format(v))) - Section('vocabulary', metrics).show() - - metrics = [] - metrics.append(Metric('mean_tree_depths', - '{:.2f}'.format(analyser.mean_tree_depths))) - metrics.append(Metric('r_conditional', - '{:.2f}'.format(analyser.r_conditional))) - for k, v in analyser.rs_modality.items(): - metrics.append(Metric('モダリティ：{}'.format(k), - '{:.2f}'.format(v))) - Section('syntax', metrics).show() - - metrics = [] - a = Acceptability(text, - args.delimiter, - args.rnnlm_model_path) - metrics.append(Metric('log_prob', _f(a.log_prob))) - metrics.append(Metric('mean_lp', _f(a.mean_lp))) - metrics.append(Metric('norm_lp_div', _f(a.norm_lp_div))) - metrics.append(Metric('norm_lp_sub', _f(a.norm_lp_sub))) - metrics.append(Metric('slor', _f(a.slor))) - Section('language_model', metrics).show() - - -if __name__ == '__main__': - main()