mg-pso-gui 0.1.237__py3-none-any.whl → 0.1.239__py3-none-any.whl

{mg_pso_gui-0.1.237.dist-info → mg_pso_gui-0.1.239.dist-info}/METADATA

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

{mg_pso_gui-0.1.237.dist-info → mg_pso_gui-0.1.239.dist-info}/RECORD

@@ -2,9 +2,10 @@ 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=F0QIzkkM4cDvaFZq_Uy5cDFL6wb1-HV8AB44K-QqB4o,23227
-mgpsogui/gui/OptionManager.py,sha256=DxOZbos8d1p3j3Krs534JJaCZKLl3hqmauPUx7lbr4o,16360
+mgpsogui/gui/OptionManager.py,sha256=2Fckux8P8xrkPWmQtqi8pCOO1mvRc8IjfPjxmyoLLTM,17362
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=q8x_tvVgSoyGINuQbivXRThF3gaSSfg8X_dsLSPv4F0,10492
+mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=Uug0hUzwF7mpmnMOs6lXZMAN8AGoeV5VWtPBqYwUV0c,10897
+mgpsogui/gui/PlatformTab/ServiceParametersView.py,sha256=0oWkRCUjqVNj4jhAqtczz_REef5MWZymWA-8JWBRl3E,2916
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/RunTab/RunTab.py,sha256=8FT7mdxNRQrftDuU0v4LoK1eyH8_RHwLOyM4dz8O_4A,1850
 mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,10 +17,10 @@ mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=hAVZSJMgHEQYrFsgUUnil17pWM
 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=NmCPb9tGVJmUy1HG3G26y5RibtVZNeN9XFyomVnageQ,2792
+mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=H92S6ioJI2iTjFBspEzyDxluagCEgfFSW5AkqQFO-l8,1738
+mgpsogui/gui/SetupTab/SetupTab.py,sha256=RuAn6inLUX12i6-4RmXkteIiGtxh27nYY34mFmbb3xs,2810
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
-mgpsogui/gui/SetupTab/StepView.py,sha256=fWzKw4B0HT-d81FlWVN98oHD7gaAos4bON7OjftEUHo,11593
+mgpsogui/gui/SetupTab/StepView.py,sha256=UQNLRxCEQQPvdW5UIT703TnmEfnjgchGIBFnCg4K3Zs,8557
 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 +63,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.237.dist-info/METADATA,sha256=-zn5-a8zXHUIqOSTpL_FPN1tTEtOpvBzcbIbJvfV-Y0,9456
-mg_pso_gui-0.1.237.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-mg_pso_gui-0.1.237.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.237.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.237.dist-info/RECORD,,
+mg_pso_gui-0.1.239.dist-info/METADATA,sha256=6QhLxssfrs7PPVwYKXoyIyYyHGAsITbKdQ7kHgGkZdA,9456
+mg_pso_gui-0.1.239.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mg_pso_gui-0.1.239.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.239.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.239.dist-info/RECORD,,

mgpsogui/gui/OptionManager.py

@@ -15,6 +15,7 @@ class OptionManager():
                  "mode": sv(),
                  "files": {},
                  "calibration_parameters": [],
+                 "service_parameters": [],
                  "figure_parameters": [],
                  "sensitivity_parameters": [],
                  "sensitivity_positiveBestMetrics": [],
@@ -35,6 +36,7 @@ class OptionManager():
         self.arguments['mode'].set("Optimization")
         self.arguments['files'] = {}
         self.arguments['calibration_parameters'].clear()
+        self.arguments['service_parameters'].clear()
         self.arguments['figure_parameters'].clear()
         self.arguments['sensitivity_parameters'].clear()
         self.arguments['sensitivity_positiveBestMetrics'].clear()
@@ -74,6 +76,14 @@ class OptionManager():
             obj["name"].set(name)
             obj["value"].set(value)
             self.arguments["calibration_parameters"].append(obj)
+
+        for param in arguments["service_parameters"]:
+            name = param["name"]
+            value = param["value"]
+            obj = {"name": sv(), "value": sv()}
+            obj["name"].set(name)
+            obj["value"].set(value)
+            self.arguments["service_parameters"].append(obj)
             
     def add_steps(self, steps):
         for step in steps:
@@ -233,6 +243,12 @@ class OptionManager():
         obj["value"].set(value)
         self.arguments["calibration_parameters"].append(obj)
 
+    def add_service_param(self, key, value):
+        obj = {"name": sv(), "value": sv()}
+        obj["name"].set(key)
+        obj["value"].set(value)
+        self.arguments["service_parameters"].append(obj)
+
     def add_figure_param(self, key, value):
         obj = {"name": sv(), "value": sv()}
         obj["name"].set(key)
