mg-pso-gui 0.1.129__py3-none-any.whl → 0.1.131__py3-none-any.whl

{mg_pso_gui-0.1.129.dist-info → mg_pso_gui-0.1.131.dist-info}/METADATA

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

{mg_pso_gui-0.1.129.dist-info → mg_pso_gui-0.1.131.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=cSMX2K0E7MXPlX2IfkpoKh6q6lL_6AhoNgbDexzFRdA,22668
+mgpsogui/gui/HomePage.py,sha256=IRL_lA5J0QCX2LZvxcIt8A4ck9yYZym0mA9NPb9E-iE,23317
 mgpsogui/gui/OptionManager.py,sha256=36_MlFd6nLt6xd6HHE2sHtL8oW7VBOZbCvJ8er-wWJ4,12544
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
@@ -36,7 +36,7 @@ mgpsogui/util/GraphGenerator.py,sha256=HhUsFUFhCv3wTYV8CTqU0wo56Ph9c1DocPj25AVIA
 mgpsogui/util/PSORunner.py,sha256=YmzsZbbTH8axrwJYq7ypCiOeMW4w4dnoLquv1mSGKSU,5729
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
-mgpsogui/util/helpers.py,sha256=fCfVDaGholx16FVVqf2BhWs9KCevI7aFIve1w2W68EQ,769
+mgpsogui/util/helpers.py,sha256=rG89dG8v2W0U8kuawGWFhxQiJkRzl6A7l7UAM_jHWAk,1995
 mgpsogui/util/sampler_test_driver.py,sha256=1iJTLVFZ_VCsuIdl3mXQBA1GNAH5jJO3z5h4E_bd5U8,3703
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
 mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MOYL2ifolvOE,6329
@@ -49,7 +49,7 @@ mgpsogui/util/recosu/sampling/sample_trace_writer.py,sha256=M9w-POLlZgjL5a7J7yxr
 mgpsogui/util/recosu/sampling/sampler_task.py,sha256=uZobpR83u6xEaUzIknvW9FbB84c2AL7T-5T8O8QIhzY,2776
 mgpsogui/util/recosu/sampling/sampling.py,sha256=2Z3K26_CL-HSRkdLgFwRp-QTLXPYLxYzynDItKPj8Jk,4138
 mgpsogui/util/recosu/sampling/halton/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/util/recosu/sampling/halton/halton.py,sha256=BzZ9_sOKluPacG5SNwsJnRSJGlTkLPzlJE1xvHIJnxc,1209
+mgpsogui/util/recosu/sampling/halton/halton.py,sha256=Vqwj3mZWcd6WS4slmIx0aA2O67Z4d6zs9haw79lhse0,1210
 mgpsogui/util/recosu/sampling/halton/prime.py,sha256=gOWJWdFVthmFAt-8Utk856QlJ3IKxBvg9eDfOJOWdr0,4206
 mgpsogui/util/recosu/sampling/random/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/recosu/sampling/random/random_sampler.py,sha256=cVF2VA40v9h0OSBgwXCKMw4wJGaQnUfBdwVPMffk_9U,905
@@ -58,8 +58,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.129.dist-info/METADATA,sha256=Hf8RlQbXKTtCW2by9hi8f-jtxZ_NZCKNqib4c_dweyc,9460
-mg_pso_gui-0.1.129.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.129.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.129.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.129.dist-info/RECORD,,
+mg_pso_gui-0.1.131.dist-info/METADATA,sha256=Cuco2yRQJdqdblA2CKpxzfA7-ofp27uS6w-qwnsO0gQ,9460
+mg_pso_gui-0.1.131.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.131.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.131.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.131.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -541,7 +541,17 @@ class App(customtkinter.CTk):
 				print(e)
 				
 		if (os.path.exists(os.path.join(folder, 'error.txt'))):
-			with open(os.path.join(folder, 'error.txt'), 'r') as f:
+
+			data = hp.parse_pso_error(os.path.join(folder, 'error.txt'), len(self.option_manager.get_steps()))
+			self.progress_data = data["data"]
+			self.footer_progress_bar.configure(mode="determinate")
+			self.footer_progress_bar.set(data["percent"]/100)
+			#self.progress_message_left.configure(text="Percent Complete: " + str(round(data["percent"])) + "%")
+			#self.progress_message_middle.configure(text=str(completed_rounds) + "/" + str(total_rounds))
+			self.footer_progress_label.configure(text="Round: " + str(data["round"]) + " - Step: " + str(data["step"]))
+			#self.progress_message_right.configure(text="Best Cost: " + str(best_cost))
+
+			"""with open(os.path.join(folder, 'error.txt'), 'r') as f:
 				lines = f.readlines()
 				lines_string = "".join(lines)
 				self.data_cache = lines_string
@@ -585,7 +595,7 @@ class App(customtkinter.CTk):
 						self.progress_message_left.configure(text="")
 						self.progress_message_middle.configure(text="Starting new round...")
 						self.footer_progress_label.configure(text="Next round...")
-						self.progress_message_right.configure(text="")
+						self.progress_message_right.configure(text="")"""
 				
 				
 				

mgpsogui/util/helpers.py

@@ -19,4 +19,50 @@ def extract_final_round_values(data):
                     round_steps.append(step_obj)
                 final_value["data"] = round_steps
                 final_value["index"] = key
-    return final_value
+    return final_value
+
+def parse_pso_error(file_path, num_steps):
+    lines = ""
+    
+    with open(file_path, 'r') as f:
+        lines = f.readlines()
+    
+    lines = [line for line in lines if 'best_cost' in line]
+    lines = [line.replace("pyswarms.single.global_best: ", "") for line in lines]
+
+    round = 1
+    step = 1
+
+    round_steps = {}
+    percents = []
+    best_costs = []
+    in100s = False
+    percent = 0
+    for line in lines:
+        best_cost = float(line.split('best_cost=')[1].strip())
+        percent = float(line.split('%')[0].strip())
+
+        best_costs.append(best_cost)
+        percents.append(percent)
+
+        # Percent is less than last percent or we are at the end of the file
+        if (percent == 100 and not in100s):
+            in100s = True
+
+            round_steps[f"Round: {round} - Step: {step}"] = {
+                "best_cost": best_costs,
+                "percent": percents
+            }
+
+            best_costs = []
+            percents = []
+            
+            step += 1
+            if step > num_steps:
+                step = 1
+                round += 1
+
+        if percent != 100:
+            in100s = False
+
+    return {"round": round, "step": step, "percent": percent, "data": round_steps}

mgpsogui/util/recosu/sampling/halton/halton.py

@@ -1,6 +1,6 @@
 from collections.abc import Iterable
 import math
-from ..sampling.halton.prime import generate_n_primes
+from ...sampling.halton.prime import generate_n_primes
 
 
 def halton(index: int, base: int) -> float: