mg-pso-gui 0.1.152__tar.gz → 0.1.154__tar.gz

{mg-pso-gui-0.1.152 → mg-pso-gui-0.1.154}/PKG-INFO

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

{mg-pso-gui-0.1.152 → mg-pso-gui-0.1.154}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.152 → mg-pso-gui-0.1.154}/mgpsogui/gui/HomePage.py

@@ -236,9 +236,9 @@ class App(customtkinter.CTk):
 			self.download_button.configure(fg_color=get_color("CTkButton"))
 		else:
 			self.test_button.configure(state="disabled")
-			self.test_button.configure(fg_color="red")
+			self.test_button.configure(fg_color="gray")
 			self.download_button.configure(state="disabled")
-			self.download_button.configure(fg_color="red")
+			self.download_button.configure(fg_color="gray")
 
 		self.steps_frame.clear()
 		self.steps_frame.render()

{mg-pso-gui-0.1.152 → mg-pso-gui-0.1.154}/mgpsogui/util/helpers.py

@@ -47,24 +47,23 @@ def parse_pso_error(file_path, num_steps):
     lines = [line for line in lines if 'best_cost' in line]
     lines = [line.replace("pyswarms.single.global_best: ", "") for line in lines]
 
+    # Add a fake line to make sure the last round is added
+    lines.append("  0% /best_cost=0")
+
     round = 1
     step = 1
 
     round_steps = {}
     percents = []
     best_costs = []
-    in100s = False
     percent = 0
+    last_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
+        if (percent < last_percent):
 
             round_steps[f"Round: {round} - Step: {step}"] = {
                 "best_cost": best_costs.copy(),
@@ -79,7 +78,9 @@ def parse_pso_error(file_path, num_steps):
                 step = 1
                 round += 1
 
-        if percent != 100:
-            in100s = False
+        best_costs.append(best_cost)
+        percents.append(percent)
+
+        last_percent = percent
 
     return {"round": round, "step": step, "percent": percent, "data": round_steps}

{mg-pso-gui-0.1.152 → mg-pso-gui-0.1.154}/setup.py

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