mg-pso-gui 0.1.153__tar.gz → 0.1.155__tar.gz

{mg-pso-gui-0.1.153 → mg-pso-gui-0.1.155}/PKG-INFO

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

{mg-pso-gui-0.1.153 → mg-pso-gui-0.1.155}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.153 → mg-pso-gui-0.1.155}/mgpsogui/gui/HomePage.py

@@ -432,13 +432,13 @@ class App(customtkinter.CTk):
 			os.makedirs(folder)
 		
 		# Stop the process
-		if (os.path.exists(os.path.join(folder, 'output.txt'))):
-			os.remove(os.path.join(folder, 'output.txt'))
+		#if (os.path.exists(os.path.join(folder, 'output.txt'))):
+		#	os.remove(os.path.join(folder, 'output.txt'))
 		
-		if (os.path.exists(os.path.join(folder, 'error.txt'))):
-			os.remove(os.path.join(folder, 'error.txt'))
+		#if (os.path.exists(os.path.join(folder, 'error.txt'))):
+		#	os.remove(os.path.join(folder, 'error.txt'))
 			
-		self.textbox.insert("0.0", "\Job terminated!\n")
+		self.textbox.insert("0.0", "Job terminated!\n")
 		#self.progress_bar.stop()
 		self.footer_progress_bar.stop()
 		#self.progress_bar.configure(mode="determinate")

{mg-pso-gui-0.1.153 → mg-pso-gui-0.1.155}/mgpsogui/util/GraphGenerator.py

@@ -59,7 +59,7 @@ def best_cost_stacked(config, data, option_manager):
 
     fig.update_layout(
         title="",
-        xaxis_title="Iteration",
+        xaxis_title="Progress (% through Group)",
         yaxis_title="Best Cost",
         font=dict(color='white'),
         paper_bgcolor='rgba(42, 42, 42, 0)',
@@ -163,7 +163,8 @@ def best_cost_by_round(config, data, option_manager):
         
         #fig.add_trace(go.Scatter(x=df['completed_rounds'] + (df['total_rounds'] * round_index), y=df['best_cost'], name='Group ' + str(step_index + 1)))
         
-        xx = np.max(np.array(data['percent']) + (100 * round_index))
+        
+        xx = np.max(np.array(data[round_step]["percent"]) + (100 * round_index))
         fig.add_shape(
             type='line',
             x0=xx,
@@ -188,7 +189,7 @@ def best_cost_by_round(config, data, option_manager):
 
     fig.update_layout(
         title="",
-        xaxis_title="Iteration",
+        xaxis_title="Progress (%)",
         yaxis_title="Best Cost",
         font=dict(color='white'),
         paper_bgcolor='rgba(42, 42, 42, 0)',

{mg-pso-gui-0.1.153 → mg-pso-gui-0.1.155}/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.153 → mg-pso-gui-0.1.155}/setup.py

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