mg-pso-gui 0.2.33__py3-none-any.whl → 0.2.35__py3-none-any.whl

{mg_pso_gui-0.2.33.dist-info → mg_pso_gui-0.2.35.dist-info}/METADATA

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

{mg_pso_gui-0.2.33.dist-info → mg_pso_gui-0.2.35.dist-info}/RECORD

@@ -1,7 +1,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=8T_-yEc2fOd1v_V9oe6iO80iiRzLOw78DdfbyLPZ1F8,21421
+mgpsogui/gui/HomePage.py,sha256=3PVTCfsve6NPscNiSfePNsmVaFx4FTHqV_uTf6SsYqw,21549
 mgpsogui/gui/OptionManager.py,sha256=HLVib_lHdMijykF78bJ9_PEl-oROuC8lxd1oBS7524U,21898
 mgpsogui/gui/OptionManager_backup.py,sha256=TCWfPnHL2foN5id47jsi267lamRG6yGU6y_M29eOOJk,18530
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -44,7 +44,7 @@ mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
 mgpsogui/util/GraphGenerator.py,sha256=dKzDPMK-0S6j1yIp5xoQIgN9GTKMhGpboAXjofCpmIk,31973
-mgpsogui/util/PSORunner.py,sha256=UATYIop8IofEhyRyE2CuoTn8A6ZuB2xN4xy5SP_X5rs,20105
+mgpsogui/util/PSORunner.py,sha256=anp0ioxAz6uv8OFGtRhVHFrOsq3CRHN2x02ekMaKfn4,20830
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
 mgpsogui/util/helpers.py,sha256=Ht2rge_4pGO7halz6KoLsL2eukB0k2tlkx68lBBmBA8,2669
@@ -69,8 +69,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.33.dist-info/METADATA,sha256=ZXfO4Fo-LbB3KMnoNcms78K0RiayC10nMBhQSj9GJYk,9455
-mg_pso_gui-0.2.33.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-mg_pso_gui-0.2.33.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.33.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.33.dist-info/RECORD,,
+mg_pso_gui-0.2.35.dist-info/METADATA,sha256=YxvOLPbuFbEOeR3WLHdCtXJNzxPF4jTL1DGtZNWo7rM,9455
+mg_pso_gui-0.2.35.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mg_pso_gui-0.2.35.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.35.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.35.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -217,6 +217,13 @@ class App(customtkinter.CTk):
 		try:
 			self.option_manager.set_path(filename)
 			self.option_manager.save_project(filename)
+
+			folder = self.option_manager.get_project_folder()
+			if not os.path.exists(folder):
+				os.makedirs(folder)
+
+			if not os.path.exists(os.path.join(folder, "results")):
+				os.makedirs(os.path.join(folder, "results"))
 				
 			self.save_button.configure(text="Saved!")
 			self.after(3000, lambda: self.save_button.configure(text="Save"))
@@ -267,6 +274,14 @@ class App(customtkinter.CTk):
 		try:
 		
 			self.option_manager.load_project(filename)
+			self.option_manager.set_path(filename)
+
+			folder = self.option_manager.get_project_folder()
+			if not os.path.exists(folder):
+				os.makedirs(folder)
+
+			if not os.path.exists(os.path.join(folder, "results")):
+				os.makedirs(os.path.join(folder, "results"))
 			
 			self.refresh_step_view(0)
 			
@@ -337,15 +352,15 @@ class App(customtkinter.CTk):
 	def run(self):
 		
 		data = self.option_manager.get_all_data()
-		data["sensitivity_analysis_path"] = self.sensitivity_file.get()
+		mode = self.option_manager.get_mode()
 
-		self.running_config = metrics
+		self.running_config = data
 		
-		if self.testing:
-			steps = metrics['steps']
-			for step in steps:
-				for param in step['param']:
-					param['default_value'] = param['optimal_value']
+		#if self.testing:
+		#	steps = metrics['steps']
+		#	for step in steps:
+		#		for param in step['param']:
+		#			param['default_value'] = param['optimal_value']
 		self.testing = False
 
 		self.progress_data = None
@@ -364,21 +379,11 @@ class App(customtkinter.CTk):
 		
 		self.textbox.insert("0.0", "Starting job...\n\n")
 		self.textbox.insert("0.0", "Job Parameters:\n")
-		self.textbox.insert("0.0", json.dumps(metrics, indent=4) + "\n\n")
+		self.textbox.insert("0.0", json.dumps(data, indent=4) + "\n\n")
 		try:
-			info = self.option_manager.get_project_data()
-			folder = os.path.join(info['path'], info['name'])
-
-			if not os.path.exists(folder):
-				os.makedirs(folder)
-
-			if (os.path.exists(os.path.join(folder, 'output.txt'))):
-				os.remove(os.path.join(folder, 'output.txt'))
-				
-			if (os.path.exists(os.path.join(folder, 'error.txt'))):
-				os.remove(os.path.join(folder, 'error.txt'))
+			folder = self.option_manager.get_project_folder()
 			
