mg-pso-gui 0.1.36__tar.gz → 0.1.87__tar.gz

{mg-pso-gui-0.1.36 → mg-pso-gui-0.1.87}/PKG-INFO

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

{mg-pso-gui-0.1.36 → mg-pso-gui-0.1.87}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.36 → mg-pso-gui-0.1.87}/mg_pso_gui.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ mgpsogui/gui/SetupTab/BoundsList.py
 mgpsogui/gui/SetupTab/CalibrationParametersView.py
 mgpsogui/gui/SetupTab/FunctionsList.py
 mgpsogui/gui/SetupTab/ListParametersView.py
+mgpsogui/gui/SetupTab/OptimalParameterView.py
 mgpsogui/gui/SetupTab/SetupTab.py
 mgpsogui/gui/SetupTab/StaticParameterView.py
 mgpsogui/gui/SetupTab/StepView.py

{mg-pso-gui-0.1.36 → mg-pso-gui-0.1.87}/mgpsogui/gui/HomePage.py

@@ -67,6 +67,22 @@ class App(customtkinter.CTk):
 
 		self.selected_csv = tk.StringVar()
 		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")
+
+		self.selected_y1 = tk.StringVar()
+		self.selected_y1.set("NONE")
+
+		self.selected_y2 = tk.StringVar()
+		self.selected_y2.set("NONE")
 
 		self.running_config = None
 		self.selected_graph_name = None
@@ -81,7 +97,8 @@ class App(customtkinter.CTk):
 		self.image_height = 720
 		self.progress_data = None
 		self.calibration_data = None
-
+		self.testing = False
+  
 		# configure window
 		self.title("CSIP PSO")
 		self.geometry(f"{1920}x{1080}")
@@ -157,7 +174,7 @@ class App(customtkinter.CTk):
 		self.footer_progress_bar.grid(row=0, column=4, padx=(50, 100), pady=header_padding_y, sticky="ew")
 		self.footer_progress_bar.set(0)
 		
-		self.algorithm_optionmenu = customtkinter.CTkOptionMenu(self.footer_frame, values=["PSO", "Halton"], width=50)
+		self.algorithm_optionmenu = customtkinter.CTkOptionMenu(self.footer_frame, variable=self.option_manager.get_arguments()['mode'], values=["PSO", "Halton"], width=50)
 		self.algorithm_optionmenu.grid(row=0, column=6, padx=header_padding_x, pady=header_padding_y)
 		self.algorithm_optionmenu.set("PSO")
 
@@ -167,7 +184,7 @@ class App(customtkinter.CTk):
 		self.run_button.grid(row=0, column=7, padx=(20, 5), pady=header_padding_y)
 
 		test_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "test.png")), size=(20, 20))
-		self.test_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=test_image, command=self.run)
+		self.test_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=test_image, command=self.run_test)
 		ctt(self.test_button, delay=0.1, alpha=0.95, message="Start Testing")
 		self.test_button.grid(row=0, column=8, padx=(5, 5), pady=header_padding_y)
 		
@@ -305,6 +322,9 @@ class App(customtkinter.CTk):
 			self.calib_param_frame.clear()
 			self.calib_param_frame.render()
    
+			self.optimal_param_frame.clear()
+			self.optimal_param_frame.render()
+   
 			info = self.option_manager.get_project_data()
 			folder = os.path.join(info['path'], info['name'])
 			self.HRU_data = pd.read_csv(os.path.join(folder, "results", "HRU_1.csv"), skiprows=3)
@@ -363,13 +383,24 @@ class App(customtkinter.CTk):
 		self.after(10, self.make_request)
 		self.after(3000, lambda: self.refresh_button.configure(fg_color=self.default_button_color))
 		
+	def run_test(self):
+		self.testing = True
+		self.run()	
+  
 	def run(self):
 		metrics = self.option_manager.get_metrics()
 		self.running_config = metrics
 		