@@ -282,6 +298,9 @@ class OptionManager():
     def remove_calibration_parameter(self, index):
         self.arguments["calibration_parameters"].pop(index)
 
+    def remove_service_parameter(self, index):
+        self.arguments["service_parameters"].pop(index)
+
     def remove_figure_parameter(self, index):
         self.arguments["figure_parameters"].pop(index)
 
@@ -330,6 +349,7 @@ class OptionManager():
         result = {}
         result['arguments'] = {}
         result['calibration_parameters'] = []
+        result['service_parameters'] = []
         result['service_parameters'] = {}
         result['project_data'] = self.project_data
         for key, value in self.arguments.items():
@@ -347,6 +367,10 @@ class OptionManager():
                 #result['calibration_parameters'][key] = []
                 for obj in value:
                     result['calibration_parameters'].append({'name': obj['name'].get(), 'value': obj['value'].get()})
+            elif key == "service_parameters":
+                #result['service_parameters'][key] = []
+                for obj in value:
+                    result['service_parameters'].append({'name': obj['name'].get(), 'value': obj['value'].get()})
         result['steps'] = []
         for step in self.steps:
             step_result = {}

mgpsogui/gui/PlatformTab/PlatformTab.py

@@ -5,6 +5,8 @@ import subprocess
 import customtkinter
 import platform
 
+from . import ServiceParametersView as spv
+
 import tkinter as tk
 
 def create_tab(self, tab):
@@ -114,6 +116,7 @@ def create_tab(self, tab):
     
     tab.grid_columnconfigure(0, weight=1)
     tab.grid_columnconfigure(1, weight=1)
+    tab.grid_columnconfigure(2, weight=1)
     tab.grid_rowconfigure(0, weight=1)
     
     """
@@ -131,9 +134,15 @@ def create_tab(self, tab):
     self.load_parameters.grid(row=0, column=2, padx=(20, 20), pady=(20, 20), sticky="nsew")
     
     """
+
+    self.service_param_frame = spv.ServiceParametersView(tab, option_manager=self.option_manager)
+    self.service_param_frame.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+    self.service_param_frame.grid_columnconfigure(0, weight=1)
+    self.service_param_frame.grid_rowconfigure(0, weight=1)
+
             
     self.service_editor = customtkinter.CTkScrollableFrame(tab, label_text="Service Editor")
-    self.service_editor.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+    self.service_editor.grid(row=0, column=1, padx=(20, 20), pady=(20, 20), sticky="nsew")
     self.service_editor.grid_columnconfigure(0, weight=1)
     self.service_editor.grid_rowconfigure(0, weight=1)
     
