Skip to content

Commit d7118f8

Browse files
committed
refactor
1 parent 12a6882 commit d7118f8

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

disc/make_knp_file_with_discourse_annotation.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import os
22
import re
3-
from pyknp import KNP
4-
from collections import defaultdict
53
from argparse import ArgumentParser
4+
from collections import defaultdict
5+
from logging import FileHandler, Formatter, getLogger
66

77
from progressbar import progressbar
8-
9-
from logging import getLogger, FileHandler, Formatter
8+
from pyknp import KNP
109

1110
logger = getLogger(__name__)
1211
handler = FileHandler("disc.log")
@@ -30,10 +29,10 @@ def organize_knp_features(knp_result):
3029
sid = knp_result.sid
3130
clause_tids = []
3231
# remove bnst's features
33-
for i, bnst in enumerate(knp_result.bnst_list()):
32+
for i in range(len(knp_result.bnst_list())):
3433
knp_result.bnst_list()[i].fstring = ""
3534
# remove mrph's features
36-
for i, mrph in enumerate(knp_result.mrph_list()):
35+
for i in range(len(knp_result.mrph_list())):
3736
knp_result.mrph_list()[i].fstring = ""
3837
# Organize tag's features
3938
for i, tag in enumerate(knp_result.tag_list()):
@@ -61,7 +60,7 @@ def add_discourse_info_to_gold_knp(ann_data):
6160
knp_results = []
6261
clause_tids = []
6362
# Load knp file
64-
with open(knp_path, "r") as f:
63+
with open(knp_path) as f:
6564
data = ""
6665
for line in f:
6766
data += line
@@ -137,14 +136,14 @@ def make_knp_from_textfile(disc_ann):
137136
org_path = os.path.join(GOLD_ORG_DIR, doc["A-ID"][:13], f'{doc["A-ID"]}.org')
138137
if os.path.exists(org_path):
139138
# Found -> read org file
140-
with open(org_path, "r") as f:
139+
with open(org_path) as f:
141140
sents = []
142141
insert_point = -1
143142
for line in f.readlines():
144143
if re.match("#", line.strip()):
145144
if paren_cidx := re.search(r"括弧位置:(\d+)", line.strip()):
146145
insert_point = paren_cidx.group(1)
147-
else:
146+
else: # noqa: PLR5501
148147
if insert_point != -1:
149148
# insert paren
150149
sents[-1] = (
@@ -238,7 +237,7 @@ def remove_duplicate_data(
238237

239238
def read_disc_ann_file(filepath):
240239
result = []
241-
with open(filepath, "r") as f:
240+
with open(filepath) as f:
242241
doc = {"A-ID": "", "clause": [], "rel": defaultdict(lambda: defaultdict(list))}
243242
for line in f.readlines():
244243
if line.strip() == "":

0 commit comments

Comments
 (0)