imsciences 0.6.2.9__tar.gz → 0.6.3.1__tar.gz

{imsciences-0.6.2.9 → imsciences-0.6.3.1}/PKG-INFO

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

{imsciences-0.6.2.9 → imsciences-0.6.3.1}/imsciences/datafunctions.py

@@ -237,8 +237,12 @@ class dataprocessing:
         print("    - Usage: plot_chart(df, date_col, value_cols, chart_type='line', title='Chart', x_title='Date', y_title='Values', **kwargs)")
         print("    - Example: plot_chart(df, 'obs', df.cols, chart_type='line', title='Spend Over Time', x_title='Date', y_title='Spend')")           
         
+        print("\n43. plot_two_with_common_cols")
+        print("    - Description: Plots the number of charts in two dataframes for which there are two common column names")
+        print("    - Usage: plot_two_with_common_cols(df1, df2, date_column, same_axis=True)")
+        print("    - Example: plot_two_with_common_cols(df_1, df_2,date_column='obs')")  
         
-                
+              
     def get_wd_levels(self, levels):
         """
         Gets the current wd of whoever is working on it and gives the options to move the number of levels up.
@@ -1553,7 +1557,6 @@ class dataprocessing:
         
         return diff_df, total_diff_df
     
-    # Convert week commencing col (should be most likely monday to sunday or vice versa)
     def week_commencing_2_week_commencing_conversion(self,df,date_col,week_commencing='sun'):
         """
         Convert week commencing column in a DataFrame to the start of another day specified.
@@ -1709,6 +1712,34 @@ class dataprocessing:
         
         return fig
     
+    def plot_two_with_common_cols(self, df1, df2, date_column, same_axis=True):
+        """
+        Plot multiple series from two DataFrames with common columns using a specified date column for the X-axis. 
+
+        Args:
+            df1 (pandas.DataFrame): The first DataFrame containing data to plot.
+            df2 (pandas.DataFrame): The second DataFrame containing data to plot.
+            date_column (str): The name of the date column in the DataFrames.
+            same_axis (bool, optional): Whether to plot the series on the same y-axis. Defaults to True.
+
+        Returns:
+            list: A list of Plotly figures generated from the common columns.
+        """
+        # Find common columns between df1 and df2, excluding the date column
+        common_columns = list(set(df1.columns).intersection(set(df2.columns)) - {date_column})
+        
+        # Generate col_pairs list for plot_two function
+        col_pairs = [(col, col) for col in common_columns]
+        
+        # Loop through the common columns and plot each pair
+        figs = []
+        for col1, col2 in col_pairs:
+            # Call the existing plot_two function
+            fig = self.plot_two(df1, col1, df2, col2, date_column, same_axis=same_axis)
+            figs.append(fig)
+        
+        return figs
+    
 ########################################################################################################################################
 ########################################################################################################################################
 

{imsciences-0.6.2.9 → imsciences-0.6.3.1}/imsciences.egg-info/PKG-INFO

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

{imsciences-0.6.2.9 → imsciences-0.6.3.1}/setup.py

@@ -8,7 +8,7 @@ def read_md(file_name):
             return f.read()
     return ''
 
-VERSION = '0.6.2.9'
+VERSION = '0.6.3.1'
 DESCRIPTION = 'IMS Data Processing Package'
 LONG_DESCRIPTION = read_md('README.md')  # Reading from README.md