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

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

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

{mg-pso-gui-0.1.154 → 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.154
+Version: 0.1.155
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg-pso-gui-0.1.154 → 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.154 → 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.154 → 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.154'
+VERSION = '0.1.155'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()