imsciences 0.6.0.4__py3-none-any.whl → 0.6.0.5__py3-none-any.whl

imsciences/datafunctions.py

@@ -898,7 +898,7 @@ class dataprocessing:
         start_year = int(starting_FY[2:])
 
         def calculate_FY_vectorized(date_series):
-            years_since_start = ((date_series - start_date).dt.days / 365.25).astype(int)
+            years_since_start = ((date_series - start_date).dt.days / 364).astype(int)
             fy = 'FY' + (start_year + years_since_start).astype(str)
             if short_format == "Yes":
                 fy = 'FY' + fy.str[-2:]
@@ -907,8 +907,14 @@ class dataprocessing:
         df['FY'] = calculate_FY_vectorized(df[index_col])
 
         if half_years == "Yes" or combined_FY_and_H == "Yes":
-            end_of_h1 = start_date + pd.DateOffset(months=6) - pd.DateOffset(days=1)
-            df['Half Years'] = np.where(df[index_col] <= end_of_h1, 'H1', 'H2')
+            def calculate_half_year_vectorized(date_series):
+                fy_years_since_start = ((date_series - start_date).dt.days / 364).astype(int)
+                fy_start_dates = start_date + fy_years_since_start * pd.DateOffset(years=1)
+                fy_end_of_h1 = fy_start_dates + pd.DateOffset(weeks=26) - pd.DateOffset(weeks=1)
+                half_year = np.where(date_series <= fy_end_of_h1, 'H1', 'H2')
+                return half_year
+            
+            df['Half Years'] = calculate_half_year_vectorized(df[index_col])
         
         if combined_FY_and_H == "Yes":
             df['Financial Half Years'] = df['FY'] + ' ' + df['Half Years']

{imsciences-0.6.0.4.dist-info → imsciences-0.6.0.5.dist-info}/METADATA

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

{imsciences-0.6.0.4.dist-info → imsciences-0.6.0.5.dist-info}/RECORD

@@ -2,13 +2,13 @@ dataprocessing/__init__.py,sha256=quSwsLs6IuLoA5Rzi0ZD40xZaQudwDteF7_ai9JfTPk,32
 dataprocessing/data-processing-functions.py,sha256=vE1vsZ8xOSbR9Bwlp9SWXwEHXQ0nFydwGkvzHXf2f1Y,41
 dataprocessing/datafunctions.py,sha256=vE1vsZ8xOSbR9Bwlp9SWXwEHXQ0nFydwGkvzHXf2f1Y,41
 imsciences/__init__.py,sha256=GIPbLmWc06sVcOySWwNvMNUr6XGOHqPLryFIWgtpHh8,78
-imsciences/datafunctions.py,sha256=Fr87wDxHy7wVfBsYpj_s6r3OxxsVslnFiWRdoBxYplI,135006
+imsciences/datafunctions.py,sha256=v3dyZYr7Bo_tiqxiIxu9-wy43cwAkcCgySt3iKwhk4s,135389
 imsciences/datapull.py,sha256=TPY0LDgOkcKTBk8OekbD0Grg5x0SomAK2dZ7MuT6X1E,19000
 imsciencesdataprocessing/__init__.py,sha256=quSwsLs6IuLoA5Rzi0ZD40xZaQudwDteF7_ai9JfTPk,32
 imsciencesdataprocessing/datafunctions.py,sha256=vE1vsZ8xOSbR9Bwlp9SWXwEHXQ0nFydwGkvzHXf2f1Y,41
 imsdataprocessing/__init__.py,sha256=quSwsLs6IuLoA5Rzi0ZD40xZaQudwDteF7_ai9JfTPk,32
 imsdataprocessing/datafunctions.py,sha256=vE1vsZ8xOSbR9Bwlp9SWXwEHXQ0nFydwGkvzHXf2f1Y,41
-imsciences-0.6.0.4.dist-info/METADATA,sha256=qnM9QQ1VR2rwX0lOMEVxL99CKDZdnbutZiO4h46zSKU,854
-imsciences-0.6.0.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-imsciences-0.6.0.4.dist-info/top_level.txt,sha256=hsENS-AlDVRh8tQJ6-426iUQlla9bPcGc0-UlFF0_iU,11
-imsciences-0.6.0.4.dist-info/RECORD,,
+imsciences-0.6.0.5.dist-info/METADATA,sha256=JdIOSMeD-hgHudpBJURanXcIeTLV5pUcqoB5yPOyZaw,854
+imsciences-0.6.0.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+imsciences-0.6.0.5.dist-info/top_level.txt,sha256=hsENS-AlDVRh8tQJ6-426iUQlla9bPcGc0-UlFF0_iU,11
+imsciences-0.6.0.5.dist-info/RECORD,,