Skip to content

Commit

Permalink
file renameing as suggested by @f-allian
Browse files Browse the repository at this point in the history
  • Loading branch information
jmafoster1 committed Sep 17, 2024
1 parent 97fb6e7 commit ed832da
Show file tree
Hide file tree
Showing 18 changed files with 17 additions and 19 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from patsy import dmatrix # pylint: disable = no-name-in-module

from causal_testing.specification.variable import Variable
from causal_testing.estimation.estimator import Estimator
from causal_testing.estimation.abstract_estimator import Estimator

logger = logging.getLogger(__name__)

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import pandas as pd
import statsmodels.api as sm

from causal_testing.estimation.estimator import Estimator
from causal_testing.estimation.abstract_estimator import Estimator

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion causal_testing/estimation/ipcw_estimator.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from lifelines import CoxPHFitter

from causal_testing.specification.capabilities import TreatmentSequence, Capability
from causal_testing.estimation.estimator import Estimator
from causal_testing.estimation.abstract_estimator import Estimator

logger = logging.getLogger(__name__)

Expand Down
5 changes: 2 additions & 3 deletions causal_testing/estimation/linear_regression_estimator.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from patsy import dmatrix, ModelDesc # pylint: disable = no-name-in-module

from causal_testing.specification.variable import Variable
from causal_testing.estimation.gp import GP
from causal_testing.estimation.regression_estimator import RegressionEstimator
from causal_testing.estimation.genetic_programming_regression_fitter import GP
from causal_testing.estimation.abstract_regression_estimator import RegressionEstimator

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -92,7 +92,6 @@ def gp_formula(
formula = gp.simplify(formula)
self.formula = f"{self.outcome} ~ I({formula}) - 1"


def estimate_coefficient(self) -> tuple[pd.Series, list[pd.Series, pd.Series]]:
"""Estimate the unit average treatment effect of the treatment on the outcome. That is, the change in outcome
caused by a unit change in treatment.
Expand Down
2 changes: 1 addition & 1 deletion causal_testing/estimation/logistic_regression_estimator.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import numpy as np
import statsmodels.formula.api as smf

from causal_testing.estimation.regression_estimator import RegressionEstimator
from causal_testing.estimation.abstract_regression_estimator import RegressionEstimator

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion causal_testing/json_front/json_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from causal_testing.testing.base_test_case import BaseTestCase
from causal_testing.testing.causal_test_adequacy import DataAdequacy

from causal_testing.estimation.estimator import Estimator
from causal_testing.estimation.abstract_estimator import Estimator
from causal_testing.estimation.linear_regression_estimator import LinearRegressionEstimator
from causal_testing.estimation.logistic_regression_estimator import LogisticRegressionEstimator

Expand Down
2 changes: 1 addition & 1 deletion causal_testing/testing/causal_test_adequacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

from causal_testing.testing.causal_test_suite import CausalTestSuite
from causal_testing.specification.causal_dag import CausalDAG
from causal_testing.estimation.estimator import Estimator
from causal_testing.estimation.abstract_estimator import Estimator
from causal_testing.testing.causal_test_case import CausalTestCase

logger = logging.getLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion causal_testing/testing/causal_test_case.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from causal_testing.specification.variable import Variable
from causal_testing.testing.causal_test_outcome import CausalTestOutcome
from causal_testing.testing.base_test_case import BaseTestCase
from causal_testing.estimation.estimator import Estimator
from causal_testing.estimation.abstract_estimator import Estimator
from causal_testing.testing.causal_test_result import CausalTestResult, TestValue
from causal_testing.data_collection.data_collector import DataCollector

Expand Down
2 changes: 1 addition & 1 deletion causal_testing/testing/causal_test_result.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from dataclasses import dataclass
import pandas as pd

from causal_testing.estimation.estimator import Estimator
from causal_testing.estimation.abstract_estimator import Estimator
from causal_testing.specification.variable import Variable


Expand Down
2 changes: 1 addition & 1 deletion causal_testing/testing/causal_test_suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from typing import Type, Iterable
from causal_testing.testing.base_test_case import BaseTestCase
from causal_testing.testing.causal_test_case import CausalTestCase
from causal_testing.estimation.estimator import Estimator
from causal_testing.estimation.abstract_estimator import Estimator
from causal_testing.testing.causal_test_result import CausalTestResult
from causal_testing.data_collection.data_collector import DataCollector
from causal_testing.specification.causal_specification import CausalSpecification
Expand Down
2 changes: 1 addition & 1 deletion examples/poisson-line-process/example_poisson_process.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from causal_testing.testing.causal_test_case import CausalTestCase
from causal_testing.testing.causal_test_outcome import ExactValue, Positive
from causal_testing.estimation.linear_regression_estimator import LinearRegressionEstimator
from causal_testing.estimation.estimator import Estimator
from causal_testing.estimation.abstract_estimator import Estimator
from causal_testing.testing.base_test_case import BaseTestCase

import pandas as pd
Expand Down
2 changes: 1 addition & 1 deletion examples/poisson/example_run_causal_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from causal_testing.testing.causal_test_outcome import ExactValue, Positive, Negative, NoEffect, CausalTestOutcome
from causal_testing.testing.causal_test_result import CausalTestResult
from causal_testing.json_front.json_class import JsonUtility
from causal_testing.estimation.estimator import Estimator
from causal_testing.estimation.abstract_estimator import Estimator
from causal_testing.specification.scenario import Scenario
from causal_testing.specification.variable import Input, Output, Meta

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import unittest
import pandas as pd

from causal_testing.estimation.gp import GP
from causal_testing.estimation.genetic_programming_regression_fitter import GP


class TestGP(unittest.TestCase):

def test_init_invalid_fun_name(self):
with self.assertRaises(ValueError):
GP(df=pd.DataFrame(), features=[], outcome="", max_order=2, sympy_conversions={"power_1": ""})
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from causal_testing.utils.validation import CausalValidator
from causal_testing.specification.capabilities import TreatmentSequence

from causal_testing.estimation.iv_estimator import InstrumentalVariableEstimator
from causal_testing.estimation.instrumental_variable_estimator import InstrumentalVariableEstimator


class TestInstrumentalVariableEstimator(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/estimation_tests/test_linear_regression_estimator.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from causal_testing.specification.capabilities import TreatmentSequence

from causal_testing.estimation.linear_regression_estimator import LinearRegressionEstimator
from causal_testing.estimation.gp import reciprocal
from causal_testing.estimation.genetic_programming_regression_fitter import reciprocal


def load_nhefs_df():
Expand Down
2 changes: 1 addition & 1 deletion tests/json_front_tests/test_json_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import os

from causal_testing.estimation.linear_regression_estimator import LinearRegressionEstimator
from causal_testing.estimation.estimator import Estimator
from causal_testing.estimation.abstract_estimator import Estimator
from causal_testing.testing.causal_test_outcome import NoEffect, Positive
from causal_testing.json_front.json_class import JsonUtility, CausalVariables
from causal_testing.specification.variable import Input, Output, Meta
Expand Down

0 comments on commit ed832da

Please sign in to comment.