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

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

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

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

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

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

@@ -544,73 +544,23 @@ class App(customtkinter.CTk):
 				traceback.print_exc()
 				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":
+		# Parse data into interface
+		mode = self.option_manager.get_arguments()['mode'].get()
+		if mode == "Optimization: MG-PSO":
+			if (os.path.exists(os.path.join(folder, 'error.txt'))):
 				data = hp.parse_pso_error(os.path.join(folder, 'error.txt'), len(self.option_manager.get_steps()))
+				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.footer_progress_label.configure(text="Round: " + str(data["round"]) + " - Step: " + str(data["step"]))
-			else:
+		else:
+			if (os.path.exists(os.path.join(folder, 'output.txt'))):
 				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="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:
-				lines = f.readlines()
-				lines_string = "".join(lines)
-				self.data_cache = lines_string
-				
-				pattern = r'(\d+)%\|.*\|(\d+)/(\d+)(?:,\sbest_cost=(\d+\.\d+))?' # The magic of AI
-				matches = re.findall(pattern, self.data_cache)
-				filtered_matches = [match for match in matches if match[3] != '']
-				matches = filtered_matches
-
-				if len(matches) > 0:
-					df = pd.DataFrame(matches, columns=['percent', 'completed_rounds', 'total_rounds', 'best_cost'], dtype=float)
-					df = df[df['best_cost'] != '']
-					df = df.dropna()
-					df = df.drop_duplicates()
-					df['round_step'] = (df['completed_rounds'].diff() < 0).cumsum()
-					df = df.drop_duplicates(subset=['completed_rounds', 'round_step'])
-					self.progress_data = df
-
-					match = matches[-1]
-					percent = int(match[0])
-					completed_rounds = int(match[1])
-					total_rounds = int(match[2])
-					best_cost = float(match[3]) if match[3] else None
-					
-					if (percent > 0):
-						#self.progress_bar.stop()
-						self.footer_progress_bar.stop()
-						#self.progress_bar.configure(mode="determinate")
-						self.footer_progress_bar.configure(mode="determinate")
-						#self.progress_bar.set(percent/100)
-						self.footer_progress_bar.set(percent/100)
-						self.progress_message_left.configure(text="Percent Complete: " + str(percent) + "%")
-						self.progress_message_middle.configure(text=str(completed_rounds) + "/" + str(total_rounds))
-						self.footer_progress_label.configure(text=str(completed_rounds) + "/" + str(total_rounds))
-						self.progress_message_right.configure(text="Best Cost: " + str(best_cost))
-					else:
-						#self.progress_bar.configure(mode="indeterminate")
-						self.footer_progress_bar.configure(mode="indeterminate")
-						#self.progress_bar.start()
-						self.footer_progress_bar.start()
-						self.progress_message_left.configure(text="")
-						self.progress_message_middle.configure(text="Starting new round...")
-						self.footer_progress_label.configure(text="Next round...")
-						self.progress_message_right.configure(text="")"""
 				
 				
 				

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

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