mg-pso-gui 0.2.131__tar.gz → 0.2.133__tar.gz

{mg_pso_gui-0.2.131 → mg_pso_gui-0.2.133}/PKG-INFO

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

{mg_pso_gui-0.2.131 → mg_pso_gui-0.2.133}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.2.131 → mg_pso_gui-0.2.133}/mgpsogui/gui/HomePage.py

@@ -116,7 +116,7 @@ class App(customtkinter.CTk):
 		self.running_loop_ticks = 1
 
 		# Configure window
-		version = "v0.2.131"
+		version = "v0.2.132"
 		self.title("COSU Manager (" + version + ")")
 
 		screen_width = self.winfo_screenwidth()
@@ -265,6 +265,8 @@ class App(customtkinter.CTk):
 			self.after(3000, lambda: self.save_button.configure(text="Save As"))
 
 	def auto_save_project(self):
+		return 0
+
 		data = self.option_manager.get_project_data()
 
 		if (data['path'] != "/tmp"):

{mg_pso_gui-0.2.131 → mg_pso_gui-0.2.133}/mgpsogui/gui/SetupTab/BoundsList.py

@@ -99,6 +99,9 @@ class BoundsList(CTkFrame):
         if mode == "Sensitivity Analysis":
             show_bounds = False
 
+        if mode == "Optimization":
+            show_default = True
+
         for bound in bounds:
             bound_type = bound["type"].get()
             if bound_type == "list":

{mg_pso_gui-0.2.131 → mg_pso_gui-0.2.133}/mgpsogui/gui/defaults/sampling.json

@@ -47,7 +47,9 @@
 					"value": "drake58hru-5min",
 					"type": "string",
 					"destination": "args"
-				},
+				}
+			],
+			"hyperparameters": [
 				{
 					"name": "offset",
 					"value": "5",
@@ -66,9 +68,6 @@
 					"type": "integer",
 					"destination": "kwargs"
 				}
-			],
-			"hyperparameters": [
-
 			],
 			"service_parameters": [
 				{

{mg_pso_gui-0.2.131 → mg_pso_gui-0.2.133}/mgpsogui/util/PSORunner.py

@@ -73,12 +73,6 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder, mode):
         else:
             print("Invalid mode")
 
-        stdout_thread.join()
-        stderr_thread.join()
-        
-        sys.stdout = old_stdout
-        sys.stderr = old_stderr
-
     except Exception as e:
         print("An exception occurred: ", flush=True)
         print(str(e))
@@ -91,13 +85,31 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder, mode):
             f.write(str(e))
             f.write("\n")
             traceback.print_exc(file=f)
+
     finally:
-        stdout_thread.join()
-        stderr_thread.join()
-        
+        try:
+            stdout_thread.join()
+            stderr_thread.join()
+        except:
+            pass
+
         sys.stdout = old_stdout
         sys.stderr = old_stderr
 
+        try:
+            stdout_queue.close()
+            stdout_queue.join_thread()
+
+            stderr_queue.close()
+            stderr_queue.join_thread()
+
+            results_queue.close()
+            results_queue.join_thread()
+        except:
+            pass 
+
+        os._exit(0)
+
 def process_list(data, parameter_map, args, options, oh_strategy, config, metainfo, list_name):
     """_summary_
 
@@ -357,7 +369,7 @@ def run_optimization(data, folder, results_queue):
     
     results_queue.put(trace)
     print(trace, flush=True)
-    pass
+
 
 
 

{mg_pso_gui-0.2.131 → mg_pso_gui-0.2.133}/setup.py

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