mg-pso-gui 0.2.112__py3-none-any.whl → 0.2.113__py3-none-any.whl

{mg_pso_gui-0.2.112.dist-info → mg_pso_gui-0.2.113.dist-info}/METADATA

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

{mg_pso_gui-0.2.112.dist-info → mg_pso_gui-0.2.113.dist-info}/RECORD

@@ -1,12 +1,12 @@
 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=K_uYDv-rr5GffTwKLqNhfQf78GRSXzXXLMtNyuy-fOc,24388
+mgpsogui/gui/HomePage.py,sha256=ec-W_dOssQHUmFtPWlpAZTJc8dIh_P2ERwFM331VW1A,24536
 mgpsogui/gui/OptionManager.py,sha256=t0aXOeBo48qQ-P8OykpP2v_3KJoaJtUPSkYtacjloCc,22844
 mgpsogui/gui/OptionManager_backup.py,sha256=TCWfPnHL2foN5id47jsi267lamRG6yGU6y_M29eOOJk,18530
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/General/NoticeWindow.py,sha256=HcTtaYKK4b7HognnoAHXiIHZWAXI80QfR8HM2dTLTV8,1866
-mgpsogui/gui/General/ParameterView.py,sha256=vLTmBEliBnHcwDUYCrnOWQvR887OyujVT8Lm-Y08qCQ,10071
+mgpsogui/gui/General/ParameterView.py,sha256=H7BqT1UiEYpGp8d6ycdKaKtuqY5IkrlHOXiiN_pgcMM,10059
 mgpsogui/gui/General/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=8J2Aa3Zrh1q9x07zZ0Ap9PgwHjeSKOYyj6wlxx40udw,10985
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -14,7 +14,7 @@ mgpsogui/gui/RunTab/OptimalParameterView.py,sha256=nliUEWA840cPBQt7wjiZ-L7uBOp_o
 mgpsogui/gui/RunTab/RunTab.py,sha256=_JWzDx5LT_uISw0Vnv-W2ypIeuKgoWqBnvFnvrLhNQA,5917
 mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=U64oaiDIOaimjbqKMz5rQNq2o1SrQtrRHDdTYQ9ux1s,2870
-mgpsogui/gui/SetupTab/BoundsList.py,sha256=bc1g2LLdmxkVk_Gnr-koxsxw8342IWFzpaDXu27pJD4,15231
+mgpsogui/gui/SetupTab/BoundsList.py,sha256=cmt1YPIPxowaYjWyi8uKSfxNSdEJZHohKlRZ5PeGPfM,15523
 mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py,sha256=yx0dHSNa7fGy99Q6qFcI6j9r8p0DlV3iOBgyPMGd8pM,2884
 mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=vOJpElbTgz043m6JYwe9xz_2MBHg985S6KdbJkJERW4,5923
 mgpsogui/gui/SetupTab/FunctionsList.py,sha256=6oFS8qKF3OCtxNi5aY5Rj_ovM9nv4-vh-oT_CbhVTj4,7043
@@ -73,8 +73,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.112.dist-info/METADATA,sha256=vHP4ZMZRoX9JaoNSm4ZHOepEDGnaU55AzrqxPU4_2Yo,9542
-mg_pso_gui-0.2.112.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mg_pso_gui-0.2.112.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.112.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.112.dist-info/RECORD,,
+mg_pso_gui-0.2.113.dist-info/METADATA,sha256=XiU52HFgb_m5bg9t6tKxdBiAymutWxWiKHSZTV5HzWo,9542
+mg_pso_gui-0.2.113.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mg_pso_gui-0.2.113.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.113.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.113.dist-info/RECORD,,

mgpsogui/gui/General/ParameterView.py

@@ -57,7 +57,7 @@ class ParameterView(CTkScrollableFrame):
                 CTkEntry(self.containerFrame, textvariable=self.key_values[index]["name"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
             
             if self.edit_mode and not required:
-                type_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["type"], values=["integer", "float", "date", "datetime", "boolean", "string"], width=20)
+                type_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["type"], values=["integer", "float", "date", "boolean", "string"], width=20)
                 type_menu.grid(row=row, column=3, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
 
                 dest_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["destination"], values=["args", "kwargs", "conf", "options", "oh_strategy", "metainfo"], width=20)

mgpsogui/gui/HomePage.py

@@ -401,6 +401,10 @@ class App(customtkinter.CTk):
 
 	def run(self):
 		
+		if self.train_process is not None and self.train_process.is_alive():
+			NW(title="Error", message="A process is already running!")
+			return 0
+		
 		data = self.option_manager.get_all_data()
 		mode = self.option_manager.get_mode()
 		data = data[mode]

mgpsogui/gui/SetupTab/BoundsList.py

@@ -90,12 +90,25 @@ class BoundsList(CTkFrame):
         CTkLabel(self.containerFrame, text="Type:").grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
         CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="nsew")
 
+
+        show_strategy = False
+
+
         if mode != "Sensitivity Analysis":
             CTkLabel(self.containerFrame, text="Bounds:").grid(row=row, column=2, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="nsew")
 
             if mode == "Optimization":
+                
+                for bound in bounds:
+                    bound_type = bound["type"].get()
+                    if bound_type == "list":
+                        show_strategy = True
+                        break
+
                 CTkLabel(self.containerFrame, text="Default:").grid(row=row, column=4, padx=(5, 5), pady=(5, 5), sticky="nsew")
-                CTkLabel(self.containerFrame, text="Strategy:").grid(row=row, column=5, padx=(5, 5), pady=(5, 5), sticky="nsew")
+
+                if show_strategy:
+                    CTkLabel(self.containerFrame, text="Strategy:").grid(row=row, column=5, padx=(5, 5), pady=(5, 5), sticky="nsew")
         row += 1
         
         bounds = self.option_manager.get_steps()[self.step_index]["parameter_objects"]
@@ -153,15 +166,6 @@ class BoundsList(CTkFrame):
                 self.validate_number(bounds_max.get(), cc, bounds_max)
                 tt2 = ctt(bounds_max, delay=0.1, alpha=0.95, message="...")
                 
-                if (bound_type == "list" and mode == "Optimization"):
-                    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)
-
-                    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="...")
@@ -181,8 +185,17 @@ class BoundsList(CTkFrame):
                 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")
+                if (bound_type == "list" and mode == "Optimization"):
+                    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")
+
+                    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)
+
+                    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")
                 
                 tt1 = ctt(bounds_min, delay=0.1, alpha=0.95, message="...")
                 tt2 = ctt(bounds_max, delay=0.1, alpha=0.95, message="...")