sigonasr2/miyu-bot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve fuzzy map getitem performance

Browse Source
This commit is contained in:
qwewqa 2020-12-27 00:59:32 -05:00
parent 7b05d66f4a
commit 30a9a45437
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
miyu_bot/commands/common/fuzzy_matching.py
View File

@ -38,11 +38,15 @@ class FuzzyMap:
self.logger.debug(f'Rejected key "{key}" due to length.') self.logger.debug(f'Rejected key "{key}" due to length.')
return None return None
key = romanize(key) key = romanize(key)
result = self.matcher.closest_match(key, (k for k, v in self._values.items() if self.filter(v))) try:
if not result: matcher = self.matcher
return None result = min((score, item) for score, item in
((matcher.score(key, item[0]), item) for item in self._values.items()) if score <= 0)[1][1]
self.logger.info(f'Found key "{key}" in time {timeit.default_timer() - start_time}.') self.logger.info(f'Found key "{key}" in time {timeit.default_timer() - start_time}.')
return self._values[result] return result
except ValueError:
self.logger.info(f'Found no results for key "{key}" in time {timeit.default_timer() - start_time}.')
return None
def get_sorted(self, key: str): def get_sorted(self, key: str):
start_time = timeit.default_timer() start_time = timeit.default_timer()
@ -98,16 +102,6 @@ class FuzzyMatcher:
self.array[i][0] = i * self.config.deletion_weight self.array[i][0] = i * self.config.deletion_weight
self.array[0][i] = i * self.config.insertion_weight self.array[0][i] = i * self.config.insertion_weight
def closest_match(self, source: str, targets: Iterable[str]) -> Optional[str]:
threshold = 0
closest = None
for target in targets:
score = self.score(source, target, threshold)
if score <= 0:
threshold = score
closest = target
return closest
def score(self, source: str, target: str, threshold=0.0): def score(self, source: str, target: str, threshold=0.0):
# target must not be empty # target must not be empty