refactor distogramparser.py

Author: FilomenoSanchez

parsers/__init__.py

@@ -25,10 +25,10 @@ def guess_psipred_format(*args, **kwargs):
     return guess_psipred_format(*args, **kwargs)
 
 
-def DistogramParser(*args, **kwargs):
-    from parsers.distogramparser import DistogramParser
+def CASPRR2Parser(*args, **kwargs):
+    from parsers.casprr2parser import CASPRR2Parser
 
-    return DistogramParser(*args, **kwargs)
+    return CASPRR2Parser(*args, **kwargs)
 
 
 def TopconsParser(*args, **kwargs):
@@ -103,7 +103,7 @@ class ParserFormats(Enum):
     CCMPRED = CCMpredParser
     COLSTATS = CCMpredParser
     PDB = PDBParser
-    CASPRR_MODE_2 = DistogramParser
+    CASPRR_MODE_2 = CASPRR2Parser
     trROSETTA_NPZ = NpzParser
 
 

parsers/distogramparser.py renamed to parsers/casprr2parser.py

@@ -3,7 +3,7 @@
 from utils.exceptions import InvalidFormat
 
 
-def DistogramParser(input, input_format=None):
+def CASPRR2Parser(input, input_format=None):
     contents = input.split('\n')
     output = []
     res_1_idx = 0

parsers/tests/test_distogramparser.py renamed to parsers/tests/test_casprr2parser.py

@@ -1,9 +1,9 @@
 import unittest
-from parsers import DistogramParser
+from parsers import CASPRR2Parser
 from utils.exceptions import InvalidFormat
 
 
-class ContactParserTestCase(unittest.TestCase):
+class CASPRRMODE2ParserTestCase(unittest.TestCase):
 
     def test_1(self):
         dummy_prediction = """PFRMAT RR
@@ -33,7 +33,7 @@ def test_1(self):
         expected_bin_distance = [0, 0, 1, 0, 0, 0, 1, 2, 2, 1, 2, 3]
         expected_bin_score = [0.345, 0.34, 0.56, 0.34, 0.33, 0.33, 0.51, 0.305, 0.3, 0.2, 0.2, 0.3]
 
-        output = DistogramParser(dummy_prediction)
+        output = CASPRR2Parser(dummy_prediction)
 
         self.assertEqual('DISTO', output.pop(-1))
         self.assertEqual(12, len(output))
@@ -49,5 +49,5 @@ def test_2(self):
 100 8 5.382865
 """
         with self.assertRaises(InvalidFormat):
-            output = DistogramParser(dummy_prediction)
+            output = CASPRR2Parser(dummy_prediction)
             self.assertListEqual(output, [])