fix implementation of Negate.__call__ in scoreconditions

Author: jeff-k

pyvdrm/asi2.py

@@ -74,11 +74,13 @@ def __bool__(self):
         return self.score
 
 
-class Negate(AsiUnaryExpr):
+class Negate(AsiExpr):
     """Unary negation of boolean child"""
     def __call__(self, mutations):
-        arg = self.children(mutations)
-        return Score(not arg.score, arg.residues)
+        child = self.children[0](mutations)
+        if child is None:
+            return Score(True, []) # TODO: propagate negative residues
+        return Score(not child.score, child.residues)
 
 
 class AndExpr(AsiExpr):

pyvdrm/tests/test_asi2.py

@@ -51,6 +51,11 @@ def test_score_from(self):
         rule = ASI2("SCORE FROM ( 100G => 10, 101D => 20 )")
         self.assertEqual(rule(VariantCalls("100G 102G")), 10)
 
+    def test_score_from(self):
+        rule = ASI2("SCORE FROM ( NOT 100G => 10, NOT 101SD => 20 )")
+        self.assertEqual(rule(VariantCalls("100G 102G")), 20)
+        self.assertEqual(rule(VariantCalls("100S 101S")), 10)
+
     def test_score_residues(self):
         rule = ASI2("SCORE FROM ( 100G => 10, 101D => 20 )")
         expected_residue = repr({Mutation('S100G')})