imsciences 0.9.5.6__tar.gz → 0.9.5.7__tar.gz

{imsciences-0.9.5.6 → imsciences-0.9.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imsciences
-Version: 0.9.5.6
+Version: 0.9.5.7
 Summary: IMS Data Processing Package
 Author: IMS
 Author-email: cam@im-sciences.com

{imsciences-0.9.5.6 → imsciences-0.9.5.7}/imsciences/geo.py

@@ -303,10 +303,11 @@ class geoprocessing:
         # 1. Read and validate data
         # -----------------------
         raw_df = read_file(raw_data)
-        spend_df = read_file(spend_data)
+        raw_df = raw_df.rename(columns={'city': 'geo'})
+        spend_df = read_file(spend_data).rename(columns={'Cost': 'cost'})
 
         # Columns we minimally need in raw_df
-        required_columns = {'date', 'city'}
+        required_columns = {'date', 'geo'}
         # Ensure the columns to aggregate are there
         required_columns = required_columns.union(set(columns_to_aggregate))
         missing_in_raw = required_columns - set(raw_df.columns)
@@ -336,12 +337,8 @@ class geoprocessing:
         # -----------------------
         # 3. Prepare raw data
         # -----------------------
-        # Rename 'city' to 'geo' for consistency
-        raw_df = raw_df.rename(columns={'city': 'geo'})
-
         # Filter only the relevant geos
         filtered_df = raw_df[raw_df['geo'].isin(test_group + control_group)].copy()
-
         # -----------------------
         # 4. Group and aggregate
         # -----------------------
@@ -357,9 +354,9 @@ class geoprocessing:
 
         # -----------------------
         # 5. Map groups (Test vs. Control)
-        # -----------------------
-        assignment_map = {city: "Test Group" for city in test_group}
-        assignment_map.update({city: "Control Group" for city in control_group})
+        # -----------------------        
+        assignment_map = {city: 1 for city in test_group}
+        assignment_map.update({city: 2 for city in control_group})
         grouped_df['assignment'] = grouped_df['geo'].map(assignment_map)
 
         # -----------------------

{imsciences-0.9.5.6 → imsciences-0.9.5.7}/imsciences.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imsciences
-Version: 0.9.5.6
+Version: 0.9.5.7
 Summary: IMS Data Processing Package
 Author: IMS
 Author-email: cam@im-sciences.com

{imsciences-0.9.5.6 → imsciences-0.9.5.7}/setup.py

@@ -8,7 +8,7 @@ def read_md(file_name):
             return f.read()
     return ''
 
-VERSION = '0.9.5.6'
+VERSION = '0.9.5.7'
 DESCRIPTION = 'IMS Data Processing Package'
 LONG_DESCRIPTION = read_md('README.md')