mg-pso-gui 0.1.229__tar.gz → 0.1.231__tar.gz

{mg_pso_gui-0.1.229 → mg_pso_gui-0.1.231}/PKG-INFO

@@ -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 → mg_pso_gui-0.1.231}/mg_pso_gui.egg-info/PKG-INFO

@@ -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 → mg_pso_gui-0.1.231}/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()
 

{mg_pso_gui-0.1.229 → mg_pso_gui-0.1.231}/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()
 

{mg_pso_gui-0.1.229 → mg_pso_gui-0.1.231}/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)

{mg_pso_gui-0.1.229 → mg_pso_gui-0.1.231}/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))

{mg_pso_gui-0.1.229 → mg_pso_gui-0.1.231}/setup.py

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