mg-pso-gui 0.1.49__tar.gz → 0.1.51__tar.gz

{mg-pso-gui-0.1.49 → mg-pso-gui-0.1.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.1.49
+Version: 0.1.51
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg-pso-gui-0.1.49 → mg-pso-gui-0.1.51}/mg_pso_gui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.1.49
+Version: 0.1.51
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg-pso-gui-0.1.49 → mg-pso-gui-0.1.51}/mgpsogui/gui/HomePage.py

@@ -69,6 +69,11 @@ class App(customtkinter.CTk):
 		self.selected_csv.set("No files found...")
 		self.open_file = "None"
 		self.csv_data = None
+  
+		self.selected_csv2 = tk.StringVar()
+		self.selected_csv2.set("No files found...")
+		self.open_file2 = "None"
+		self.csv_data2 = None
 
 		self.selected_x = tk.StringVar()
 		self.selected_x.set("time")

{mg-pso-gui-0.1.49 → mg-pso-gui-0.1.51}/mgpsogui/gui/VisualizeTab/SideBar.py

@@ -116,5 +116,79 @@ class SideBar(CTkScrollableFrame):
                 self.home_page.csv_y2_selector = CTkOptionMenu(self.containerFrame, values=columns, variable=self.home_page.selected_y2, command=self.home_page.update_graph)
                 self.home_page.csv_y2_selector.grid(row=7, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
                 
+                if (self.home_page.csv_y2_selector.get() not in columns):
+                    self.home_page.csv_y2_selector.set(columns[3])
+                    
+        elif (selected_graph == "Compare CSV"):
+            info = self.option_manager.get_project_data()
+            folder = os.path.join(info['path'], info['name'])
+            if not os.path.exists(folder):
+                os.makedirs(folder)
+                
+            # Get all CSV files in the folder and add their paths to a list
+            path_map = {}
+            name_list = []
+            for root, dirs, files in os.walk(folder):
+                for file in files:
+                    if file.endswith(".csv"):
+                        name = file.replace(".csv", "")
+                        name_list.append(name)
+                        path_map[name] = os.path.join(root, file)
+            
+            if (len(name_list) == 0):
+                name_list.append("No files found...")
+            else:
+                if (self.home_page.selected_csv.get() not in name_list):
+                    self.home_page.selected_csv.set(name_list[0])
+                if (self.home_page.selected_csv2.get() not in name_list):
+                    self.home_page.selected_csv2.set(name_list[0])
+            
+            file_label = CTkLabel(self.containerFrame, text="CSV Files:")
+            file_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 5), sticky="w")
+            
+            self.home_page.csv_file_selector = CTkOptionMenu(self.containerFrame, values=name_list, variable=self.home_page.selected_csv, command=self.home_page.update_graph)
+            self.home_page.csv_file_selector.grid(row=1, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
+            
+            self.home_page.csv_file_selector2 = CTkOptionMenu(self.containerFrame, values=name_list, variable=self.home_page.selected_csv2, command=self.home_page.update_graph)
+            self.home_page.csv_file_selector2.grid(row=2, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
+            
+            selected_file = self.home_page.selected_csv.get()
+            if (selected_file in path_map and selected_file != self.home_page.open_file):
+                self.home_page.csv_data = pd.read_csv(path_map[selected_file], skiprows=3)
+                self.home_page.open_file = selected_file
+                
+            selected_file2 = self.home_page.selected_csv2.get()
+            if (selected_file2 in path_map and selected_file2 != self.home_page.open_file2):
+                self.home_page.csv_data2 = pd.read_csv(path_map[selected_file2], skiprows=3)
+                self.home_page.open_file2 = selected_file2
+                
+            if (self.home_page.csv_data is not None and self.home_page.csv_data2 is not None):
+                # Get all column names of CSV
+                columns = self.home_page.csv_data.columns
+                
+                x_axis_label = CTkLabel(self.containerFrame, text="X Axis:")
+                x_axis_label.grid(row=3, column=0, padx=(20, 20), pady=(40, 5), sticky="w")
+                
+                self.home_page.csv_x_selector = CTkOptionMenu(self.containerFrame, values=columns, variable=self.home_page.selected_x, command=self.home_page.update_graph)
+                self.home_page.csv_x_selector.grid(row=4, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
+                
+                if (self.home_page.csv_x_selector.get() not in columns):
+                    self.home_page.csv_x_selector.set(columns[1])
+                
+                y1_axis_label = CTkLabel(self.containerFrame, text="Y Axis:")
+                y1_axis_label.grid(row=5, column=0, padx=(20, 20), pady=(20, 5), sticky="w")
+                
+                self.home_page.csv_y1_selector = CTkOptionMenu(self.containerFrame, values=columns, variable=self.home_page.selected_y1, command=self.home_page.update_graph)
+                self.home_page.csv_y1_selector.grid(row=6, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
+                
+                if (self.home_page.csv_y1_selector.get() not in columns):
+                    self.home_page.csv_y1_selector.set(columns[2])
+                
+                y2_axis_label = CTkLabel(self.containerFrame, text="Secondary Y Axis:")
+                y2_axis_label.grid(row=7, column=0, padx=(20, 20), pady=(20, 5), sticky="w")
+                
+                self.home_page.csv_y2_selector = CTkOptionMenu(self.containerFrame, values=columns, variable=self.home_page.selected_y2, command=self.home_page.update_graph)
+                self.home_page.csv_y2_selector.grid(row=8, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
+                
                 if (self.home_page.csv_y2_selector.get() not in columns):
                     self.home_page.csv_y2_selector.set(columns[3])

{mg-pso-gui-0.1.49 → mg-pso-gui-0.1.51}/mgpsogui/gui/VisualizeTab/VisualizeTab.py

@@ -61,7 +61,7 @@ def create_tab(self, tab):
     self.graph_container.grid_columnconfigure(0, weight=1)
     self.graph_container.grid_rowconfigure(0, weight=1)
     
-    self.graph_selector = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Best Cost Stacked", "Best Cost by Round", "Calibrated Parameters", "Iteration Table", "Custom CSV"], variable=self.graph_selector_value, command=self.update_graph)
+    self.graph_selector = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Best Cost Stacked", "Best Cost by Round", "Calibrated Parameters", "Iteration Table", "Custom CSV", "Compare CSV"], variable=self.graph_selector_value, command=self.update_graph)
     self.graph_selector.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
     
     # Create SideBar

{mg-pso-gui-0.1.49 → mg-pso-gui-0.1.51}/mgpsogui/util/GraphGenerator.py

@@ -29,6 +29,9 @@ def generate_graphs(HomePage):
         elif (selected_graph == "Custom CSV"):
             HomePage.selected_graph_name = "custom_csv"
             custom_csv(HomePage, HomePage.option_manager)
+        elif (selected_graph == "Compare CSV"):
+            HomePage.selected_graph_name = "compare_csv"
+            compare_csv(HomePage, HomePage.option_manager)
             
         image_path = os.path.join(folder, HomePage.selected_graph_name + ".png")
         
@@ -292,15 +295,15 @@ def custom_csv(homepage, option_manager):
     else:
         xx = pd.to_numeric(data[x], errors="coerce").iloc[2:]
         
-    yy = pd.to_numeric(data[val], errors="coerce").iloc[2]
+    yy = pd.to_numeric(data[val], errors="coerce").iloc[2:]
     
-    yy_unit = "N/A"
-    #yy_unit = data[val].iloc[1]
+    #yy_unit = "N/A"
+    yy_unit = data[val].iloc[1]
     
     yy2 = pd.to_numeric(data[val2], errors="coerce").iloc[2:]
     
-    yy2_unit = "N/A"
-    #yy2_unit = data[val2].iloc[1]
+    #yy2_unit = "N/A"
+    yy2_unit = data[val2].iloc[1]
 
     fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
     fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2'))
@@ -344,3 +347,72 @@ def custom_csv(homepage, option_manager):
         f.write(html)
 
     return fig
+
+def compare_csv(homepage, option_manager):
+    fig = go.Figure()
+
+    data = homepage.csv_data
+    data2 = homepage.csv_data2
+
+    x = homepage.csv_x_selector.get()
+    val = homepage.csv_y1_selector.get()
+    val2 = homepage.csv_y2_selector.get()
+    
+    xx = None
+    if x == "time":
+        xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce').iloc[2:]
+    else:
+        xx = pd.to_numeric(data[x], errors="coerce").iloc[2:]
+        
+    yy = pd.to_numeric(data[val], errors="coerce").iloc[2:]
+    
+    #yy_unit = "N/A"
+    yy_unit = data[val].iloc[1]
+    
+    yy2 = pd.to_numeric(data2[val2], errors="coerce").iloc[2:]
+    
+    #yy2_unit = "N/A"
+    yy2_unit = data2[val2].iloc[1]
+
+    fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
+    fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2'))
+
+    fig.update_layout(
+        title="",
+        xaxis_title=x,
+        yaxis_title=val,
+        font=dict(color='white'),
+        paper_bgcolor='rgba(42, 42, 42, 0)',
+        plot_bgcolor='rgb(62, 62, 62)',
+        xaxis=dict(
+            gridcolor='rgb(72, 72, 72)',
+            gridwidth=1
+        ),
+        yaxis=dict(
+            title=val + " (" + str(yy_unit) + ")",
+            autorange=True,
+            gridcolor='rgb(72, 72, 72)',
+            gridwidth=0.1
+        ),
+        yaxis2=dict(
+            title=val2 + " (" + str(yy2_unit) + ")",
+            overlaying='y',
+            side='right'
+        )
+    )
+
+    info = option_manager.get_project_data()
+    folder = os.path.join(info['path'], info['name'])
+    
+    if not os.path.exists(folder):
+        os.makedirs(folder)
+
+    fig.write_image(os.path.join(folder, "compare_csv.png"), width=1280, height=720)
+    fig.write_html(os.path.join(folder, "compare_csv.html"), include_plotlyjs='cdn', auto_open=False)
+    with open(os.path.join(folder, "compare_csv.html"), "r") as f:
+        html = f.read()
+        html = html.replace("<body>", "<body bgcolor='#2a2a2a'>")
+    with open(os.path.join(folder, "compare_csv.html"), "w") as f:
+        f.write(html)
+
+    return fig

{mg-pso-gui-0.1.49 → mg-pso-gui-0.1.51}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.1.49'
+VERSION = '0.1.51'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()