mg-pso-gui 0.1.153__py3-none-any.whl → 0.1.154__py3-none-any.whl

{mg_pso_gui-0.1.153.dist-info → mg_pso_gui-0.1.154.dist-info}/METADATA

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

{mg_pso_gui-0.1.153.dist-info → mg_pso_gui-0.1.154.dist-info}/RECORD

@@ -36,7 +36,7 @@ mgpsogui/util/GraphGenerator.py,sha256=KC-qVr4H17rmgfhxZs1P96EEhrBbFgV0vjoTkPvrS
 mgpsogui/util/PSORunner.py,sha256=Bk6IXsBKSB33uccTJX7xagYwXHLgUbvpcM5qoi1MXHo,6170
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
-mgpsogui/util/helpers.py,sha256=nnRgQ9hCGp5RhyesfT_ZI01CthyuK-VX62yx7ukyTdY,2441
+mgpsogui/util/helpers.py,sha256=Fumv1xIenv75PErV2qPertqpqkseFA4xxUh1Q7xU0Ts,2485
 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
@@ -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.153.dist-info/METADATA,sha256=YOeOOwRM-YW1ctzp5nkZx_ZHFG3ro0tSLhYd1NHvJgA,9460
-mg_pso_gui-0.1.153.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.153.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.153.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.153.dist-info/RECORD,,
+mg_pso_gui-0.1.154.dist-info/METADATA,sha256=1TiA9RptZ9a9Y2ZQEDojIXcmXUIBPbAqF311oejRcFk,9460
+mg_pso_gui-0.1.154.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.154.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.154.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.154.dist-info/RECORD,,

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}