+		if self.testing:
+			steps = metrics['steps']
+			for step in steps:
+				for param in step['param']:
+					param['default_value'] = param['optimal_value']
+		self.testing = False
+  
 		self.progress_data = None
 		self.calibration_data = None
-  
+
 		#self.progress_bar.configure(mode="indeterminnate")
 		#self.progress_bar.start()
 		self.footer_progress_bar.configure(mode="indeterminnate")
@@ -495,6 +526,17 @@ class App(customtkinter.CTk):
 				print("COSU " + cosu_line, flush=True)
 			except Empty:
 				break
+
+		while True:
+			try:
+				trace = results_queue.get_nowait()
+				
+				print("TRACE " + str(trace), flush=True)
+			except Empty:
+				break
+			except Exception as e:
+				print("Some error happened when getting the trace!")
+				print(e)
 		
 		if (os.path.exists(os.path.join(folder, 'output.txt'))):
 			with open(os.path.join(folder, 'output.txt'), 'r') as f:

{mg-pso-gui-0.1.36 → mg-pso-gui-0.1.87}/mgpsogui/gui/OptionManager.py

@@ -11,6 +11,7 @@ class OptionManager():
         self.project_data = {"name": "", "path": ""}
         self.arguments = {"param": [],
                  "url": sv(),
+                 "mode": sv(),
                  "files": {},
                  "calibration_parameters": []}
         self.steps = []
@@ -19,6 +20,7 @@ class OptionManager():
     def clear(self):
         self.arguments['param'].clear()
         self.arguments['url'].set("")
+        self.arguments['mode'].set("PSO")
         self.arguments['files'] = {}
         self.arguments['calibration_parameters'].clear()
         self.steps = []
@@ -29,6 +31,9 @@ class OptionManager():
         if ("url" in arguments):
             self.arguments["url"].set(arguments["url"])
             
+        if ("mode" in arguments):
+            self.arguments["mode"].set(arguments["mode"])
+            
         if ("files" in arguments):
             for file in arguments["files"]:
                 name = file["name"]
@@ -65,6 +70,7 @@ class OptionManager():
                     "name": sv(), 
                     "bounds": (sv(), sv()), 
                     "default_value": sv(), 
+                    "optimal_value": sv(), 
                     "type": sv(),
                     "calibration_strategy": sv()
                 }
@@ -75,18 +81,27 @@ class OptionManager():
                 else: 
                     param_obj["bounds"][0].set(0)
                     param_obj["bounds"][1].set(1)
+                    
                 if "type" in param:
                     param_obj["type"].set(param["type"])
                 else:
                     param_obj["type"].set("float")
+                    
                 if "default_value" in param:
                     param_obj["default_value"].set(param["default_value"])
                 else:
                     param_obj["default_value"].set(1)
+                    
+                if "optimal_value" in param:
+                    param_obj["optimal_value"].set(param["optimal_value"])
+                else:
+                    param_obj["optimal_value"].set(0)
+                    
                 if "calibration_strategy" in param:
                     param_obj["calibration_strategy"].set(param["calibration_strategy"])
                 else:
                     param_obj["calibration_strategy"].set("none")
+                    
                 obj["param"].append(param_obj)
             
             for objfunc in step["objfunc"]:
@@ -135,17 +150,20 @@ class OptionManager():
                   max=1,
                   type="float",
                   default_value=1,
+                  optimal_value=0,
                   calibration_strategy="none"):
         obj = {
             "name": sv(), 
             "bounds": (sv(), sv()), 
             "default_value": sv(), 
+            "optimal_value": sv(),
             "type": sv(),
             "calibration_strategy": sv()
         }
         obj["name"].set(name)
         obj["type"].set(type)
         obj["default_value"].set(default_value)
+        obj["optimal_value"].set(optimal_value)
         obj["calibration_strategy"].set(calibration_strategy)
         obj["bounds"][0].set(min)
         obj["bounds"][1].set(max)
@@ -227,7 +245,7 @@ class OptionManager():
         result['service_parameters'] = {}
         result['project_data'] = self.project_data
         for key, value in self.arguments.items():
