mg-pso-gui 0.2.112__tar.gz → 0.2.114__tar.gz

{mg_pso_gui-0.2.112 → mg_pso_gui-0.2.114}/PKG-INFO

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

{mg_pso_gui-0.2.112 → mg_pso_gui-0.2.114}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.2.112 → mg_pso_gui-0.2.114}/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)

{mg_pso_gui-0.2.112 → mg_pso_gui-0.2.114}/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]

{mg_pso_gui-0.2.112 → mg_pso_gui-0.2.114}/mgpsogui/gui/SetupTab/BoundsList.py

@@ -54,6 +54,7 @@ class BoundsList(CTkFrame):
         self.tooltip_list = []
 
         mode = self.option_manager.get_mode()
+        bounds = self.option_manager.get_steps()[self.step_index]["parameter_objects"]
 
         # Load bound parameters depending on the mode
         self.optParams = []
@@ -90,16 +91,26 @@ 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"]
-        
         for bound in bounds:
             tt1 = None
             tt2 = None
@@ -153,15 +164,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 +183,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="...")

{mg_pso_gui-0.2.112 → mg_pso_gui-0.2.114}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = '0.2.112'
+VERSION = '0.2.114'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()