WIP

Author: donmahallem

python/aoc24/day24/operation.py

@@ -41,13 +41,13 @@ def __rxor__(self,other):
         return self()^other
 
     def __call__(self, *args, **kwds):
-        a=self.Inputs[0]() if type(self.Inputs[0])==Operation else self.Inputs[0]
-        b=self.Inputs[1]() if type(self.Inputs[1])==Operation else self.Inputs[1]
-        if self.Operand=="AND":
+        a=self.__inputs[0]() if type(self.__inputs[0])==Operation else self.__inputs[0]
+        b=self.__inputs[1]() if type(self.__inputs[1])==Operation else self.__inputs[1]
+        if self.__operator=="AND":
             return a&b
-        elif self.Operand=="OR":
+        elif self.__operator=="OR":
             return a|b
-        elif self.Operand=="XOR":
+        elif self.__operator=="XOR":
             return a^b
         else:
-            raise Exception("Unknown operand: "+self.Operand)
+            raise Exception("Unknown operand: "+self.__operator)

python/aoc24/day24/test_operation.py

@@ -4,32 +4,32 @@
 class OperatorTests(unittest.TestCase):
 
     def test_and_operator(self):
-        obj=Operation([True,"AND",False,"out"])
+        obj=Operation([True,False],"AND","out")
         self.assertFalse(obj(), "The sum is wrong.")
-        obj=Operation([True,"AND",True,"out"])
+        obj=Operation([True,True],"AND","out")
         self.assertTrue(obj(), "The sum is wrong.")
 
     def test_or_operator(self):
-        obj=Operation([False,"OR",False,"out"])
+        obj=Operation([False,False],"OR","out")
         self.assertFalse(obj(), "False and False should be False")
-        obj=Operation([True,"OR",False,"out"])
+        obj=Operation([True,False],"OR","out")
         self.assertTrue(obj(), "True | False = True")
-        obj=Operation([True,"OR",True,"out"])
+        obj=Operation([True,True],"OR","out")
         self.assertTrue(obj(), "The sum is wrong.")
 
     def test_xor_operator(self):
-        obj=Operation([False,"XOR",False,"out"])
+        obj=Operation([False,False],"XOR","out")
         self.assertFalse(obj(), "False ^ False should be False")
-        obj=Operation([True,"XOR",False,"out"])
+        obj=Operation([True,False],"XOR","out")
         self.assertTrue(obj(), "True ^ False = True")
-        obj=Operation([True,"XOR",True,"out"])
+        obj=Operation([True,True],"XOR","out")
         self.assertFalse(obj(), "True ^ True should be False")
     def test_call_operator(self):
-        obj=Operation([False,"OR",False,"out"])
+        obj=Operation([False,False],"OR","out")
         self.assertFalse(True&obj(), "True & False should be True")
-        obj=Operation([False,"OR",False,"out"])
+        obj=Operation([False,False],"OR","out")
         self.assertFalse(False|obj(), "True | False should be True")
-        obj=Operation([False,"OR",False,"out"])
+        obj=Operation([False,False],"OR","out")
         self.assertFalse(False^obj(), "True ^ False should be True")