mg-pso-gui 0.1.229__py3-none-any.whl → 0.1.231__py3-none-any.whl

{mg_pso_gui-0.1.229.dist-info → mg_pso_gui-0.1.231.dist-info}/METADATA

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

{mg_pso_gui-0.1.229.dist-info → mg_pso_gui-0.1.231.dist-info}/RECORD

@@ -2,7 +2,7 @@ mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
 mgpsogui/gui/HomePage.py,sha256=L2Vj2B6BzdXvoi6CkLWgxvtrzRMPJlF2sfbB8VpCVyc,22925
-mgpsogui/gui/OptionManager.py,sha256=zg1-0mwNLLM_iDAfp5PKlaO6lq2SfdQmZK6qHNfd7Eg,16426
+mgpsogui/gui/OptionManager.py,sha256=sC1vjeQEZzy7fGDkLLqnApf3SjVlvz1WoCFbFhZEf5c,16404
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=q8x_tvVgSoyGINuQbivXRThF3gaSSfg8X_dsLSPv4F0,10492
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,14 +12,14 @@ mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=U64oaiDIOaimjbqKMz5rQNq2o1SrQ
 mgpsogui/gui/SetupTab/BoundsList.py,sha256=L77UEaUJNiUE-ZsYIl44tWRb1zBfxaEQ-bAG1V5_IH0,12268
 mgpsogui/gui/SetupTab/CalibrationParametersView.py,sha256=ppVBHG3nphku9-P6Z8az-HTpgk8vHxnj-A5m80BZTgA,2784
 mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py,sha256=yx0dHSNa7fGy99Q6qFcI6j9r8p0DlV3iOBgyPMGd8pM,2884
-mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=QeMj8GA7TLDVfMmpFUgEl1YA39qEOECNlfJX5a03uig,5786
+mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=hAVZSJMgHEQYrFsgUUnil17pWMFDA26Scio5DAlfdzE,5899
 mgpsogui/gui/SetupTab/FunctionsList.py,sha256=cMBv87GeRACiJ1DPxFrPvZJOZ3fK6FUVAeUaQCR9dn0,6375
 mgpsogui/gui/SetupTab/ListEditor.py,sha256=vlP0KDPu8J1_6KXuUTlE7OClgfF0Qk6cISsFm_SglUw,3232
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=wYcDcaooYkw-y7XW6dJUwhTWxLuUUOK5tGUFVHBf3ck,7352
 mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=VKn-4BlVyqspFIOkbWsM0q9pYVsmqnSND0xP2hDKb60,1785
-mgpsogui/gui/SetupTab/SetupTab.py,sha256=_cehQwQhDbX92da_AwqYQ2mQo7sFDGkN1IsYQmctK5o,2776
+mgpsogui/gui/SetupTab/SetupTab.py,sha256=NmCPb9tGVJmUy1HG3G26y5RibtVZNeN9XFyomVnageQ,2792
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
-mgpsogui/gui/SetupTab/StepView.py,sha256=C6DDinU9AgaUM1EOAHetFI4bE89ANJ247F0doksaPus,9091
+mgpsogui/gui/SetupTab/StepView.py,sha256=tsqiuIfzBBZVyRtzlRAjQsoFVwPBAqb63IxBq1KgltY,10380
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=JPQmfljdddIwHtTKpFqUdk7hRzVdX-IKl4neOk3DsjM,3132
 mgpsogui/gui/VisualizeTab/SideBar.py,sha256=MtZfDScNFN0fQ8DyPm6bZGJSrFRgT14fZeUq-qc61O8,21936
@@ -62,8 +62,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.1.229.dist-info/METADATA,sha256=Wx2I6xwm0NQoNMfkV6d6mDPiggoC17scM-oLJGXY5YI,9456
-mg_pso_gui-0.1.229.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-mg_pso_gui-0.1.229.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.229.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.229.dist-info/RECORD,,
+mg_pso_gui-0.1.231.dist-info/METADATA,sha256=PPzCs6yYmxvEWHYMwWsCBTE3um0_-SNN5t-526ogkQ8,9456
+mg_pso_gui-0.1.231.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mg_pso_gui-0.1.231.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.231.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.231.dist-info/RECORD,,