-            if key == 'url':
+            if key == 'url' or key == 'mode':
                 result['arguments'][key] = value.get()
             elif key == 'files':
                 result['arguments'][key] = {}
@@ -257,6 +275,7 @@ class OptionManager():
                             'bounds': (float(param['bounds'][0].get()), 
                                        float(param['bounds'][1].get())),
                             'default_value': float(param['default_value'].get()),
+                            'optimal_value': float(param['optimal_value'].get()),
                             'type': 'float',
                             'calibration_strategy': param['calibration_strategy'].get()
                         }
@@ -268,6 +287,7 @@ class OptionManager():
                             'bounds': (float(param['bounds'][0].get()), 
                                        float(param['bounds'][1].get())),
                             'default_value': param['default_value'].get(),
+                            'optimal_value': param['optimal_value'].get(),
                             'type': 'list',
                             'calibration_strategy': param['calibration_strategy'].get()
                         }

mg-pso-gui-0.1.87/mgpsogui/gui/SetupTab/OptimalParameterView.py

@@ -0,0 +1,47 @@
+from customtkinter import CTkScrollableFrame
+from customtkinter import CTkFrame
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+import tkinter as tk
+
+global option_manager
+
+class OptimalParameterView(CTkScrollableFrame):
+    def __init__(self, *args,
+                 option_manager: None,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        self.option_manager = option_manager
+        
+        self.render()
+
+    def clear(self):
+        self.containerFrame.destroy()
+        
+    def render(self):
+        row = 0
+        
+        self.containerFrame = CTkFrame(self)
+        self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
+        self.containerFrame.grid_columnconfigure((0, 1), weight=1)
+        
+        #CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
+        #CTkLabel(self.containerFrame, text="Value:").grid(row=row, column=1, columnspan=1, padx=5, pady=5, sticky="")
+        #row += 1
+        
+        self.steps = self.option_manager.get_steps()
+
+        for step in self.steps:
+            name = step['name'].get()
+            CTkLabel(self.containerFrame, text=name).grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
+            row += 1
+            
+            for param in step['param']:
+                CTkEntry(self.containerFrame, textvariable=param['name']).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+            
+                bb = CTkEntry(self.containerFrame)
+                bb.grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+                bb.configure(textvariable=param['optimal_value'])
+                row += 1

{mg-pso-gui-0.1.36 → mg-pso-gui-0.1.87}/mgpsogui/gui/SetupTab/SetupTab.py

@@ -3,6 +3,7 @@
 from . import StepView as sv
 from . import StaticParameterView as spv
 from . import CalibrationParametersView as cpv
+from . import OptimalParameterView as opv
 
 import customtkinter
 
@@ -15,10 +16,12 @@ def create_tab(self, tab):
     self.paramtabview = customtkinter.CTkTabview(tab, bg_color="transparent", fg_color="transparent")
     self.paramtabview.grid(row=0, column=1, padx=(0, 0), pady=(10, 10), sticky="nsew")
     
-    tab1 = "Static Parameters"
-    tab2 = "Calibration Parameters"
+    tab1 = "Static"
+    tab2 = "Calibration"
+    tab3 = "Optimal Parameters"
     self.paramtabview.add(tab1)
     self.paramtabview.add(tab2)
+    self.paramtabview.add(tab3)
     
     self.paramtabview.tab(tab1).grid_columnconfigure(0, weight=1)
     self.paramtabview.tab(tab1).grid_rowconfigure(0, weight=1)
@@ -26,6 +29,9 @@ def create_tab(self, tab):
     self.paramtabview.tab(tab2).grid_columnconfigure(0, weight=1)
     self.paramtabview.tab(tab2).grid_rowconfigure(0, weight=1)
     
+    self.paramtabview.tab(tab3).grid_columnconfigure(0, weight=1)
+    self.paramtabview.tab(tab3).grid_rowconfigure(0, weight=1)
+    
     self.static_param_frame = spv.StaticParameterView(self.paramtabview.tab(tab1), option_manager=self.option_manager)
     self.static_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
     self.static_param_frame.grid_columnconfigure(0, weight=1)
@@ -36,6 +42,11 @@ def create_tab(self, tab):
     self.calib_param_frame.grid_columnconfigure(0, weight=1)
     self.calib_param_frame.grid_rowconfigure(0, weight=1)
     
+    self.optimal_param_frame = opv.OptimalParameterView(self.paramtabview.tab(tab3), option_manager=self.option_manager)
+    self.optimal_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
+    self.optimal_param_frame.grid_columnconfigure(0, weight=1)
+    self.optimal_param_frame.grid_rowconfigure(0, weight=1)
+    
     self.steps_frame = sv.StepView(tab, label_text="Group Editor", option_manager=self.option_manager)
     self.steps_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
     self.steps_frame.grid_columnconfigure(0, weight=1)

{mg-pso-gui-0.1.36 → mg-pso-gui-0.1.87}/mgpsogui/gui/SetupTab/StepView.py

@@ -64,6 +64,7 @@ class StepView(CTkScrollableFrame):
         self.containerFrame.grid_columnconfigure((0, 1), weight=1)
 
         self.steps = self.option_manager.get_steps()
+        self.mode = self.option_manager.get_arguments()['mode'].get()
 
         for step in self.steps:
 
@@ -88,10 +89,11 @@ class StepView(CTkScrollableFrame):
             
             CTkEntry(self.containerFrame, textvariable=step['name'], width=500).grid(row=row, column=0, padx=(20, 20), pady=(20, 20), sticky="nsw")
             #CTkLabel(self.containerFrame, textvariable=step['message']).grid(row=row, column=1, padx=(20, 20), pady=(20, 20), sticky="nsew")
-            CTkButton(button_container, width=30, text=None, image=expand_image if not step['open'] else collapse_image, command=expand_func).grid(row=0, column=0, padx=(10, 10), pady=(10, 10), sticky="nsew")
-            CTkButton(button_container, width=30, text=None, image=up_image, state="disabled" if index==0 else "normal", fg_color="gray" if index==0 else None, command=up_func).grid(row=0, column=1, padx=(10, 10), pady=(10, 10), sticky="nsew")
-            CTkButton(button_container, width=30, text=None, image=down_image, state="disabled" if index==(len(self.steps)-1) else "normal", fg_color="gray" if index==(len(self.steps)-1) else None, command=down_func).grid(row=0, column=2, padx=(10, 10), pady=(10, 10), sticky="nsew")
-            CTkButton(button_container, width=30, text=None, image=trash_image, command=remove_func).grid(row=0, column=3, padx=(10, 10), pady=(10, 10), sticky="nsew")
+            if (self.mode == "PSO"):
+                CTkButton(button_container, width=30, text=None, image=expand_image if not step['open'] else collapse_image, command=expand_func).grid(row=0, column=0, padx=(10, 10), pady=(10, 10), sticky="nsew")
+                CTkButton(button_container, width=30, text=None, image=up_image, state="disabled" if index==0 else "normal", fg_color="gray" if index==0 else None, command=up_func).grid(row=0, column=1, padx=(10, 10), pady=(10, 10), sticky="nsew")
+                CTkButton(button_container, width=30, text=None, image=down_image, state="disabled" if index==(len(self.steps)-1) else "normal", fg_color="gray" if index==(len(self.steps)-1) else None, command=down_func).grid(row=0, column=2, padx=(10, 10), pady=(10, 10), sticky="nsew")
+                CTkButton(button_container, width=30, text=None, image=trash_image, command=remove_func).grid(row=0, column=3, padx=(10, 10), pady=(10, 10), sticky="nsew")
 
             row += 1
 
@@ -112,7 +114,12 @@ class StepView(CTkScrollableFrame):
                 
             row += 1
             index += 1
+            
+            if (self.mode != "PSO"):
+                break
 
         # Create an "Add step button that is centered
-        CTkButton(self.containerFrame, text="Add Group", command=self.create_new_step).grid(
-            row=row, columnspan=2, column=0, padx=(10, 10), pady=(10, 10), sticky="ew")
+        
+        if (self.mode == "PSO" or len(self.steps) == 0):
+            CTkButton(self.containerFrame, text="Add Group", command=self.create_new_step).grid(
+                row=row, columnspan=2, column=0, padx=(10, 10), pady=(10, 10), sticky="ew")

mg-pso-gui-0.1.87/mgpsogui/gui/VisualizeTab/SideBar.py

@@ -0,0 +1,262 @@
+from customtkinter import CTkScrollableFrame
+from customtkinter import CTkFrame
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+from customtkinter import CTkTextbox
+from customtkinter import CTkImage
+from customtkinter import CTkOptionMenu
+from PIL import Image
+import os
+
+import pandas as pd
+
+class SideBar(CTkScrollableFrame):
+    def __init__(self, *args,
+                 option_manager: None,
+                 home_page: None,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.option_manager = option_manager
+        self.home_page = home_page
+        
+        self.render()
+
+    def clear(self):
+        self.containerFrame.destroy()
+
+    def refresh(self):
+        self.clear()
+        self.render()
+
+    def render(self):
+
+        self.containerFrame = CTkFrame(self, width=300, fg_color="transparent")
+        self.containerFrame.grid(row=0, column=0, padx=(
+            0, 0), pady=(0, 0), sticky="ew")
+        self.containerFrame.grid_columnconfigure(0, weight=1)
+        
+        selected_graph = self.home_page.graph_selector_value.get()
+        
+        if (selected_graph == "Best Cost Stacked"):
+            #self.graph_label = CTkLabel(self.containerFrame, text="Best Cost Stacked")
+            #self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            pass
+        elif (selected_graph == "Best Cost by Round"):
+            #self.graph_label = CTkLabel(self.containerFrame, text="Best Cost by Round")
+            #self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            pass
+        elif (selected_graph == "Iteration Table"):
+            #self.graph_label = CTkLabel(self.containerFrame, text="Iteration Table")
+            #self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            pass
+        elif (selected_graph == "Calibrated Parameters"):
+            #self.graph_label = CTkLabel(self.containerFrame, text="Calibrated Parameters")
+            #self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            pass
+        elif (selected_graph == "Custom 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])
+            
+            file_label = CTkLabel(self.containerFrame, text="CSV File:")
+            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")
+            
+            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 = self.load_special_csv(path_map[selected_file])
+                print(self.home_page.csv_data)
+                self.home_page.open_file = selected_file
+                
+            if (self.home_page.csv_data is not None):
+                # Get all column names of CSV
+                columns = self.home_page.csv_data["data"].columns
+                
+                x_axis_label = CTkLabel(self.containerFrame, text="X Axis:")
+                x_axis_label.grid(row=2, 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=3, 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=4, 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=5, 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=6, 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=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 = self.load_special_csv(path_map[selected_file])
+                print(self.home_page.csv_data)
+                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 = self.load_special_csv(path_map[selected_file2])
+                print(self.home_page.csv_data2)
+                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["data"].columns
+                columns2 = self.home_page.csv_data2["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=columns2, 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 columns2):
+                    self.home_page.csv_y2_selector.set(columns2[2])
+                    
+                    
+
+    def load_special_csv(self, file_path):
+        file_metadata = {}
+        data_metadata = {}
+        mode = "file_metadata"
+        columns = []
+        data_lines = []
+        
+        with open(file_path, "r") as file:
+            lines = file.readlines()
+            
+            if (not lines[0].startswith("@")):
+                return {
+                    "file_attributes": {},
+                    "data_attributes": {},
+                    "data": pd.read_csv(file_path)
+                }
+            
+            for line in lines:
+                if (line.startswith("@H,")):
+                    mode = "data_metadata"
+                    columns = line.strip().rstrip(",").split(",")[1:]
+                    continue
+                elif (line.startswith("@T,")):
+                    mode = "file_metadata"
+                    continue
+                elif (line.startswith(",") and mode == "data_metadata"):
+                    mode = "file_data"
+                    
+                if (mode == "file_metadata"):
+                    try:
+                        key, value = line.strip().rstrip(",").split(",")
+                        file_metadata[key] = value
+                    except:
+                        pass
+                    
+                elif (mode == "data_metadata"):
+                    try:
+                        values = line.strip().rstrip(",").split(",")
+                        key = values[0]
+                        values = values[1:]
+                        if len(values) == len(columns):
+                            data_metadata[key] = {}
+                            for i in range(len(columns)):
+                                data_metadata[key][columns[i]] = values[i]
+                    except:
+                        pass
+                    
+                elif (mode == "file_data"):
+                    try:
+                        values = line.strip().rstrip(",").split(",")[1:]
+                        if len(values) == len(columns):
+                            data_lines.append(values)
+                    except:
+                        pass
+                        
+        return {
+            "file_attributes": file_metadata,
+            "data_attributes": data_metadata,
+            "data": pd.DataFrame(data_lines, columns=columns)
+        }

{mg-pso-gui-0.1.36 → mg-pso-gui-0.1.87}/mgpsogui/gui/VisualizeTab/VisualizeTab.py

@@ -61,11 +61,11 @@ 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
-    self.vis_sidebar = SideBar.SideBar(self.graph_sidebar, option_manager=self.option_manager, home_page=self, fg_color="transparent", bg_color="transparent")
+    self.vis_sidebar = SideBar.SideBar(self.graph_sidebar, option_manager=self.option_manager, home_page=self, fg_color="transparent")
     self.vis_sidebar.grid(row=1, column=0, rowspan=8, padx=(0, 0), pady=(0, 0), sticky="nsew")
     
     # Add a button to call open_graph_in_browser

{mg-pso-gui-0.1.36 → mg-pso-gui-0.1.87}/mgpsogui/util/GraphGenerator.py

@@ -5,6 +5,7 @@ import numpy as np
 import os
 from PIL import Image, ImageTk
 import customtkinter
+import traceback
 
 def generate_graphs(HomePage):
     try:
@@ -26,6 +27,12 @@ def generate_graphs(HomePage):
         elif (selected_graph == "Calibrated Parameters"):
             HomePage.selected_graph_name = "calibrated_params_by_round"
             calibrated_params_by_round(HomePage.running_config['steps'], HomePage.calibration_data, HomePage.option_manager)
+        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")
         
@@ -36,7 +43,10 @@ def generate_graphs(HomePage):
         HomePage.graph_image = customtkinter.CTkImage(HomePage.graph_image_obj, size=(HomePage.image_width * HomePage.image_scale, HomePage.image_height * HomePage.image_scale))
         HomePage.graph_label.configure(image=HomePage.graph_image)
     except Exception as e:
-        pass
+        print(f"An exception occurred in Graph Generator: {str(e)}")
+        print(f"Exception type: {type(e).__name__}")
+        print("Traceback:")
+        traceback.print_exc()
 
 def best_cost_stacked(config, dataframe, option_manager):
     fig = go.Figure()
@@ -272,4 +282,157 @@ def calibrated_params_by_round(config, list_of_objs, option_manager):
     with open(os.path.join(folder, "calibrated_params_by_round.html"), "w") as f:
         f.write(html)
 
+    return fig
+
+def custom_csv(homepage, option_manager):
+    fig = go.Figure()
+
+    data = homepage.csv_data["data"]
+
+    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')
+    elif x == "date":
+        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce')
+    else:
+        xx = pd.to_numeric(data[x], errors="coerce")
+        
+    yy = pd.to_numeric(data[val], errors="coerce")
+    
+    yy_unit = "-"
+    if "Unit" in homepage.csv_data["data_attributes"]:
+        yy_unit = homepage.csv_data["data_attributes"]["Unit"][val]
+    
+    yy2 = pd.to_numeric(data[val2], errors="coerce")
+    
+    yy2_unit = "-"
+    if "Unit" in homepage.csv_data["data_attributes"]:
+        yy2_unit = homepage.csv_data["data_attributes"]["Unit"][val2]
+
+    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, "custom_csv.png"), width=1280, height=720)
+    fig.write_html(os.path.join(folder, "custom_csv.html"), include_plotlyjs='cdn', auto_open=False)
+    with open(os.path.join(folder, "custom_csv.html"), "r") as f:
+        html = f.read()
+        html = html.replace("<body>", "<body bgcolor='#2a2a2a'>")
+    with open(os.path.join(folder, "custom_csv.html"), "w") as f:
+        f.write(html)
+
+    return fig
+
+def compare_csv(homepage, option_manager):
+    fig = go.Figure()
+
+    data = homepage.csv_data["data"]
+    data2 = homepage.csv_data2["data"]
+
+    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')
+    elif x == "date":
+        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce')
+    else:
+        xx = pd.to_numeric(data[x], errors="coerce")
+        
+    yy = pd.to_numeric(data[val], errors="coerce")
+    
+    xx2 = None
+    if x == "time":
+        xx2 = pd.to_datetime(data2["time"], format='%Y-%m-%d', errors='coerce')
+    elif x == "date":
+        xx2 = pd.to_datetime(data2["date"], format='%d-%m-%Y', errors='coerce')
+    else:
+        xx2 = pd.to_numeric(data2[x], errors="coerce")
+    
+    yy_unit = "-"
+    if "Unit" in homepage.csv_data["data_attributes"]:
+        yy_unit = homepage.csv_data["data_attributes"]["Unit"][val]
+    
+    yy2 = pd.to_numeric(data[val2], errors="coerce")
+    
+    yy2_unit = "-"
+    if "Unit" in homepage.csv_data["data_attributes"]:
+        yy2_unit = homepage.csv_data["data_attributes"]["Unit"][val2]
+
+    fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
+    fig.add_trace(go.Scatter(x=xx2, 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.36 → mg-pso-gui-0.1.87}/mgpsogui/util/PSORunner.py

@@ -88,55 +88,19 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
                 'http_conn_timeout': int(calibration_map['conn_timeout']),
                 'http_read_timeout': int(calibration_map['read_timeout']),
                 'particles_fail': int(calibration_map['particles_fail'])
+                #,'step_trace': os.path.join(folder, 'trace.json')
                 },
             result_queue = cosu_queue
         )
     
+    results_queue.put(trace)
+    print(trace)
+    
+    print("Finishing up...")
+    time.sleep(5)
     
     stdour_thread.join()
     stderr_thread.join()
     
     sys.stdout = old_stdout
-    sys.stderr = old_stderr
-    results_queue.put((optimizer, trace))
-
-def get_results():
-    request: Client = Client()
-    for name, value in parameters.items():
-        # if parameter name has a / in it assume that is a file based parameter and therefore value needs to be an array
-        if "/" in name and type(value) is not list:
-            request.add_data(name, [value])
-        else:
-            request.add_data(name, value)
-
-    conf = {
-        'service_timeout': 60.0 # (sec)
-    }
-    files: List[str] = [] #optional list of filenames
-
-    #Synchronous Call
-    result: Client = request.execute(CSIP_ENDPOINT, files=files, sync=True, conf=conf)
-
-    #Asynchronous Call
-    tsamp: float = 0
-    def callback(c: Client, progress: str):
-        tsamp2: float = time.time()
-        print('Halton Update {} - {} - {}'.format(halton_id, c.get_status(), tsamp2 - tsamp))
-
-
-    tsamp = time.time()
-    result: Client = request.execute_async(
-        CSIP_ENDPOINT,
-        files=files,
-        callback=callback,
-        first_poll=poll_time,
-        next_poll=poll_time,
-        conf=conf
-    )
-    # After recieving response
-    if result.is_finished():
-        print(result)
-    else:
-        print(result)
-
-
+    sys.stderr = old_stderr

{mg-pso-gui-0.1.36 → mg-pso-gui-0.1.87}/mgpsogui/util/recosu/pso/pso.py

@@ -168,7 +168,7 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
     step_trace['min_rounds'] = min_rounds
     step_trace['max_rounds'] = max_rounds
     step_trace['iters'] = iters
-    step_trace['ftol'] = ftol
+    #step_trace['ftol'] = ftol BUG DOES NOT HANDLE -INF
     step_trace['ftol_iter'] = ftol_iter
     step_trace['rtol'] = rtol
     step_trace['rtol_iter'] = rtol_iter
@@ -176,7 +176,7 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
     step_trace['n_particles'] = n_particles
     step_trace['n_steps'] = len(steps)
     step_trace['steps'] = copy.deepcopy(steps)
-    step_trace['args'] = args
+    #step_trace['args'] = args BUG MUST BE REMOVED
 
     if step_file is not None:
         with open(step_file, "w") as fo:
@@ -336,4 +336,7 @@ def global_best(steps: Dict, rounds: Tuple, args: Dict, n_particles: int, iters:
         with open(step_file, "w") as fo:
             json.dump(step_trace, fo)
 
+    result_queue.put("Step Trace")
+    result_queue.put(step_trace)
+
     return optimizer, step_trace

{mg-pso-gui-0.1.36 → mg-pso-gui-0.1.87}/setup.py

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

mg-pso-gui-0.1.36/mgpsogui/gui/VisualizeTab/SideBar.py

@@ -1,83 +0,0 @@
-from customtkinter import CTkScrollableFrame
-from customtkinter import CTkFrame
-from customtkinter import CTkLabel
-from customtkinter import CTkButton
-from customtkinter import CTkEntry
-from customtkinter import CTkTextbox
-from customtkinter import CTkImage
-from customtkinter import CTkOptionMenu
-from PIL import Image
-import os
-
-class SideBar(CTkScrollableFrame):
-    def __init__(self, *args,
-                 option_manager: None,
-                 home_page: None,
-                 **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self.option_manager = option_manager
-        self.home_page = home_page
-        
-        self.render()
-
-    def clear(self):
-        self.containerFrame.destroy()
-
-    def refresh(self):
-        self.clear()
-        self.render()
-
-    def render(self):
-
-        self.containerFrame = CTkFrame(self, fg_color="transparent", bg_color="transparent")
-        self.containerFrame.grid(row=0, column=0, padx=(
-            0, 0), pady=(0, 0), width=300, sticky="nsew")
-        self.containerFrame.grid_columnconfigure(0, weight=1)
-        
-        selected_graph = self.home_page.graph_selector_value.get()
-        
-        if (selected_graph == "Best Cost Stacked"):
-            self.graph_label = CTkLabel(self.containerFrame, text="Best Cost Stacked")
-            self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
-            pass
-        elif (selected_graph == "Best Cost by Round"):
-            self.graph_label = CTkLabel(self.containerFrame, text="Best Cost by Round")
-            self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
-            pass
-        elif (selected_graph == "Iteration Table"):
-            self.graph_label = CTkLabel(self.containerFrame, text="Iteration Table")
-            self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
-            pass
-        elif (selected_graph == "Calibrated Parameters"):
-            self.graph_label = CTkLabel(self.containerFrame, text="Calibrated Parameters")
-            self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
-        elif (selected_graph == "Custom 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_list = []
-            name_list = []
-            for root, dirs, files in os.walk(folder):
-                for file in files:
-                    if file.endswith(".csv"):
-                        path_list.append(os.path.join(root, file))
-                        name_list.append(file.replace(".csv", ""))
-            
-            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])
-            
-            print("PATH LIST")
-            print(path_list)
-            print("NAME LIST")
-            print(name_list)
-            
-            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=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")