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

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

@@ -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.dist-info → mg_pso_gui-0.1.155.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
-mgpsogui/gui/HomePage.py,sha256=tYs5PMfUsfrkklPZSuF-Bzn6HB_Vb9Bln9MxW4LGE9k,22505
+mgpsogui/gui/HomePage.py,sha256=peHPuusnuAP55ABqCgejffxrZCL2Lan6RxM0YvE0AuE,22508
 mgpsogui/gui/OptionManager.py,sha256=36_MlFd6nLt6xd6HHE2sHtL8oW7VBOZbCvJ8er-wWJ4,12544
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
@@ -32,7 +32,7 @@ mgpsogui/gui/images/stop.png,sha256=JPuxXQerCGpLikcp7cAj3iLCOjULMYYZ2sZe0lArh68,
 mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,3642
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
-mgpsogui/util/GraphGenerator.py,sha256=KC-qVr4H17rmgfhxZs1P96EEhrBbFgV0vjoTkPvrS9M,15011
+mgpsogui/util/GraphGenerator.py,sha256=HZZSmC-p_Cfjsf1XnL6kLKI59frjQ0VYoZd-NAbmBE8,15052
 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
@@ -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.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,,
+mg_pso_gui-0.1.155.dist-info/METADATA,sha256=bvJWQj87S3rtLVd3BMZpeBw0qDG65B9oCmC57wt1PPM,9460
+mg_pso_gui-0.1.155.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.155.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.155.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.155.dist-info/RECORD,,

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")

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)',