mg-pso-gui 0.1.112__py3-none-any.whl → 0.1.113__py3-none-any.whl

{mg_pso_gui-0.1.112.dist-info → mg_pso_gui-0.1.113.dist-info}/METADATA

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

{mg_pso_gui-0.1.112.dist-info → mg_pso_gui-0.1.113.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=i6Ir3pvWt67LSfXNxgzzY5o3_HN3jQI74SMhgD7nYXY,24038
+mgpsogui/gui/HomePage.py,sha256=ckJvKDkUhWrfV6OPSaUgmzlqxdZJYOb5GAqNrFjxArQ,24605
 mgpsogui/gui/OptionManager.py,sha256=H5ofd7PA5f6dVfSghUhKdPiqLHNE0IVpPPzf93k7JD4,12527
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
@@ -36,6 +36,7 @@ mgpsogui/util/GraphGenerator.py,sha256=HhUsFUFhCv3wTYV8CTqU0wo56Ph9c1DocPj25AVIA
 mgpsogui/util/PSORunner.py,sha256=Do3-OUH7iZGL6aoCcwsM-6lxof8ERwyKA-_g8rDr_DM,3942
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=36oZ3wf3_zGQbdZLGwHJ1Kk8QArl9pjNqkIaz6IPt74,19742
+mgpsogui/util/helpers.py,sha256=fCfVDaGholx16FVVqf2BhWs9KCevI7aFIve1w2W68EQ,769
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
 mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MOYL2ifolvOE,6329
 mgpsogui/util/recosu/__init__.py,sha256=T7_iigIlowGbPOHLO3hwihjw2kbwIg6olOMhFhNiL38,236
@@ -47,8 +48,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.112.dist-info/METADATA,sha256=o0eeYwoykuBsa9ykHmYdpJPXJEcWUHg7aiwJIxxG_0c,9459
-mg_pso_gui-0.1.112.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.112.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.112.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.112.dist-info/RECORD,,
+mg_pso_gui-0.1.113.dist-info/METADATA,sha256=vXvLYdDq78LaCnarZZuiKcjFd34R9pETcCmfVc25fbw,9459
+mg_pso_gui-0.1.113.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.113.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.113.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.113.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -31,6 +31,7 @@ from queue import Empty
 from ..util import PSORunner
 from ..util import GraphGenerator
 from ..util.CTkToolTip import CTkToolTip as ctt
+from ..util import helpers as hp
 
 import subprocess
 import plotly.express as px
@@ -535,6 +536,24 @@ class App(customtkinter.CTk):
 				trace = results_queue.get_nowait()
 				
 				print("TRACE " + str(trace), flush=True)
+    
+				final_results = hp.extract_final_round_values(trace)
+				print("Final results: " + str(final_results), flush=True)
+    
+				all_steps = self.option_manager.get_steps()
+				data = final_results["data"]
+				index = 0
+				for step in data:
+					for param in step.keys():
+						value = step[param]
+						target_step = all_steps[index]
+						for target_param in target_step['param']:
+							if target_param['name'] == param:
+								target_param['optimal_value'].set(value)
+					index += 1
+				print("Applied optimal values")
+    
+    
 			except Empty:
 				break
 			except Exception as e:
@@ -650,9 +669,6 @@ class App(customtkinter.CTk):
 			self.progress_message_right.configure(text="")
 			self.textbox.insert("0.0", "\nCalibration finished!\n")
 
-		
-	
-
 def start():
 	app = App()
 	app.mainloop()

mgpsogui/util/helpers.py

@@ -0,0 +1,22 @@
+def extract_final_round_values(data):
+    max_rounds = data['max_rounds'] + 1
+    steps = data['n_steps'] + 1
+    
+    final_value = {}
+    
+    for round in range(max_rounds):
+        for step in range(steps):
+            key = f"r{round}s{step}"
+            if key in data:
+                obj = data[key] 
+                round_steps = []
+                for o_step in obj['steps']:
+                    step_obj = {}
+                    for param in o_step['param']:
+                        if 'name' in param and 'value' in param:
+                            step_obj[param['name']] = param['value']
+
+                    round_steps.append(step_obj)
+                final_value["data"] = round_steps
+                final_value["index"] = key
+    return final_value