morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 12:11:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fuzzy: replace thefuzz with jellyfish

Browse Source 
GPL -> BSD2Clause and should be faster though I haven't tested it myself and just trusted people on the internet.
Jellyfish also allows us access to many more algorithms should they be any better. Trying out Jaro distance now instead of Levenshtein.
This commit is contained in:
Fabian Dill
2022-05-09 07:18:50 +02:00
committed by KonoTyran
parent a020dea277
commit 513ab62ce7
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Options.py
View File

@@ -6,7 +6,7 @@ import typing
import random
from schema import Schema, And, Or
from thefuzz import process as fuzzy_process
from Utils import get_fuzzy_results
class AssembleOptions(abc.ABCMeta):
@@ -457,14 +457,14 @@ class VerifyKeys:
if self.verify_item_name:
for item_name in self.value:
if item_name not in world.item_names:
picks = fuzzy_process.extract(item_name, world.item_names, limit=2)
picks = get_fuzzy_results(item_name, world.item_names)
raise Exception(f"Item {item_name} from option {self} "
f"is not a valid item name from {world.game}. "
f"Did you mean '{picks[0][0]}' ({picks[0][1]}% sure)")
elif self.verify_location_name:
for location_name in self.value:
if location_name not in world.location_names:
picks = fuzzy_process.extract(location_name, world.location_names, limit=2)
picks = get_fuzzy_results(location_name, world.location_names)
raise Exception(f"Location {location_name} from option {self} "
f"is not a valid location name from {world.game}. "
f"Did you mean '{picks[0][0]}' ({picks[0][1]}% sure)")