Fix merge issues

Author: christopher-wild

causal_testing/generation/abstract_causal_test_case.py

@@ -121,18 +121,21 @@ def _generate_concrete_tests(
                 )
             model = optimizer.model()
 
-            base_test_case = BaseTestCase(self.treatment_variables, list(self.expected_causal_effect.keys())[0])
+            base_test_case = BaseTestCase(
+                treatment_variable=self.treatment_variable,
+                outcome_variable=list(self.expected_causal_effect.keys())[0],
+                effect=self.effect,
+            )
 
             concrete_test = CausalTestCase(
                 base_test_case=base_test_case,
-                control_value=self.treatment_variables.cast(model[self.treatment_variables.z3]),
-                treatment_value=self.treatment_variables.cast(
-                    model[self.scenario.treatment_variables[self.treatment_variables.name].z3]
+                control_value=self.treatment_variable.cast(model[self.treatment_variable.z3]),
+                treatment_value=self.treatment_variable.cast(
+                    model[self.scenario.treatment_variables[self.treatment_variable.name].z3]
                 ),
                 expected_causal_effect=list(self.expected_causal_effect.values())[0],
                 estimate_type=self.estimate_type,
                 effect_modifier_configuration={v: v.cast(model[v.z3]) for v in self.effect_modifiers},
-                effect=self.effect,
             )
 
             for v in self.scenario.inputs():

causal_testing/json_front/json_class.py

@@ -123,7 +123,7 @@ def generate_tests(self, effects: dict, mutates: dict, estimators: dict, f_flag:
             concrete_tests, dummy = abstract_test.generate_concrete_tests(5, 0.05)
             logger.info("Executing test: %s", test["name"])
             logger.info(abstract_test)
-            logger.info([abstract_test.treatment_variables.name, abstract_test.treatment_variables.distribution])
+            logger.info([abstract_test.treatment_variable.name, abstract_test.treatment_variable.distribution])
             logger.info("Number of concrete tests for test case: %s", str(len(concrete_tests)))
             failures = self._execute_tests(concrete_tests, estimators, test, f_flag)
             logger.info("%s/%s failed for %s\n", failures, len(concrete_tests), test["name"])