mg-pso-gui 0.2.62__py3-none-any.whl → 0.2.64__py3-none-any.whl

{mg_pso_gui-0.2.62.dist-info → mg_pso_gui-0.2.64.dist-info}/METADATA

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

{mg_pso_gui-0.2.62.dist-info → mg_pso_gui-0.2.64.dist-info}/RECORD

@@ -13,7 +13,7 @@ mgpsogui/gui/RunTab/OptimalParameterView.py,sha256=nliUEWA840cPBQt7wjiZ-L7uBOp_o
 mgpsogui/gui/RunTab/RunTab.py,sha256=47_r8K-e7f8zs93_2iPYnNBzHDHZejtedk7iSElkubU,5608
 mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=U64oaiDIOaimjbqKMz5rQNq2o1SrQtrRHDdTYQ9ux1s,2870
-mgpsogui/gui/SetupTab/BoundsList.py,sha256=7MCAiiPmhkcPQwDNMws12DezkwQhFc9WI54B7tE4wyk,12859
+mgpsogui/gui/SetupTab/BoundsList.py,sha256=D-wvphmYznjvdTotXtjIBi2tlvvghMJH6oCsLk20pH8,13900
 mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py,sha256=yx0dHSNa7fGy99Q6qFcI6j9r8p0DlV3iOBgyPMGd8pM,2884
 mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=vOJpElbTgz043m6JYwe9xz_2MBHg985S6KdbJkJERW4,5923
 mgpsogui/gui/SetupTab/FunctionsList.py,sha256=ntbIUs8q2Tm3KfBLleT7uL0gynwYuVycwvXv8vude3c,6611
@@ -22,7 +22,7 @@ mgpsogui/gui/SetupTab/ListParametersView.py,sha256=mkGaC5cXhEOy5oD0MbTyK9z7VGZp0
 mgpsogui/gui/SetupTab/OverrideParameterMetrics.py,sha256=rBfaSitYDOajbHvyi2TfoXAHYlz1cCt028UVpIJ_Dc0,3369
 mgpsogui/gui/SetupTab/OverrideParameterWindow.py,sha256=UpZDxTaFxee0BeviUYXeiIlMNYNy00qz3zlMlM5VcXE,1291
 mgpsogui/gui/SetupTab/SetupTab.py,sha256=3V8LYvg5ulTll1hhguB_XpSoOR-w72vHh_Z3gw3nCxc,2758
-mgpsogui/gui/SetupTab/StepView.py,sha256=e3QhepeAfDJdhefsJvzyppRuMdVAFKEnbZLtrFIczU4,8936
+mgpsogui/gui/SetupTab/StepView.py,sha256=SfkEu8rOTtuqxPTOt19ECjSwgUA2h5S18HAJKCbjPjg,9011
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=Gzyl2hRgjIfO5n0bCZZoXp_vOFvfsJPaGXDUMeRQg10,3171
 mgpsogui/gui/VisualizeTab/SideBar.py,sha256=wPjzA8ZZsCTxBKN0_6-_ABtU5BeHqytNAWfKCWAPoe8,22106
@@ -44,7 +44,7 @@ mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
 mgpsogui/util/GraphGenerator.py,sha256=dKzDPMK-0S6j1yIp5xoQIgN9GTKMhGpboAXjofCpmIk,31973
-mgpsogui/util/PSORunner.py,sha256=zjOAKH7PBbNVT0imwGDIPJxwPD54eFuDjfIUaNeWcbY,22033
+mgpsogui/util/PSORunner.py,sha256=tTe2sF9MRk48dpsNwSn_CbSSNq1laXWMxSZFh_v5FIQ,23115
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
 mgpsogui/util/helpers.py,sha256=Ht2rge_4pGO7halz6KoLsL2eukB0k2tlkx68lBBmBA8,2669
@@ -69,8 +69,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 mgpsogui/util/recosu/utils/utils.py,sha256=QB8vftq3142ekG0ORjz0ZBHU5YknXbR0oTsrxrPAsF0,3951
 mgpsogui/util/recosu/utils/plot/__init__.py,sha256=h1KjM7_tNDv351pcwt8A6Ibb1jhwWyx5Gbu-zj-sI3Q,71
 mgpsogui/util/recosu/utils/plot/cost_steps.py,sha256=1Ce11AJyweWkmvjXPxEygzS-h8yVLmQEDLS53yjPLqQ,3779
-mg_pso_gui-0.2.62.dist-info/METADATA,sha256=-IyPo9J96xnIAJbA0K3bDomX0N8V_mwGbT2okuOhBt0,9455
-mg_pso_gui-0.2.62.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mg_pso_gui-0.2.62.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.62.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.62.dist-info/RECORD,,
+mg_pso_gui-0.2.64.dist-info/METADATA,sha256=gxlo1HwwHekjaSxRYDCxFgI_kTvIpAoW4VfudqfOryY,9455
+mg_pso_gui-0.2.64.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mg_pso_gui-0.2.64.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.64.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.64.dist-info/RECORD,,

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")
                 

mgpsogui/gui/SetupTab/StepView.py

@@ -85,6 +85,7 @@ class StepView(CTkScrollableFrame):
 
         if (self.mode == "Sensitivity Analysis"):
             folder = self.option_manager.get_project_folder()
+            folder = os.path.join(folder, "results")
             
             # File all CSV files in folder and put them into list with strings as path
             files = []
@@ -104,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

mgpsogui/util/PSORunner.py

@@ -230,7 +230,14 @@ def run_sampling(data, mode, folder, results_queue):
 
     output_steps = process_steps(data)
 
-    config['step_trace'] = os.path.join(folder, 'pso_step_trace.json')
+    trace_file = os.path.join(folder, 'results', mode + '_trace.csv')
+    file_output_mode = data["sampling_output_mode"]
+    if file_output_mode == "Append":
+        # Backup trace file if it exists
+        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?
 
     print("Parsing Parameters...\n", flush=True)
     print("steps: ", flush=True)
@@ -256,12 +263,34 @@ def run_sampling(data, mode, folder, results_queue):
                         mode, 
                         conf=config, 
                         metainfo=metainfo if len(metainfo) > 0 else None,
-                        trace_file=os.path.join(folder, 'results', mode + '_trace.csv'),
+                        trace_file=trace_file,
                         offset=int(pp('offset', parameter_map)))
     results_queue.put(trace)
     print(trace, flush=True)
     print("\n", flush=True)
 
+    if file_output_mode == "Append" and os.path.exists(trace_file + ".bak"):
+        # Read the backup file
+        with open(trace_file + ".bak", 'r') as f2:
+            backup_lines = f2.readlines()
+        
+        # Read the trace file
+        with open(trace_file, 'r') as f:
+            trace_lines = f.readlines()
+        
+        # Extract headers
+        backup_header = backup_lines[0]
+        trace_header = trace_lines[0]
+        
+        # Combine data ensuring headers are not duplicated
+        with open(trace_file, 'w') as f:
+            f.write(backup_header)
+            f.writelines(backup_lines[1:])
+            f.writelines(trace_lines[1:] if trace_header == backup_header else trace_lines)
+        
+        # Remove the backup file
+        os.remove(trace_file + ".bak")
+
 def run_optimization(data, folder, results_queue):
     """_summary_