mg-pso-gui 0.1.112__tar.gz → 0.1.114__tar.gz

{mg-pso-gui-0.1.112 → mg-pso-gui-0.1.114}/PKG-INFO

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

{mg-pso-gui-0.1.112 → mg-pso-gui-0.1.114}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.112 → mg-pso-gui-0.1.114}/mg_pso_gui.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ mgpsogui/util/GraphGenerator.py
 mgpsogui/util/PSORunner.py
 mgpsogui/util/__init__.py
 mgpsogui/util/debug.py
+mgpsogui/util/helpers.py
 mgpsogui/util/CTkToolTip/__init__.py
 mgpsogui/util/CTkToolTip/ctk_tooltip.py
 mgpsogui/util/recosu/__init__.py

{mg-pso-gui-0.1.112 → mg-pso-gui-0.1.114}/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'].get() == 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()

mg-pso-gui-0.1.114/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

{mg-pso-gui-0.1.112 → mg-pso-gui-0.1.114}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.1.112'
+VERSION = '0.1.114'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()