diffindiff 2.2.0__tar.gz → 2.2.1__tar.gz

{diffindiff-2.2.0 → diffindiff-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffindiff
-Version: 2.2.0
+Version: 2.2.1
 Summary: diffindiff: Python library for convenient Difference-in-Differences Analyses
 Author: Thomas Wieland
 Author-email: geowieland@googlemail.com
@@ -16,20 +16,9 @@ This Python library is designed for performing Difference-in-Differences (DiD) a
 Thomas Wieland [ORCID](https://orcid.org/0000-0001-5168-9846) [EMail](mailto:geowieland@googlemail.com) 
 
 
-## Updates v2.2.0
-- More efficient and modularized code in general
-- Extensions:
-  - Triple-difference analysis in own function
-  - Ordinary Least Squares (OLS) and Maximum Likelihood (ML) estimation
-  - Extended model fit metrices
-  - Optional clustered standard errors in didanalysis.did_analysis()
-  - New data diagnostics function didtools.is_prepost()
-  - New data diagnostics function didtools.is_multiple_treatment_period()
+## Updates v2.2.1
 - Bugfixes:
-  - Correct import from patsy
-  - Automatic switch to pre-post data processing if detected
-  - Completion of package dependencies
-  - No (redundant) calculation of ITE/GTE for control group anymore
+  - Always converting unit and time col to str and calculating unit-time-index col
 
 
 ## Features

{diffindiff-2.2.0 → diffindiff-2.2.1}/README.md

@@ -8,20 +8,9 @@ This Python library is designed for performing Difference-in-Differences (DiD) a
 Thomas Wieland [ORCID](https://orcid.org/0000-0001-5168-9846) [EMail](mailto:geowieland@googlemail.com) 
 
 
-## Updates v2.2.0
-- More efficient and modularized code in general
-- Extensions:
-  - Triple-difference analysis in own function
-  - Ordinary Least Squares (OLS) and Maximum Likelihood (ML) estimation
-  - Extended model fit metrices
-  - Optional clustered standard errors in didanalysis.did_analysis()
-  - New data diagnostics function didtools.is_prepost()
-  - New data diagnostics function didtools.is_multiple_treatment_period()
+## Updates v2.2.1
 - Bugfixes:
-  - Correct import from patsy
-  - Automatic switch to pre-post data processing if detected
-  - Completion of package dependencies
-  - No (redundant) calculation of ITE/GTE for control group anymore
+  - Always converting unit and time col to str and calculating unit-time-index col
 
 
 ## Features

{diffindiff-2.2.0 → diffindiff-2.2.1}/diffindiff/config.py

@@ -4,16 +4,16 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.0.2
-# Last update: 2025-12-05 17:23
+# Version:     1.0.3
+# Last update: 2025-12-06 10:48
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 
 # Basic config:
 
-PACKAGE_VERSION = "2.2.0"
+PACKAGE_VERSION = "2.2.1"
 
-VERBOSE = False
+VERBOSE = True
 
 ROUND_STATISTIC = 3
 ROUND_PERCENT = 2

{diffindiff-2.2.0 → diffindiff-2.2.1}/diffindiff/diddata.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     2.1.2
-# Last update: 2025-12-05 17:23
+# Version:     2.1.3
+# Last update: 2025-12-06 10:49
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 
@@ -492,8 +492,12 @@ class DiffData:
         
         if unit_col is not None and time_col is not None:
 
-            if config.UNIT_TIME_COL not in additional_df.columns:
-                additional_df[config.UNIT_TIME_COL] = additional_df[unit_col]+config.DELIMITER+additional_df[time_col]
+            additional_df = tools.panel_index(
+                data=additional_df,
+                unit_col=unit_col,
+                time_col=time_col,
+                verbose=verbose
+                )
             
             if variables is None:
 
@@ -653,13 +657,28 @@ class DiffData:
         if after_treatment_period:
             new_merge[after_treatment_name] = new_merge[TG_col]*new_merge[ATT_col]
         
-        if config.UNIT_TIME_COL not in new_merge.columns:
-            new_merge[config.UNIT_TIME_COL] = new_merge[config.UNIT_COL].astype(str) + config.DELIMITER + new_merge[config.TIME_COL].astype(str)
+        new_merge = tools.panel_index(
+            data=new_merge,
+            unit_col=unit_id_col,
+            time_col=time_col,
+            verbose=verbose
+            )
 
-        if config.UNIT_TIME_COL not in did_modeldata_old.columns:
-            did_modeldata_old[config.UNIT_TIME_COL] = did_modeldata_old[unit_id_col].astype(str) + config.DELIMITER + did_modeldata_old[time_col].astype(str)
+        did_modeldata_old = tools.panel_index(
+            data=did_modeldata_old,
+            unit_col=unit_id_col,
+            time_col=time_col,
+            verbose=verbose
+            )
 
-        new_merge = new_merge[[config.UNIT_TIME_COL, TT_col, TG_col, treatment_name]].copy()
+        new_merge = new_merge[
+            [
+                config.UNIT_TIME_COL, 
+                TT_col, 
+                TG_col, 
+                treatment_name
+                ]
+                ].copy()
 
         did_modeldata_new = did_modeldata_old.merge(
             new_merge,
@@ -736,7 +755,8 @@ class DiffData:
         additional_df,
         counterfactual_outcome_col,
         time_col,
-        counterfactual_UID = "counterfac"
+        counterfactual_UID = "counterfac",
+        verbose: bool = config.VERBOSE
         ):
         
         if time_col is None or counterfactual_outcome_col is None:
@@ -766,7 +786,14 @@ class DiffData:
         did_modeldata_counterfac[config.TIME_COUNTER_COL] = treatment_data[config.TIME_COUNTER_COL].values
         did_modeldata_counterfac[config.TT_COL] = treatment_data[config.TT_COL].values
         did_modeldata_counterfac[config.TREATMENT_COL] = did_modeldata_counterfac[config.TG_COL] * did_modeldata_counterfac[config.TT_COL]
-        did_modeldata_counterfac[config.UNIT_TIME_COL] = did_modeldata_counterfac[config.UNIT_COL].astype(str) + config.DELIMITER + did_modeldata_counterfac[config.TIME_COL].astype(str)
+
+        did_modeldata_counterfac = tools.panel_index(
+            data=did_modeldata_counterfac,
+            unit_col=config.UNIT_COL,
+            time_col=config.TIME_COL,
+            verbose=verbose
+            )
+        
         if treatment_config["after_treatment_period"]:
             did_modeldata_counterfac["ATT"] = treatment_data["ATT"].values
 
@@ -1046,9 +1073,19 @@ def merge_data(
     if np.dtype(did_modeldata[config.TIME_COL]) != np.dtype(outcome_data[time_col]):
         print(f"WARNING: Time columns of treatment data and outcome data differ: {str(np.dtype(did_modeldata[config.TIME_COL]))}, {str(np.dtype(outcome_data[time_col]))}. This might induce an error while building the model dataset.")
                 
-    did_modeldata[config.UNIT_TIME_COL] = did_modeldata[config.UNIT_COL].astype(str) + config.DELIMITER + did_modeldata[config.TIME_COL].astype(str)
+    did_modeldata = tools.panel_index(
+        data=did_modeldata,
+        unit_col=config.UNIT_COL,
+        time_col=config.TIME_COL,
+        verbose=verbose
+        )
 
-    outcome_data[config.UNIT_TIME_COL] = outcome_data[unit_id_col].astype(str) + config.DELIMITER + outcome_data[time_col].astype(str)
+    outcome_data = tools.panel_index(
+        data=outcome_data,
+        unit_col=unit_id_col,
+        time_col=time_col,
+        verbose=verbose
+        )
       
     if keep_columns:
         outcome_data_short = outcome_data

{diffindiff-2.2.0 → diffindiff-2.2.1}/diffindiff/didtools.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     2.1.0
-# Last update: 2025-12-05 17:24
+# Version:     2.1.1
+# Last update: 2025-12-06 10:48
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 
@@ -45,7 +45,37 @@ def check_columns(
         
         if missing_columns:
             raise KeyError(f"Data do not contain column(s): {', '.join(missing_columns)}")
-        
+
+def panel_index(
+    data: pd.DataFrame,
+    unit_col: str,
+    time_col: str,
+    verbose: bool = config.VERBOSE
+    ):
+
+    to_str = []
+    unit_x_time = True
+
+    if data[unit_col].dtype != 'object':
+        data[unit_col] = data[unit_col].astype(str)
+        to_str.append(unit_col)
+
+    if data[time_col].dtype != 'object':
+        data[time_col] = data[time_col].astype(str)
+        to_str.append(time_col)
+
+    if config.UNIT_TIME_COL not in data.columns:
+        unit_x_time = False
+        data[config.UNIT_TIME_COL] = data[unit_col]+config.DELIMITER+data[time_col]
+
+    if verbose:
+        if len(to_str) > 0:
+            print(f"NOTE: The following columns were converted to str: {', '.join(to_str)}.")
+        if not unit_x_time:
+            print(f"NOTE: The following unit-time-index column was included: {config.UNIT_TIME_COL}.")
+
+    return data
+
 def is_balanced(
     data: pd.DataFrame,
     unit_col: str,

{diffindiff-2.2.0 → diffindiff-2.2.1}/diffindiff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffindiff
-Version: 2.2.0
+Version: 2.2.1
 Summary: diffindiff: Python library for convenient Difference-in-Differences Analyses
 Author: Thomas Wieland
 Author-email: geowieland@googlemail.com
@@ -16,20 +16,9 @@ This Python library is designed for performing Difference-in-Differences (DiD) a
 Thomas Wieland [ORCID](https://orcid.org/0000-0001-5168-9846) [EMail](mailto:geowieland@googlemail.com) 
 
 
-## Updates v2.2.0
-- More efficient and modularized code in general
-- Extensions:
-  - Triple-difference analysis in own function
-  - Ordinary Least Squares (OLS) and Maximum Likelihood (ML) estimation
-  - Extended model fit metrices
-  - Optional clustered standard errors in didanalysis.did_analysis()
-  - New data diagnostics function didtools.is_prepost()
-  - New data diagnostics function didtools.is_multiple_treatment_period()
+## Updates v2.2.1
 - Bugfixes:
-  - Correct import from patsy
-  - Automatic switch to pre-post data processing if detected
-  - Completion of package dependencies
-  - No (redundant) calculation of ITE/GTE for control group anymore
+  - Always converting unit and time col to str and calculating unit-time-index col
 
 
 ## Features

{diffindiff-2.2.0 → diffindiff-2.2.1}/setup.py

@@ -8,7 +8,7 @@ def read_README():
     
 setup(
     name='diffindiff',
-    version='2.2.0',
+    version='2.2.1',
     description='diffindiff: Python library for convenient Difference-in-Differences Analyses',
     packages=find_packages(include=["diffindiff", "diffindiff.tests"]),
     include_package_data=True,