mg-pso-gui 0.1.130__tar.gz → 0.1.132__tar.gz

{mg-pso-gui-0.1.130 → mg-pso-gui-0.1.132}/PKG-INFO

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

{mg-pso-gui-0.1.130 → mg-pso-gui-0.1.132}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.130 → mg-pso-gui-0.1.132}/mgpsogui/gui/HomePage.py

@@ -541,7 +541,18 @@ 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.stop()
+			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 +596,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="")"""
 				
 				
 				

mg-pso-gui-0.1.132/mgpsogui/util/helpers.py

@@ -0,0 +1,68 @@
+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
+
+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}

{mg-pso-gui-0.1.130 → mg-pso-gui-0.1.132}/setup.py

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

mg-pso-gui-0.1.130/mgpsogui/util/helpers.py

@@ -1,22 +0,0 @@
-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