mgpsogui/gui/OptionManager.py

@@ -22,7 +22,7 @@ class OptionManager():
         self.steps = []
         self.service_parameters = {}
 
-        self.service_modes = ["Optimization: MG-PSO", "Sampling: Halton", "Sampling: Random", "Sensitivity: Halton", "Sensitivity: Random"]
+        self.service_modes = ["Sampling: Halton", "Sampling: Random", "Sensitivity Analysis", "Optimization: MG-PSO"]
         for mode in self.service_modes:
             self.arguments["urls"][mode] = sv()
 

mgpsogui/gui/SetupTab/CustomFunctionMetrics.py

@@ -69,15 +69,18 @@ class CustomFunctionsMetricsView(CTkScrollableFrame):
         equation = self.option_manager.get_steps()[self.step_index]["objfunc"][self.functions_index]["custom_function"].get()
         
         # Example equation (0 * (1 - ns)) + (bias * 0) + (pbias * 0) + (absdiff * 0)
-        if equation != "":
-            equation = equation.replace("1 - ", "")
-            equation = equation.replace("(", "")
-            equation = equation.replace(")", "")
-            equation = equation.replace(" ", "")
-            pairs = equation.split("+")
-            for pair in pairs:
-                key, value = pair.split("*")
-                self.add_key(key, value)
+        try:
+            if equation != "":
+                equation = equation.replace("1 - ", "")
+                equation = equation.replace("(", "")
+                equation = equation.replace(")", "")
+                equation = equation.replace(" ", "")
+                pairs = equation.split("+")
+                for pair in pairs:
+                    key, value = pair.split("*")
+                    self.add_key(key, value)
+        except Exception as e:
+            self.key_values = []
 
         self.render()
 

mgpsogui/gui/SetupTab/SetupTab.py

@@ -58,7 +58,7 @@ def create_tab(self, tab):
     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 = sv.StepView(tab, label_text="Group Editor", option_manager=self.option_manager, home_page=self)
     self.steps_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
     self.steps_frame.grid_columnconfigure(0, weight=1)
     self.steps_frame.grid_rowconfigure(0, weight=1)

mgpsogui/gui/SetupTab/StepView.py

@@ -5,6 +5,7 @@ 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
 
@@ -16,6 +17,7 @@ from . import ListEditor
 class StepView(CTkScrollableFrame):
     def __init__(self, *args,
                  option_manager: None,
+                 home_page: None,
                  **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -77,6 +79,33 @@ class StepView(CTkScrollableFrame):
         self.steps = self.option_manager.get_steps()
         self.mode = self.option_manager.get_arguments()['mode'].get()
 
+        if (self.mode == "Sensitivity Analysis"):
+            info = self.option_manager.get_project_data()
+            folder = os.path.join(info['path'], info['name'], "results")
+            
+            # File all CSV files in folder and put them into list with strings as path
+            files = []
+            if os.path.exists(folder):
+                files = [f for f in os.listdir(folder) if f.endswith('.csv')]
+
+            if len(files) == 0:
+                files = ["No CSV files found! Run sampling first"]
+
+            header_padding_x = (5, 5)
+            header_padding_y = (10, 10)
+
+            self.file_selector_frame = CTkFrame(self.containerFrame, width=140, corner_radius=0)
+            self.file_selector_frame.grid(row=0, column=0, sticky="nsew")
+            self.logo_label = CTkLabel(self.file_selector_frame, text="Select File:")
+            self.logo_label.grid(row=0, column=0, padx=(20, 10), pady=header_padding_y)
+            
+            self.file_selector = CTkOptionMenu(self.file_selector_frame, values=files, width=50)
+            self.file_selector.grid(row=0, column=1, padx=(5, 80), pady=header_padding_y)
+            self.file_selector.set(files[0])
+
+            row += 1
+
+
         for step in self.steps:
 
             up_image = CTkImage(Image.open(os.path.join("./images", "up.png")), size=(20, 20))