Modify model parameter option names

retrieval/DatasetParser.py

@@ -23,12 +23,12 @@ def parse(self, model: str, plot_freq: bool = False, smoothing: str = None,
             index.plot()
         if model == 'bm25':
             model = BM25(index, self._mapping)
-        elif model == 'vector':
+        elif model == 'vs':
             model = VectorSpace(index, self._mapping)
-        elif model == 'query':
+        elif model == 'lm':
             model = QueryLikelihood(index, self._mapping, smoothing)
         else:
-            raise ValueError("Invalid retrieval model - select 'bm25', 'vector', or 'query'.")
+            raise ValueError("Invalid retrieval model - select 'bm25', 'vs', or 'lm'.")
 
         print("Ranking queries against passages...")
         return {qid: model.rank(qid, query) for qid, query in self._queries.items()}

start.py

@@ -19,10 +19,8 @@ def main():
     parser = DatasetParser(dataset)
     results = parser.parse(model, plot_freq=plot, smoothing=smoothing)
 
-    models = {'bm25': 'BM25', 'vector': 'VS', 'query': 'LM'}
-    smoothers = {'laplace': '-Laplace', 'lidstone': '-Lidstone', 'dirichlet': '-Dirichlet'}
-    model = models[model]
-    smoothing = smoothers[smoothing] if smoothing is not None else ""
+    model = model.upper()
+    smoothing = f'-{smoothing.capitalize()}' if smoothing is not None else ""
 
     data = ''
     for qid, passages in results.items():