Update pt.terrier.Retriever __str__ and __repr__ (#474)

pyterrier/terrier/retriever.py

@@ -442,14 +442,14 @@ def _one_row(*args, **kwargs):
         return res_dt
 
     def __repr__(self):
-        return "BR(" + ",".join([
+        return "TerrierRetr(" + ",".join([
             self.indexref.toString(),
             str(self.controls),
             str(self.properties)
             ]) + ")"
 
     def __str__(self):
-        return "BR(" + self.controls["wmodel"] + ")"
+        return "TerrierRetr(" + self.controls["wmodel"] + ")"
 
     def setControls(self, controls):
         for key, value in controls.items():
@@ -791,7 +791,7 @@ def transform(self, queries):
         return res_dt
 
     def __repr__(self):
-        return "FBR(" + ",".join([
+        return "TerrierFeatRetr(" + ",".join([
             self.indexref.toString(),
             str(self.features),
             str(self.controls),
@@ -800,8 +800,8 @@ def __repr__(self):
 
     def __str__(self):
         if self.wmodel is None:
-            return "FBR(" + str(len(self.features)) + " features)"
-        return "FBR(" + self.controls["wmodel"] + " and " + str(len(self.features)) + " features)"
+            return "TerrierFeatRetr(" + str(len(self.features)) + " features)"
+        return "TerrierFeatRetr(" + self.controls["wmodel"] + " and " + str(len(self.features)) + " features)"
 
 rewrites_setup = False
 

tests/test_experiment.py

@@ -151,8 +151,8 @@ def test_save(self):
         qrels =  pt.datasets.get_dataset("vaswani").get_qrels()
         df1 = pt.Experiment(brs, topics, qrels, eval_metrics=["map", "mrt"], save_dir=self.test_dir)
         # check save_dir files are there
-        self.assertTrue(os.path.exists(os.path.join(self.test_dir, "BR(DPH).res.gz")))
-        self.assertTrue(os.path.exists(os.path.join(self.test_dir, "BR(BM25).res.gz")))
+        self.assertTrue(os.path.exists(os.path.join(self.test_dir, "TerrierRetr(DPH).res.gz")))
+        self.assertTrue(os.path.exists(os.path.join(self.test_dir, "TerrierRetr(BM25).res.gz")))
 
         # check for warning
         with pytest.warns(UserWarning):