-			self.train_process = Process(target=PSORunner.run_process, args=(stdout_queue, stderr_queue, results_queue, metrics, folder))
+			self.train_process = Process(target=PSORunner.run_process, args=(stdout_queue, stderr_queue, results_queue, data, folder, mode))
 			self.train_process.daemon = True
 			self.train_process.start()
 			self.after(1000, self.watch_loop)

mgpsogui/util/PSORunner.py

@@ -30,53 +30,72 @@ def run_process(stdout_queue, stderr_queue, results_queue, data, folder, mode):
         folder (_type_): _description_
         mode (_type_): _description_
     """
+    try:
+        # Setup folders
+        if not os.path.exists(folder):
+            os.makedirs(folder)
 
-    # Setup folders
-    if not os.path.exists(folder):
-        os.makedirs(folder)
+        if not os.path.exists(os.path.join(folder, "results")):
+            os.makedirs(os.path.join(folder, "results"))
 
-    if not os.path.exists(os.path.join(folder, "results")):
-        os.makedirs(os.path.join(folder, "results"))
+        if (os.path.exists(os.path.join(folder, 'output.txt'))):
+            os.remove(os.path.join(folder, 'output.txt'))
+            
+        if (os.path.exists(os.path.join(folder, 'error.txt'))):
+            os.remove(os.path.join(folder, 'error.txt'))
 
-    if (os.path.exists(os.path.join(folder, 'output.txt'))):
-        os.remove(os.path.join(folder, 'output.txt'))
+        # Redirect stdout and stderr to files
+        old_stdout = sys.stdout
+        old_stderr = sys.stderr
         
-    if (os.path.exists(os.path.join(folder, 'error.txt'))):
-        os.remove(os.path.join(folder, 'error.txt'))
+        read_stdout, write_stdout = os.pipe()
+        read_stderr, write_stderr = os.pipe()
+        
+        sys.stdout = os.fdopen(write_stdout, 'w')
+        sys.stderr = os.fdopen(write_stderr, 'w')
+        
+        stdout_thread = threading.Thread(target=enqueue_output, args=(os.fdopen(read_stdout, 'r'), stdout_queue))
+        stderr_thread = threading.Thread(target=enqueue_output, args=(os.fdopen(read_stderr, 'r'), stderr_queue))
+        stdout_thread.daemon = True
+        stderr_thread.daemon = True
+        stdout_thread.start()
+        stderr_thread.start()
+
+        if mode == "Sampling: Halton":
+            run_sampling(data, "halton", folder, results_queue)
+        elif mode == "Sampling: Random":
+            run_sampling(data, "random", folder, results_queue)
+        elif mode == "Sensitivity Analysis":
+            run_sensitivity_analysis(data, folder, results_queue)
+        elif mode == "Optimization":
+            run_optimization(data, folder, results_queue)
+        else:
+            print("Invalid mode")
 
-    # Redirect stdout and stderr to files
-    old_stdout = sys.stdout
-    old_stderr = sys.stderr
-    
-    read_stdout, write_stdout = os.pipe()
-    read_stderr, write_stderr = os.pipe()
-    
-    sys.stdout = os.fdopen(write_stdout, 'w')
-    sys.stderr = os.fdopen(write_stderr, 'w')
-    
-    stdout_thread = threading.Thread(target=enqueue_output, args=(os.fdopen(read_stdout, 'r'), stdout_queue))
-    stderr_thread = threading.Thread(target=enqueue_output, args=(os.fdopen(read_stderr, 'r'), stderr_queue))
-    stdout_thread.daemon = True
-    stderr_thread.daemon = True
-    stdout_thread.start()
-    stderr_thread.start()
+        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))
+        # Print stack trace
+        import traceback
+        traceback.print_exc()
 
-    if mode == "Sampling: Halton":
-        run_sampling(data, "halton", folder, results_queue)
-    elif mode == "Sampling: Random":
-        run_sampling(data, "random", folder, results_queue)
-    elif mode == "Sensitivity Analysis":
-        run_sensitivity_analysis(data, folder, results_queue)
-    elif mode == "Optimization":
-        run_optimization(data, folder, results_queue)
-    else:
-        print("Invalid mode")
-
-    stdout_thread.join()
-    stderr_thread.join()
-    
-    sys.stdout = old_stdout
-    sys.stderr = old_stderr
+        # Write all of this information to a crash file
+        with open(os.path.join(folder, 'crash.txt'), 'w') as f:
+            f.write(str(e))
+            f.write("\n")
+            traceback.print_exc(file=f)
+    finally:
+        stdout_thread.join()
+        stderr_thread.join()
+        
+        sys.stdout = old_stdout
+        sys.stderr = old_stderr
 
 def process_list(data, parameter_map, args, options, oh_strategy, config, metainfo, list_name):
     """_summary_