Merge branch 'main' into pylint_refactoring

Author: christopher-wild

.github/workflows/publish-to-pypi.yaml

@@ -1,5 +1,9 @@
 name: Publish python PyPI
 
+on:
+  push:
+    tags:
+      - v0.0.0
 jobs:
   build-release:
     name: Build and publish PyPI

.github/workflows/publish-to-test-pypi.yaml

@@ -22,6 +22,8 @@ jobs:
           pip3 install .
           pip3 install .[pypi]
           pip3 install build
+          pip3 install setuptools --upgrade
+          pip3 install setuptools_scm
       - name: Build Package
         run: |
           python -m build --no-isolation

causal_testing/testing/estimators.py

@@ -304,19 +304,18 @@ def __init__(
     ):
         super().__init__(treatment, treatment_value, control_value, adjustment_set, outcome, df, effect_modifiers)
 
-        if product_terms is None:
-            product_terms = []
-        for term_a, term_b in product_terms:
-            self.add_product_term_to_df(term_a, term_b)
-        for term in self.effect_modifiers:
-            self.adjustment_set.add(term)
-
-        self.product_terms = product_terms
+        self.product_terms = []
         self.square_terms = []
         self.inverse_terms = []
         self.intercept = intercept
         self.model = None
 
+        if product_terms:
+            for term_a, term_b in product_terms:
+                self.add_product_term_to_df(term_a, term_b)
+        for term in self.effect_modifiers:
+            self.adjustment_set.add(term)
+
     def add_modelling_assumptions(self):
         """
         Add modelling assumptions to the estimator. This is a list of strings which list the modelling assumptions that

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "setuptools>=45",
+    "setuptools>=64",
     "setuptools_scm[toml]>=6.2",
     "wheel"
     ]
@@ -46,8 +46,8 @@ build-backend = "setuptools.build_meta"
         Documentation = "https://causal-testing-framework.readthedocs.io/"
         Source = "https://github.com/CITCOM-project/CausalTestingFramework"
 
-[tool.setuptools.packages.find]
-where = ["causal_testing"]
+[tool.setuptools.packages]
+find = {}
 
 [tool.setuptools_scm]
 

tests/testing_tests/test_estimators.py

@@ -331,3 +331,25 @@ def test_program_15_cate(self):
         )
         cates_df, _ = causal_forest.estimate_cates()
         self.assertGreater(cates_df["cate"].mean(), 0)
+
+
+class TestLinearRegressionInteraction(unittest.TestCase):
+    """Test linear regression for estimating effects involving interaction."""
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        # Y = 2X1 - 3X2 + 2*X1*X2 + 10
+        df = pd.DataFrame({"X1": np.random.uniform(-1000, 1000, 1000), "X2": np.random.uniform(-1000, 1000, 1000)})
+        df["Y"] = 2 * df["X1"] - 3 * df["X2"] + 2 * df["X1"] * df["X2"] + 10
+        cls.df = df
+        print(df)
+
+    def test_X1_effect(self):
+        """When we fix the value of X2 to 0, the effect of X1 on Y should become ~2 (because X2 terms are cancelled)."""
+        x2 = Input("X2", float)
+        lr_model = LinearRegressionEstimator(
+            ("X1",), 1, 0, {"X2"}, ("Y",), effect_modifiers={x2: 0}, product_terms=[("X1", "X2")], df=self.df
+        )
+        test_results = lr_model.estimate_ate()
+        ate = test_results[0]
+        self.assertAlmostEqual(ate, 2.0)