Change meter choice algorithm

allzweckmesser/meters.py

@@ -133,6 +133,8 @@ ALL_METERS = {
     ),
 }
 
+ALL_METER_NAMES = list(ALL_METERS.keys())
+
 
 def get_reading_meter_combinations(readings, meters=ALL_METERS):
     reading_meter_rmfeatures = [

allzweckmesser/scan.py

@@ -8,13 +8,15 @@ from typing import List
 
 from .config import RANKING_MODEL_PATH
 from .features import combine_features
-from .meters import ALL_METERS, get_reading_meter_combinations
+from .meters import ALL_METERS, ALL_METER_NAMES, get_reading_meter_combinations
 from .model import Verse
 from .scanner import Scanner
 
 
-def scan(plain_verses: List[str], meters=ALL_METERS, **options) -> List[Verse]:
+def scan(plain_verses: List[str], meters=ALL_METER_NAMES,
+         **options) -> List[Verse]:
     """Scan Latin verses."""
+    meters = [ALL_METERS[m] for m in meters if m in ALL_METERS]
     scanner = Scanner()
     scanned_verses = scanner.scan_verses(plain_verses)
     model = joblib.load(RANKING_MODEL_PATH)