Skip to content

Updated geoparse.py infer_country() to improve performance #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ac74475 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated geoparse.py infer_country() to improve performance #103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions mordecai/geoparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,26 +711,19 @@ def infer_country(self, doc):
proced = self.make_country_features(doc, require_maj=False)
if not proced:
pass
feat_list = []


for loc in proced:
feat = self.make_country_matrix(loc)
#print("feat:", feat)
#labels = loc['labels']
feat_list.append(feat)
#try:
# for each potential country...
for n, i in enumerate(feat_list):
labels = i['labels']
try:
prediction = self.country_model.predict(i['matrix']).transpose()[0]
ranks = prediction.argsort()[::-1]
labels = np.asarray(labels)[ranks]
prediction = prediction[ranks]
except ValueError:
print(traceback.print_exc())
prediction = np.array([0])
labels = np.array([""])
labels = feat['labels']
try:
prediction = self.country_model.predict(feat['matrix']).transpose()[0]
ranks = prediction.argsort()[::-1]
labels = np.asarray(labels)[ranks]
prediction = prediction[ranks]
except ValueError:
print(traceback.print_exc())
prediction = np.array([0])
labels = np.array([""])

loc['country_predicted'] = labels[0]
loc['country_conf'] = prediction[0]
Expand Down