fix from dompas (benmiroglio#36)

chrico-bu-uab · Mar 14, 2023 · dac8a51 · dac8a51
1 parent b5582b6
commit dac8a51
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/build/lib/pymatch/Matcher.py b/build/lib/pymatch/Matcher.py
@@ -250,7 +250,9 @@ def prop_test(self, col):
 
 
         """
-        if not uf.is_continuous(col, self.X) and col not in self.exclude:
+        is_continuous = (col in self.X.columns) or ("Q('{}')".format(col) in self.X.columns)
+        if (not is_continuous) and (not (col in self.exclude)):
+        # if not uf.is_continuous(col, self.X) and col not in self.exclude:
             pval_before = round(stats.chi2_contingency(self.prep_prop_test(self.data,
                                                                            col))[1], 6)
             pval_after = round(stats.chi2_contingency(self.prep_prop_test(self.matched_data,
@@ -299,7 +301,9 @@ def compare_continuous(self, save=False, return_table=False):
         """
         test_results = []
         for col in self.matched_data.columns:
-            if uf.is_continuous(col, self.X) and col not in self.exclude:
+            is_continuous = (col in self.X.columns) or ("Q('{}')".format(col) in self.X.columns)
+            if is_continuous and (not (col in self.exclude)):
+            # if uf.is_continuous(col, self.X) and col not in self.exclude:
                 # organize data
                 trb, cob = self.test[col], self.control[col]
                 tra = self.matched_data[self.matched_data[self.yvar]==True][col]
@@ -405,7 +409,9 @@ def prep_plot(data, var, colname):
         '''
         test_results = []
         for col in self.matched_data.columns:
-            if not uf.is_continuous(col, self.X) and col not in self.exclude:
+            is_continuous = (col in self.X.columns) or ("Q('{}')".format(col) in self.X.columns)
+            if (not is_continuous) and (not (col in self.exclude)):
+            # if not uf.is_continuous(col, self.X) and col not in self.exclude:
                 dbefore = prep_plot(self.data, col, colname="before")
                 dafter = prep_plot(self.matched_data, col, colname="after")
                 df = dbefore.join(dafter)