mg-pso-gui 0.1.73__py3-none-any.whl → 0.1.76__py3-none-any.whl

{mg_pso_gui-0.1.73.dist-info → mg_pso_gui-0.1.76.dist-info}/METADATA

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

{mg_pso_gui-0.1.73.dist-info → mg_pso_gui-0.1.76.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=WSy8qai-7cj4yTnCURE3eGSIK-jhk97byGBHo9MFWaI,23619
+mgpsogui/gui/HomePage.py,sha256=T1WnSBVqjPTYD8QBp8DWloiCYaxwjUQl3rS_REuR0Oc,23983
 mgpsogui/gui/OptionManager.py,sha256=u-mXq4ouGJ-oBa71u5GffHwSXHg3Xs32P8RtSgcTmUE,12332
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
@@ -33,7 +33,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=HhUsFUFhCv3wTYV8CTqU0wo56Ph9c1DocPj25AVIAdI,15076
-mgpsogui/util/PSORunner.py,sha256=4T-L4t0I6ogMeT5v7YUaURS-g_WaN0VS2sQLpgMLMs0,4502
+mgpsogui/util/PSORunner.py,sha256=xdRonFbU7s7YJpMGamITc5AVKjhl99nKGSkoPmrlbcw,4554
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
 mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MOYL2ifolvOE,6329
@@ -46,8 +46,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.73.dist-info/METADATA,sha256=ax47rzWEwt68wh_do1MD2Fmxu3ZVaFcELzOwLyR7MYg,9458
-mg_pso_gui-0.1.73.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.73.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.73.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.73.dist-info/RECORD,,
+mg_pso_gui-0.1.76.dist-info/METADATA,sha256=_Dd64LbIp3kwX32lMBLXgzKD6eDQKJ1N-w_-Ve0sZA4,9458
+mg_pso_gui-0.1.76.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.76.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.76.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.76.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -97,7 +97,8 @@ class App(customtkinter.CTk):
 		self.image_height = 720
 		self.progress_data = None
 		self.calibration_data = None
-
+		self.testing = False
+  
 		# configure window
 		self.title("CSIP PSO")
 		self.geometry(f"{1920}x{1080}")
@@ -183,7 +184,7 @@ class App(customtkinter.CTk):
 		self.run_button.grid(row=0, column=7, padx=(20, 5), pady=header_padding_y)
 
 		test_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "test.png")), size=(20, 20))
-		self.test_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=test_image, command=self.run)
+		self.test_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=test_image, command=self.run_test)
 		ctt(self.test_button, delay=0.1, alpha=0.95, message="Start Testing")
 		self.test_button.grid(row=0, column=8, padx=(5, 5), pady=header_padding_y)
 		
@@ -382,13 +383,24 @@ class App(customtkinter.CTk):
 		self.after(10, self.make_request)
 		self.after(3000, lambda: self.refresh_button.configure(fg_color=self.default_button_color))
 		
+	def run_test(self):
+		self.testing = True
+		self.run()	
+  
 	def run(self):
 		metrics = self.option_manager.get_metrics()
 		self.running_config = metrics
 		
+		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
 		self.calibration_data = None
-  
+
 		#self.progress_bar.configure(mode="indeterminnate")
 		#self.progress_bar.start()
 		self.footer_progress_bar.configure(mode="indeterminnate")
@@ -522,6 +534,9 @@ class App(customtkinter.CTk):
 				print("TRACE " + str(trace), flush=True)
 			except Empty:
 				break
+			except Exception as e:
+				print("Some error happened when getting the trace!")
+				print(e)
 		
 		if (os.path.exists(os.path.join(folder, 'output.txt'))):
 			with open(os.path.join(folder, 'output.txt'), 'r') as f:

mgpsogui/util/PSORunner.py

@@ -92,13 +92,16 @@ def run_process(stdout_queue, stderr_queue, results_queue, cosu_queue, data, fol
             result_queue = cosu_queue
         )
     
+    results_queue.put(trace)
+    
+    print("Finishing up...")
+    time.sleep(5)
     
     stdour_thread.join()
     stderr_thread.join()
     
     sys.stdout = old_stdout
     sys.stderr = old_stderr
-    results_queue.put(trace)
 
 """
 def get_results():