mg-pso-gui 0.1.141__tar.gz → 0.1.143__tar.gz

{mg-pso-gui-0.1.141 → mg-pso-gui-0.1.143}/PKG-INFO

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

{mg-pso-gui-0.1.141 → mg-pso-gui-0.1.143}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.141 → mg-pso-gui-0.1.143}/mgpsogui/gui/HomePage.py

@@ -545,21 +545,25 @@ class App(customtkinter.CTk):
 				print(e)
 				
 		if (os.path.exists(os.path.join(folder, 'error.txt'))):
-
-
 			mode = self.option_manager.get_arguments()['mode'].get()
 
+			print("Mode: " + mode)
+
 			if mode == "Optimization: MG-PSO":
 				data = hp.parse_pso_error(os.path.join(folder, 'error.txt'), len(self.option_manager.get_steps()))
+				self.footer_progress_bar.stop()
+				self.footer_progress_bar.configure(mode="determinate")
+				self.footer_progress_bar.set(data["percent"]/100)
+				self.footer_progress_label.configure(text="Round: " + str(data["round"]) + " - Step: " + str(data["step"]))
 			else:
 				data = hp.parse_sampling_output(os.path.join(folder, 'output.txt'))
-			self.progress_data = data["data"]
-			self.footer_progress_bar.stop()
-			self.footer_progress_bar.configure(mode="determinate")
-			self.footer_progress_bar.set(data["percent"]/100)
-			#self.progress_message_left.configure(text="Percent Complete: " + str(round(data["percent"])) + "%")
-			#self.progress_message_middle.configure(text=str(completed_rounds) + "/" + str(total_rounds))
-			self.footer_progress_label.configure(text="Round: " + str(data["round"]) + " - Step: " + str(data["step"]))
+				self.progress_data = data["data"]
+				self.footer_progress_bar.stop()
+				self.footer_progress_bar.configure(mode="determinate")
+				self.footer_progress_bar.set(data["percent"]/100)
+				#self.progress_message_left.configure(text="Percent Complete: " + str(round(data["percent"])) + "%")
+				#self.progress_message_middle.configure(text=str(completed_rounds) + "/" + str(total_rounds))
+				self.footer_progress_label.configure(text="Percent: " + str(data["percent"]))
 			#self.progress_message_right.configure(text="Best Cost: " + str(best_cost))
 
 			"""with open(os.path.join(folder, 'error.txt'), 'r') as f:

{mg-pso-gui-0.1.141 → mg-pso-gui-0.1.143}/mgpsogui/util/helpers.py

@@ -30,6 +30,8 @@ def parse_sampling_output(file_path):
     # Remove any lines that don't contain "% Done "
     lines = [line for line in lines if '% Done ' in line]
 
+    print(lines)
+
     percents = []
     percent = 0
     for line in lines:

{mg-pso-gui-0.1.141 → mg-pso-gui-0.1.143}/setup.py

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