Change __repr__() methods for ASI classes.

Author: donkirkby

pyvdrm/asi2.py

@@ -44,6 +44,11 @@ class Score(object):
     score = None
 
     def __init__(self, score, residues):
+        """ Initialize.
+
+        :param bool|float score: value of the score
+        :param residues: sequence of Mutations
+        """
         self.score = score
         self.residues = set(residues)
 
@@ -54,7 +59,7 @@ def __sub__(self, other):
         return Score(self.score - other.score, self.residues | other.residues)
 
     def __repr__(self):
-        return str(self.score)
+        return "Score({!r}, {!r})".format(self.score, self.residues)
 
     def __eq__(self, other):
         return self.score == other.score
@@ -130,9 +135,6 @@ def __call__(self, x):
 
         raise NotImplementedError
 
-    def __repr__(self):
-        return "({} {})".format(self.operation, self.limit)
-
 
 class ScoreExpr(AsiExpr):
     """Score expressions propagate DRM scores"""
@@ -158,10 +160,6 @@ def __call__(self, mutations):
             return Score(0, [])
         return Score(score, result.residues)
 
-    def __repr__(self):
-        operation, score = self.children
-        return "{}=>{}".format(str(operation), str(score))
-
 
 class ScoreList(AsiExpr):
     """Lists of scores are either summed or maxed"""
@@ -210,15 +208,15 @@ def __call__(self, args):
 class AsiMutations(object):
     """List of mutations given an ambiguous pattern"""
 
-    def __init__(self, pos, label, args):
+    def __init__(self, _label=None, _pos=None, args=None):
         """Initialize set of mutations from a potentially ambiguous residue
         """
-        if pos and label:
-            pass
-        self.mutations = MutationSet(''.join(args))
+        self.mutations = args and MutationSet(''.join(args))
 
     def __repr__(self):
-        return str(self.mutations)
+        if self.mutations is None:
+            return "AsiMutations()"
+        return "AsiMutations(args={!r})".format(str(self.mutations))
 
     def __call__(self, env):
         intersection = set(env) & self.mutations.mutations

pyvdrm/drm.py

@@ -56,10 +56,6 @@ def __call__(self, args):
         """Evaluate child tokens with args"""
         return self.children(args)
 
-    def __repr__(self):
-        """Pretty print syntax tree"""
-        return str(type(self))
-
 
 class AsiBinaryExpr(AsiExpr):
     """Subclass with syntactic sugar for boolean ops"""

pyvdrm/tests/test_asi2.py

@@ -1,6 +1,6 @@
 import unittest
 from functools import reduce
-from pyvdrm.asi2 import ASI2
+from pyvdrm.asi2 import ASI2, AsiMutations, Score
 from pyvdrm.vcf import Mutation, MutationSet
 
 
@@ -128,5 +128,54 @@ def test_chained_and(self):
         self.assertEqual(rule(mus("40F 67G 215Y")), 15) 
 
 
+class TestAsiMutations(unittest.TestCase):
+    def test_init_args(self):
+        expected_mutation_set = MutationSet('Q80KR')
+        m = AsiMutations(args='Q80KR')
+
+        self.assertEqual(expected_mutation_set, m.mutations)
+        self.assertEqual(expected_mutation_set.wildtype, m.mutations.wildtype)
+
+    def test_init_none(self):
+        m = AsiMutations()
+
+        self.assertIsNone(m.mutations)
+
+    def test_repr(self):
+        expected_repr = "AsiMutations(args='Q80KR')"
+        m = AsiMutations(args='Q80KR')
+
+        r = repr(m)
+
+        self.assertEqual(expected_repr, r)
+
+    def test_repr_none(self):
+        expected_repr = "AsiMutations()"
+        m = AsiMutations()
+
+        r = repr(m)
+
+        self.assertEqual(expected_repr, r)
+
+
+class TestScore(unittest.TestCase):
+    def test_init(self):
+        expected_value = 10
+        expected_mutations = {Mutation('A23R')}
+
+        score = Score(expected_value, expected_mutations)
+
+        self.assertEqual(expected_value, score.score)
+        self.assertEqual(expected_mutations, score.residues)
+
+    def test_repr(self):
+        expected_repr = "Score(10, {Mutation('A23R')})"
+        score = Score(10, {Mutation('A23R')})
+
+        r = repr(score)
+
+        self.assertEqual(expected_repr, r)
+
+
 if __name__ == '__main__':
     unittest.main()