@@ -162,7 +171,7 @@ def create_tab(self, tab):
     self.service_details.grid(row=8, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
     
     self.environment_editor = customtkinter.CTkScrollableFrame(tab, label_text="Environment Editor")
-    self.environment_editor.grid(row=0, column=1, padx=(20, 20), pady=(20, 20), sticky="nsew")
+    self.environment_editor.grid(row=0, column=2, padx=(20, 20), pady=(20, 20), sticky="nsew")
     self.environment_editor.grid_columnconfigure(0, weight=1)
     self.environment_editor.grid_rowconfigure(0, weight=1)
     

mgpsogui/gui/PlatformTab/ServiceParametersView.py

@@ -0,0 +1,64 @@
+from customtkinter import CTkScrollableFrame
+from customtkinter import CTkFrame
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+import tkinter as tk
+
+global option_manager
+
+class ServiceParametersView(CTkScrollableFrame):
+    def __init__(self, *args,
+                 option_manager: None,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        self.option_manager = option_manager
+        self.key_values = option_manager.get_arguments()['service_parameters']
+        self.edit_mode = False
+        
+        self.render()
+
+    def clear(self):
+        self.containerFrame.destroy()
+        
+    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=(5, 5), pady=(5, 5), sticky="nsew")
+        self.containerFrame.grid_columnconfigure((0, 1), weight=1)
+        
+        CTkLabel(self.containerFrame, text="Service Parameters").grid(row=row, column=0, columnspan=2, padx=5, pady=5, sticky="")
+        row += 1
+
+        CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
+        CTkLabel(self.containerFrame, text="Value:").grid(row=row, column=1, columnspan=1, padx=5, pady=5, sticky="")
+        row += 1
+        
+        for key_value_pair in self.key_values:
+            CTkEntry(self.containerFrame, textvariable=self.key_values[index]["name"]).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+            
+            if self.edit_mode:
+                return_func = lambda index=index: (self.clear(), self.option_manager.remove_service_parameter(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 = CTkEntry(self.containerFrame)
+                bb.grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+                bb.configure(textvariable=self.key_values[index]["value"])
+            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.option_manager.add_service_param("name", "value"), self.render())
+        CTkButton(self.containerFrame, text="Add Parameter", command=add_key_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")

mgpsogui/gui/SetupTab/OptimalParameterView.py

@@ -32,7 +32,7 @@ class OptimalParameterView(CTkScrollableFrame):
 
         for step in self.steps:
             
-            if self.mode != "Sampling: Halton":
+            if self.mode != "Sampling":
                 name = step['name'].get()
                 CTkLabel(self.containerFrame, text=name).grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
                 row += 1
@@ -45,5 +45,5 @@ class OptimalParameterView(CTkScrollableFrame):
                 bb.configure(textvariable=param['optimal_value'])
                 row += 1
                 
-            if self.mode == "Sampling: Halton" or self.mode == "Sampling: Random":
+            if self.mode != "Optimization":
                 break

mgpsogui/gui/SetupTab/SetupTab.py

@@ -27,12 +27,12 @@ def create_tab(self, tab):
     self.paramtabview = customtkinter.CTkTabview(tab, bg_color="transparent", fg_color="transparent")
     self.paramtabview.grid(row=0, column=1, padx=(0, 0), pady=(10, 10), sticky="nsew")
     
-    tab1 = "Static"
+    tab1 = "Model Parameters"
     tab2 = "Hyperparameters"
-    tab3 = "Optimal"
+    #tab3 = "Optimal"
     self.paramtabview.add(tab1)
     self.paramtabview.add(tab2)
-    self.paramtabview.add(tab3)
+    #self.paramtabview.add(tab3)
     
     self.paramtabview.tab(tab1).grid_columnconfigure(0, weight=1)
     self.paramtabview.tab(tab1).grid_rowconfigure(0, weight=1)
@@ -40,8 +40,8 @@ def create_tab(self, tab):
     self.paramtabview.tab(tab2).grid_columnconfigure(0, weight=1)
     self.paramtabview.tab(tab2).grid_rowconfigure(0, weight=1)
     
-    self.paramtabview.tab(tab3).grid_columnconfigure(0, weight=1)
-    self.paramtabview.tab(tab3).grid_rowconfigure(0, weight=1)
+    #self.paramtabview.tab(tab3).grid_columnconfigure(0, weight=1)
+    #self.paramtabview.tab(tab3).grid_rowconfigure(0, weight=1)
     
     self.static_param_frame = spv.StaticParameterView(self.paramtabview.tab(tab1), option_manager=self.option_manager)
     self.static_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
@@ -53,10 +53,10 @@ def create_tab(self, tab):
     self.calib_param_frame.grid_columnconfigure(0, weight=1)
     self.calib_param_frame.grid_rowconfigure(0, weight=1)
     
-    self.optimal_param_frame = opv.OptimalParameterView(self.paramtabview.tab(tab3), option_manager=self.option_manager)
-    self.optimal_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
-    self.optimal_param_frame.grid_columnconfigure(0, weight=1)
-    self.optimal_param_frame.grid_rowconfigure(0, weight=1)
+    #self.optimal_param_frame = opv.OptimalParameterView(self.paramtabview.tab(tab3), option_manager=self.option_manager)
+    #self.optimal_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
+    #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, home_page=self)
     self.steps_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")

mgpsogui/gui/SetupTab/StepView.py

@@ -157,7 +157,7 @@ class StepView(CTkScrollableFrame):
 
                 row += 1
 
-            if step['open'] or (self.mode == "Sampling"or self.mode == "Sensitivity Analysis"):
+            if step['open'] or (self.mode == "Sampling" 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),
@@ -183,42 +183,3 @@ 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 == "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)
-
-            columns = ["n1", "n2", "n3", "n4", "n5", "n6", "n7", "n8", "n9", "n10"]
-
-            self.params_editor = ListEditor.ListEditor(self.analysisFrame, option_manager=self.option_manager, 
-                                                       title="Parameters",
-                                                       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, 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.analysisFrame, option_manager=self.option_manager, 
-                                                       title="Positive Best Metrics",
-                                                       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, 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.analysisFrame, option_manager=self.option_manager, 
-                                                       title = "Zero Best Metrics",
-                                                       columns=columns,
-                                                       parameter_name="sensitivity_negativeBestMetrics",
-                                                       parameter_remove_func=self.option_manager.remove_sensitivity_negativeBestMetrics,
-                                                       parameter_add_func=self.option_manager.add_sensitivity_negativeBestMetrics)
-            self.negative_editor.grid(row=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)
-        """