mg-pso-gui 0.1.191__py3-none-any.whl → 0.1.193__py3-none-any.whl

{mg_pso_gui-0.1.191.dist-info → mg_pso_gui-0.1.193.dist-info}/METADATA

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

{mg_pso_gui-0.1.191.dist-info → mg_pso_gui-0.1.193.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=S4vm9gtwoWjfbNmFSX5e-_l18ti0YIFulrH9a3v953s,22845
-mgpsogui/gui/OptionManager.py,sha256=FVj3HIDeoPgr8rn1XZs1-erYxwP572kOHHjEGNSda6M,13391
+mgpsogui/gui/OptionManager.py,sha256=CmwUV6FdgBf1DN8EhCVM1IRptCGVlArZFjpgWvHUwpE,14807
 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,13 +12,14 @@ mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=_6_xEl46PY9MmNvpmoMNdNDbVav6O
 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/FunctionsList.py,sha256=tUqW43VWpxFpdo9UHaPvFQ0CtCo9mFI3mri52ikntrE,4092
+mgpsogui/gui/SetupTab/ListEditor.py,sha256=62QQntINnSGxHmT5yX9uJ2k9mI4nDOPxAkHEHTdSrsU,3215
 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/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
-mgpsogui/gui/SetupTab/StepView.py,sha256=DqLoH1qKdlE2uQxX0DMYozl9tSx0SF69ULpHwgQP0es,6635
+mgpsogui/gui/SetupTab/StepView.py,sha256=0WwamCZRSpZlC7EThXr6-IMCQt8ejfyQtsRppAm2v18,9067
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=WqF7gx76EQZz92n3ajYtOAKLFAUwCbWwCEbEmsNih-Y,3314
+mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=JPQmfljdddIwHtTKpFqUdk7hRzVdX-IKl4neOk3DsjM,3132
 mgpsogui/gui/VisualizeTab/SideBar.py,sha256=o-6vdHNZMNsdG7zC-B14hLZXbqNKhT_9q_kYg2ZSUbk,21947
 mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=_SiRDUvYJ7VUmMZ_VzylWP2tFygbLzWeUCGW3TU3yZM,3466
 mgpsogui/gui/VisualizeTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -59,8 +60,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.191.dist-info/METADATA,sha256=EzaUDJ79fsvH0Inc3HggE16kzDDanIkz0wgp7FyAvWY,9456
-mg_pso_gui-0.1.191.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-mg_pso_gui-0.1.191.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.191.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.191.dist-info/RECORD,,
+mg_pso_gui-0.1.193.dist-info/METADATA,sha256=bSrGVk4AsPiIAMf2_yDjrzktl22wAUpAVGfUduc8nZA,9456
+mg_pso_gui-0.1.193.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+mg_pso_gui-0.1.193.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.193.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.193.dist-info/RECORD,,

mgpsogui/gui/OptionManager.py

@@ -15,7 +15,10 @@ class OptionManager():
                  "mode": sv(),
                  "files": {},
                  "calibration_parameters": [],
-                 "figure_parameters": []}
+                 "figure_parameters": [],
+                 "sensitivity_parameters": [],
+                 "sensitivity_positiveBestMetrics": [],
+                 "sensitivity_negativeBestMetrics": []}
         self.steps = []
         self.service_parameters = {}
 
@@ -33,6 +36,9 @@ class OptionManager():
         self.arguments['files'] = {}
         self.arguments['calibration_parameters'].clear()
         self.arguments['figure_parameters'].clear()
+        self.arguments['sensitivity_parameters'].clear()
+        self.arguments['sensitivity_positiveBestMetrics'].clear()
+        self.arguments['sensitivity_negativeBestMetrics'].clear()
         self.steps = []
         self.service_parameters = {}
     
@@ -199,6 +205,24 @@ class OptionManager():
         obj["name"].set(key)
         obj["value"].set(value)
         self.arguments["figure_parameters"].append(obj)
+
+    def add_sensitivity_param(self, key, value):
+        obj = {"name": sv(), "value": sv()}
+        obj["name"].set(key)
+        obj["value"].set(value)
+        self.arguments["sensitivity_parameters"].append(obj)
+
+    def add_sensitivity_positiveBestMetrics(self, key, value):
+        obj = {"name": sv(), "value": sv()}
+        obj["name"].set(key)
+        obj["value"].set(value)
+        self.arguments["sensitivity_positiveBestMetrics"].append(obj)
+
+    def add_sensitivity_negativeBestMetrics(self, key, value):
+        obj = {"name": sv(), "value": sv()}
+        obj["name"].set(key)
+        obj["value"].set(value)
+        self.arguments["sensitivity_negativeBestMetrics"].append(obj)
     
     def move_argument_up(self, index):
         if index > 0:
