mg-pso-gui 0.2.63__tar.gz → 0.2.64__tar.gz

{mg_pso_gui-0.2.63 → mg_pso_gui-0.2.64}/PKG-INFO

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

{mg_pso_gui-0.2.63 → mg_pso_gui-0.2.64}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.2.63 → mg_pso_gui-0.2.64}/mgpsogui/gui/SetupTab/BoundsList.py

@@ -13,6 +13,7 @@ import json
 import PIL
 from PIL import Image
 import os
+import pandas as pd
 
 class BoundsList(CTkFrame):
     def __init__(self, *args,
@@ -21,20 +22,8 @@ class BoundsList(CTkFrame):
                  **kwargs):
         super().__init__(*args, **kwargs)
         
-        self.optParams = []
         self.option_manager = option_manager
 
-        details = self.option_manager.serialize_data(self.option_manager.get("service_request_data"))
-        self.paramMap = {}
-        if "parameter" in details:
-            for param in details["parameter"]:
-                self.paramMap[param["name"]] = param
-                if "min" in param:
-                    self.optParams.append(param["name"])
-                    
-            self.optParams.sort()
-        
-
         self.edit_mode = False
         self.tooltip_list = []
         
@@ -64,6 +53,30 @@ class BoundsList(CTkFrame):
         self.tooltip_list = []
 
         mode = self.option_manager.get_mode()
+
+        # Load bound parameters depending on the mode
+        self.optParams = []
+        if mode == "Optimization" or mode == "Sampling: Halton" or mode == "Sampling: Random":
+            details = self.option_manager.serialize_data(self.option_manager.get("service_request_data"))
+            self.paramMap = {}
+            if "parameter" in details:
+                for param in details["parameter"]:
+                    self.paramMap[param["name"]] = param
+                    if "min" in param:
+                        self.optParams.append(param["name"])
+                        
+                self.optParams.sort()
+        elif mode == "Sensitivity Analysis":
+            file_path = self.option_manager.get("sensitivity_analysis_path").get()
+            if os.path.exists(file_path):
+                try:
+                    df = pd.read_csv(file_path)
+                    self.optParams = df.columns.tolist()
+                except Exception as e:
+                    print(f"Error loading CSV file: {e}")
+            else:
+                print(f"File does not exist: {file_path}")
+
         
         self.containerFrame = CTkFrame(self, fg_color="transparent")
         self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
@@ -137,26 +150,34 @@ class BoundsList(CTkFrame):
                 self.validate_number(bounds_max.get(), cc, bounds_max)
                 tt2 = ctt(bounds_max, delay=0.1, alpha=0.95, message="...")
                 
-                if mode == "Sampling: Random" or mode == "Sampling: Halton":
-                    row += 1
-                    index += 1
-                    continue
-
-                default_value = CTkEntry(self.containerFrame)
-                default_value.grid(row=row, column=4, padx=(5, 5), pady=(5, 5), sticky="new")
-                default_value.configure(textvariable=bound["default_value"])
-            
-                
                 if (bound_type == "list"):
                     def button_click_event(bound_index):
                         BEW(title="Edit List Bound", step_index=self.step_index, bound_index=bound_index, option_manager=self.option_manager)
-                        #print("Number:", dialog.get_input())
 
                     open_window = lambda event=None, bound_index=index: (button_click_event(bound_index))
                     expand_image = CTkImage(Image.open(os.path.join("./images", "expand.png")), size=(20, 20))
                     button = CTkButton(self.containerFrame, width=30, text=None, image=expand_image, command=open_window)
                     button.grid(row=row, column=6, padx=(5, 5), pady=(5, 5), sticky="new")
                 
+                if mode == "Sampling: Random" or mode == "Sampling: Halton":
+                    
+                    tt1 = ctt(bounds_min, delay=0.1, alpha=0.95, message="...")
+                    tt2 = ctt(bounds_max, delay=0.1, alpha=0.95, message="...")
+                    if cc is not None:
+                        tt3 = ctt(cc, delay=0.1, alpha=0.95, message="...")
+                            
+                    self.tooltip_list.append([tt3, tt1, tt2])
+                            
+                    self.update_tooltips(index)
+
+                    row += 1
+                    index += 1
+                    continue
+
+                default_value = CTkEntry(self.containerFrame)
+                default_value.grid(row=row, column=4, padx=(5, 5), pady=(5, 5), sticky="new")
+                default_value.configure(textvariable=bound["default_value"])
+
                 calibration_strat = CTkOptionMenu(self.containerFrame, dynamic_resizing=False, values=['none', 'mean', 'single'], variable=bound["calibration_strategy"])
                 calibration_strat.grid(row=row, column=5, padx=(5, 5), pady=(5, 5), sticky="new")
                 

{mg_pso_gui-0.2.63 → mg_pso_gui-0.2.64}/mgpsogui/gui/SetupTab/StepView.py

@@ -105,7 +105,7 @@ class StepView(CTkScrollableFrame):
             self.logo_label = CTkLabel(self.file_selector_frame, text="Select File:")
             self.logo_label.grid(row=0, column=0, padx=(10, 10), pady=header_padding_y)
             
-            self.file_selector = CTkOptionMenu(self.file_selector_frame, values=files, width=50, variable=self.option_manager.get("sensitivity_analysis_path"))
+            self.file_selector = CTkOptionMenu(self.file_selector_frame, values=files, width=50, variable=self.option_manager.get("sensitivity_analysis_path"), command=self.refresh)
             self.file_selector.grid(row=0, column=1, padx=(10, 10), pady=header_padding_y)
 
             row += 1

{mg_pso_gui-0.2.63 → mg_pso_gui-0.2.64}/mgpsogui/util/PSORunner.py

@@ -237,8 +237,7 @@ def run_sampling(data, mode, folder, results_queue):
         if os.path.exists(trace_file):
             shutil.copyfile(trace_file, trace_file + ".bak")
         
-
-    config['step_trace'] = os.path.join(folder, 'pso_step_trace.json') # Do we need this?
+    #config['step_trace'] = os.path.join(folder, 'pso_step_trace.json') # Do we need this?
 
     print("Parsing Parameters...\n", flush=True)
     print("steps: ", flush=True)

{mg_pso_gui-0.2.63 → mg_pso_gui-0.2.64}/setup.py

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