@@ -227,6 +251,15 @@ class OptionManager():
 
     def remove_figure_parameter(self, index):
         self.arguments["figure_parameters"].pop(index)
+
+    def remove_sensitivity_parameter(self, index):
+        self.arguments["sensitivity_parameters"].pop(index)
+
+    def remove_sensitivity_positiveBestMetrics(self, index):
+        self.arguments["sensitivity_positiveBestMetrics"].pop(index)
+
+    def remove_sensitivity_negativeBestMetrics(self, index):
+        self.arguments["sensitivity_negativeBestMetrics"].pop(index)
         
     def remove_step(self, index):
         self.steps.pop(index)

mgpsogui/gui/SetupTab/ListEditor.py

@@ -0,0 +1,74 @@
+from customtkinter import CTkScrollableFrame
+from customtkinter import CTkFrame
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+from customtkinter import CTkOptionMenu
+import tkinter as tk
+
+global option_manager
+
+class ListEditor(CTkFrame):
+    def __init__(self, *args,
+                 option_manager: None,
+                 home_page: None,
+                 columns: None,
+                 parameter_name: None,
+                 parameter_remove_func: None,
+                 parameter_add_func: None,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        self.option_manager = option_manager
+        self.home_page = home_page
+        self.columns = columns  
+        self.parameter_name = parameter_name
+        self.parameter_remove_func = parameter_remove_func
+        self.parameter_add_func = parameter_add_func
+        self.key_values = option_manager.get_arguments()[self.parameter_name]
+        self.edit_mode = False
+        
+        self.render()
+
+    def clear(self):
+        self.containerFrame.destroy()
+
+    def set_columns(self, columns):
+        self.columns = columns
+        
+    def toggle_edit_mode(self):
+        self.clear()
+        self.edit_mode = not self.edit_mode
+        self.render()
+        
+    def render(self):
+        row = 0
+        index = 0
+        
+        self.containerFrame = CTkFrame(self)
+        self.containerFrame.grid(row=0, column=0, padx=(0, 0), pady=(0, 0), sticky="new")
+        self.containerFrame.grid_columnconfigure((0, 1), weight=1)
+        
+        CTkLabel(self.containerFrame, text="TITLE:").grid(row=row, column=0, columnspan=2, padx=5, pady=5, sticky="ew")
+        row += 1
+
+        for key_value_pair in self.key_values:
+            if self.edit_mode:
+                bb = CTkOptionMenu(self.containerFrame, values=self.columns, variable=self.key_values[index]["value"])
+                bb.grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+                
+                return_func = lambda index=index: (self.clear(), self.parameter_remove_func(index), self.render())
+                CTkButton(self.containerFrame, text="Remove", command=return_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+            else:
+                bb = CTkOptionMenu(self.containerFrame, values=self.columns, variable=self.key_values[index]["value"])
+                bb.grid(row=row, column=0, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="ew")
+            row += 1
+            index += 1
+            
+        if self.edit_mode:
+            CTkButton(self.containerFrame, text="Exit", command=self.toggle_edit_mode).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+        else:
+            CTkButton(self.containerFrame, text="Edit", command=self.toggle_edit_mode).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+            
+        add_key_func = lambda: (self.clear(), self.parameter_add_func("Param " + str(len(self.key_values)) , self.columns[2]), self.render())
+        CTkButton(self.containerFrame, text="Add Figure", command=add_key_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")

mgpsogui/gui/SetupTab/StepView.py

@@ -10,6 +10,7 @@ import os
 
 from . import BoundsList
 from . import FunctionsList
+from . import ListEditor
 
 
 class StepView(CTkScrollableFrame):
@@ -105,7 +106,7 @@ class StepView(CTkScrollableFrame):
 
                 row += 1
 
-            if step['open'] or (self.mode == "Sampling: Halton" or self.mode == "Sampling: Random"):
+            if step['open'] or (self.mode == "Sampling: Halton" or self.mode == "Sampling: Random" or self.mode == "Sensitivity Analysis"):
                 bounds = BoundsList.BoundsList(
                     self.containerFrame, option_manager=self.option_manager, step_index=index)
                 bounds.grid(row=row, column=0, padx=(10, 10),
@@ -131,10 +132,40 @@ class StepView(CTkScrollableFrame):
             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 == "Sensitivity Analysis"):
+        if (self.mode == "Sampling: Halton" or self.mode == "Sampling: Random" or self.mode == "Sensitivity Analysis"):
             self.analysisFrame = CTkFrame(self)
             self.analysisFrame.grid(row=2, column=0, columnspan=2, padx=(10, 10), pady=(10, 10), sticky="nsew")
             self.analysisFrame.grid_columnconfigure((0, 1, 2), weight=1)
-            CTkLabel(self.analysisFrame, text="Parameters").grid(row=0, column=0, padx=(10, 10), pady=(10, 10), sticky="nsew")
-            CTkLabel(self.analysisFrame, text="Positive Best Metrics").grid(row=0, column=1, padx=(10, 10), pady=(10, 10), sticky="nsew")
-            CTkLabel(self.analysisFrame, text="Zero Best Metrics").grid(row=0, column=2, padx=(10, 10), pady=(10, 10), sticky="nsew")
+
+            columns = ["n1", "n2", "n3", "n4", "n5", "n6", "n7", "n8", "n9", "n10"]
+
+            self.params_editor = ListEditor.ListEditor(self.containerFrame, option_manager=self.option_manager, 
+                                                       home_page=self.home_page, 
+                                                       columns=columns,
+                                                       parameter_name="sensitivity_parameters",
+                                                       parameter_remove_func=self.option_manager.remove_sensitivity_parameter,
+                                                       parameter_add_func=self.option_manager.add_sensitivity_param)
+            self.params_editor.grid(row=0, rowspan=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
+            self.params_editor.grid_columnconfigure(0, weight=1)
+            self.params_editor.grid_rowconfigure(0, weight=1)
+
+
+            self.positive_editor = ListEditor.ListEditor(self.containerFrame, option_manager=self.option_manager, 
+                                                       home_page=self.home_page, 
+                                                       columns=columns,
+                                                       parameter_name="sensitivity_positiveBestMetrics",
+                                                       parameter_remove_func=self.option_manager.remove_sensitivity_positiveBestMetrics,
+                                                       parameter_add_func=self.option_manager.add_sensitivity_positiveBestMetrics)
+            self.positive_editor.grid(row=0, rowspan=0, column=1, padx=(10, 10), pady=(10, 0), sticky="nsew")
+            self.positive_editor.grid_columnconfigure(0, weight=1)
+            self.positive_editor.grid_rowconfigure(0, weight=1)
+
+            self.negative_editor = ListEditor.ListEditor(self.containerFrame, option_manager=self.option_manager, 
+                                                       home_page=self.home_page, 
+                                                       columns=columns,
+                                                       parameter_name="sensitivity_negativeBestMetrics",
+                                                       parameter_remove_func=self.option_manager.add_sensitivity_negativeBestMetrics,
+                                                       parameter_add_func=self.option_manager.remove_sensitivity_negativeBestMetrics)
+            self.negative_editor.grid(row=0, rowspan=0, column=2, padx=(10, 10), pady=(10, 0), sticky="nsew")
+            self.negative_editor.grid_columnconfigure(0, weight=1)
+            self.negative_editor.grid_rowconfigure(0, weight=1)

mgpsogui/gui/VisualizeTab/MatrixEditor.py

@@ -39,22 +39,20 @@ class MatrixEditor(CTkFrame):
         row = 0
         index = 0
         
-        self.containerFrame = CTkFrame(self, width=100)
-        self.containerFrame.grid(row=0, column=0, padx=(0, 0), pady=(0, 0), sticky="nsew")
+        self.containerFrame = CTkFrame(self)
+        self.containerFrame.grid(row=0, column=0, padx=(0, 0), pady=(0, 0), sticky="new")
         self.containerFrame.grid_columnconfigure((0, 1), weight=1)
         
-        CTkLabel(self.containerFrame, text="X Axes:").grid(row=row, column=0, columnspan=2, padx=5, pady=5, sticky="")
+        CTkLabel(self.containerFrame, text="X Axes:").grid(row=row, column=0, columnspan=2, padx=5, pady=5, sticky="ew")
         row += 1
 
         for key_value_pair in self.key_values:
-            #CTkLabel(self.containerFrame, text=self.key_values[index]["name"].get()).grid(row=row, column=0, padx=5, pady=5, sticky="")
-            
             if self.edit_mode:
-                bb = CTkOptionMenu(self.containerFrame, values=self.columns, width=100, variable=self.key_values[index]["value"], command=self.home_page.update_graph)
+                bb = CTkOptionMenu(self.containerFrame, values=self.columns, variable=self.key_values[index]["value"], command=self.home_page.update_graph)
                 bb.grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
                 
                 return_func = lambda index=index: (self.clear(), self.option_manager.remove_figure_parameter(index), self.home_page.update_graph(0), self.render())
-                CTkButton(self.containerFrame, text="Remove", width=100, command=return_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+                CTkButton(self.containerFrame, text="Remove", command=return_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
             else:
                 bb = CTkOptionMenu(self.containerFrame, values=self.columns, variable=self.key_values[index]["value"], command=self.home_page.update_graph)
                 bb.grid(row=row, column=0, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="ew")