mg-pso-gui 0.1.19__py3-none-any.whl → 0.1.21__py3-none-any.whl

{mg_pso_gui-0.1.19.dist-info → mg_pso_gui-0.1.21.dist-info}/METADATA

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

{mg_pso_gui-0.1.19.dist-info → mg_pso_gui-0.1.21.dist-info}/RECORD

@@ -1,12 +1,12 @@
 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=dsXB_MdANWAh-Njf_qQwJN8gn0ethzdVDdjiHUpb_Zo,22973
+mgpsogui/gui/HomePage.py,sha256=1WTBEhe6KRujPgNb-NwRhFGDbAmP2Zayx3Pp6FHHwD0,22313
 mgpsogui/gui/OptionManager.py,sha256=bFN2jWJbx1Din3waOFLmbWGt0BXD_KthGJ8Mgue_FEE,11712
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/RunTab/RunTab.py,sha256=OjRteh5-ivHXRBam1M60JrxzkQEeqjstrUR93K25R8Y,2850
+mgpsogui/gui/RunTab/RunTab.py,sha256=GPKhwCZh6FXhmRypPl0zo7XByM2AsBqeY3gxctANyP8,1839
 mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=_6_xEl46PY9MmNvpmoMNdNDbVav6ODwWSDROboy57Cs,2866
 mgpsogui/gui/SetupTab/BoundsList.py,sha256=L77UEaUJNiUE-ZsYIl44tWRb1zBfxaEQ-bAG1V5_IH0,12268
@@ -30,7 +30,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=hEPhka0ZKQJ9DSSywDfwoXFQMsk3RHyG8QyTLOQnN4M,7851
+mgpsogui/util/GraphGenerator.py,sha256=DDP8bqdfGxPPbvTjyYYW5GiE5AV6Z_KfVbeqRCoWrz0,9266
 mgpsogui/util/PSORunner.py,sha256=wfkrZLysgSS_5BrdFEm8U-0S7DHYpxmHPau_Ec5W8ak,4510
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
@@ -44,8 +44,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.19.dist-info/METADATA,sha256=Fi0UHYd9mgWKFqScvk3p96Zq8eAcn7zTg9eCIa_e6hw,9458
-mg_pso_gui-0.1.19.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mg_pso_gui-0.1.19.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.19.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.19.dist-info/RECORD,,
+mg_pso_gui-0.1.21.dist-info/METADATA,sha256=yTHYuuaKMSXJBLT20CXrqxbDOjxdIRAO6mdUbCEh1cU,9458
+mg_pso_gui-0.1.21.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+mg_pso_gui-0.1.21.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.21.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.21.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -70,8 +70,11 @@ class App(customtkinter.CTk):
 		self.data_x = [0]
 		self.data_y = [0]
 		
+		self.image_scale = 1
 		self.image_width = 1280
 		self.image_height = 720
+		self.progress_data = None
+		self.calibration_data = None
 
 		# configure window
 		self.title("CSIP PSO")
@@ -172,7 +175,7 @@ class App(customtkinter.CTk):
 		ctt(self.download_button, delay=0.1, alpha=0.95, message="Download Results")
 		self.download_button.grid(row=0, column=10, padx=(5, 20), pady=header_padding_y)
 
-	def _resize_image(self, event):
+	'''def _resize_image(self, event):
 		self.graph_label.update_idletasks()
 		new_width = self.graph_label.winfo_width()
 		new_height = self.graph_label.winfo_height()
@@ -190,10 +193,7 @@ class App(customtkinter.CTk):
 		
 		self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(new_width, new_height))
 		self.graph_label.configure(image=self.graph_image)
-		self.graph_label.update_idletasks()
-
-	def callback_test(self, *args):
-		print("callback_test called")
+		self.graph_label.update_idletasks()'''
 			
 	def update_graph(self, value):
 		selected_graph = self.graph_selector_value.get()
@@ -205,39 +205,30 @@ class App(customtkinter.CTk):
 		
 		if (selected_graph == "Best Cost Stacked"):
 			self.selected_graph_name = "best_cost_stacked"
-			image_path = os.path.join(folder, self.selected_graph_name + ".png")
-			if not os.path.exists(image_path):
-				image_path = os.path.join("./images", "up.png")
-			self.graph_image_obj = Image.open(image_path)
-			self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(self.image_width, self.image_height))
-			self.graph_label.configure(image=self.graph_image)
 		elif (selected_graph == "Best Cost by Round"):
 			self.selected_graph_name = "best_cost_by_round"
-			image_path = os.path.join(folder, self.selected_graph_name + ".png")
-			if not os.path.exists(image_path):
-				image_path = os.path.join("./images", "up.png")
-			self.graph_image_obj = Image.open(image_path)
-			self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(self.image_width, self.image_height))
-			self.graph_label.configure(image=self.graph_image)
 		elif (selected_graph == "Iteration Table"):
 			self.selected_graph_name = "table"
-			image_path = os.path.join(folder, self.selected_graph_name + ".png")
-			if not os.path.exists(image_path):
-				image_path = os.path.join("./images", "up.png")
-			self.graph_image_obj = Image.open(image_path)
-			self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(self.image_width, self.image_height))
-			self.graph_label.configure(image=self.graph_image)
 		elif (selected_graph == "Calibrated Parameters"):
 			self.selected_graph_name = "calibrated_params_by_round"
-			image_path = os.path.join(folder, self.selected_graph_name + ".png")
-			if not os.path.exists(image_path):
-				image_path = os.path.join("./images", "up.png")
-			self.graph_image_obj = Image.open(image_path)
-			self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(self.image_width, self.image_height))
-			self.graph_label.configure(image=self.graph_image)
+
+		image_path = os.path.join(folder, self.selected_graph_name + ".png")
+		if not os.path.exists(image_path):
+			image_path = os.path.join("./images", "up.png")
+		self.graph_image_obj = Image.open(image_path)
+		self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(self.image_width * self.image_scale, self.image_height * self.image_scale))
+		self.graph_label.configure(image=self.graph_image)
 			
 	def save_project(self):
 		metrics = self.option_manager.get_metrics()
+  
+		# Add the calibration_progress dataframe to the json
+		if (self.progress_data is not None):
+			metrics["calibration_progress"] = self.progress_data.to_json()
+		# Add the calibration_data to the json
+		if (self.calibration_data is not None):
+			metrics["calibration_data"] = self.calibration_data
+
 		filename = asksaveasfilename(filetypes=[("JSON", "*.json")], initialfile="config", defaultextension="json", title="Save Project")
 		
 		try:
@@ -276,6 +267,15 @@ class App(customtkinter.CTk):
 			if "service_parameters" in metrics:
 				self.option_manager.set_service_parameters(metrics["service_parameters"])
 				self.tabview.configure(state="enabled")
+	
+			if "calibration_progress" in metrics:
+				self.progress_data = pd.read_json(metrics["calibration_progress"])
+				self.calibration_data = metrics["calibration_data"]
+				print(self.progress_data)
+	
+			if "calibration_data" in metrics:
+				self.calibration_data = metrics["calibration_data"]
+				print(self.calibration_data)
 			
 			print(metrics)
 			
@@ -349,6 +349,9 @@ class App(customtkinter.CTk):
 		metrics = self.option_manager.get_metrics()
 		self.running_config = metrics
 		
+		self.progress_data = None
+		self.calibration_data = None
+  
 		#self.progress_bar.configure(mode="indeterminnate")
 		#self.progress_bar.start()
 		self.footer_progress_bar.configure(mode="indeterminnate")
@@ -366,6 +369,15 @@ class App(customtkinter.CTk):
 		try:
 			info = self.option_manager.get_project_data()
 			folder = os.path.join(info['path'], info['name'])
+
+			if not os.path.exists(folder):
+				os.makedirs(folder)
+
+			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'))
 			
 			self.train_process = Process(target=PSORunner.run_process, args=(stdout_queue, stderr_queue, results_queue, cosu_queue, metrics, folder))
 			self.train_process.daemon = True
@@ -422,7 +434,6 @@ class App(customtkinter.CTk):
 		
 	def watch_loop(self):
 		# Check if file exists:
-		
 		info = self.option_manager.get_project_data()
 		folder = os.path.join(info['path'], info['name'])
 			
@@ -493,10 +504,12 @@ class App(customtkinter.CTk):
 				best_particle_values = [ast.literal_eval(i) for i in best_particle_values]
 				progress_values = [tuple(map(float, i)) for i in progress_values]
 				
-				print("Current params: " + str(calibrated_params), flush=True)
+				#print("Current params: " + str(calibrated_params), flush=True)
+	
+				self.calibration_data = calibrated_params
 				
-				GraphGenerator.calibrated_params_by_round(self.running_config['steps'], calibrated_params, self.option_manager)
-				self.update_graph("")
+				#GraphGenerator.calibrated_params_by_round(self.running_config['steps'], calibrated_params, self.option_manager)
+				#self.update_graph("")
 			except Exception as e:
 				# Print stack trace
 				traceback.print_exc()
@@ -521,11 +534,7 @@ class App(customtkinter.CTk):
 					df = df.drop_duplicates()
 					df['round_step'] = (df['completed_rounds'].diff() < 0).cumsum()
 					df = df.drop_duplicates(subset=['completed_rounds', 'round_step'])
-
-					GraphGenerator.best_cost_stacked(self.running_config['steps'], df, self.option_manager)
-					GraphGenerator.best_cost_by_round(self.running_config['steps'], df, self.option_manager)
-					GraphGenerator.table(self.running_config['steps'], df, self.option_manager)
-					self.update_graph("")
+					self.progress_data = df
 
 					match = matches[-1]
 					percent = int(match[0])
@@ -559,18 +568,6 @@ class App(customtkinter.CTk):
 		if self.train_process.is_alive():
 			self.after(1000, self.watch_loop)
 		else:
-			# Check if queue is empty
-			"""
-			if (self.process_queue.empty()):
-				print("PROCESS FINISHED BUT WE GOT NO OBJECTS :(")
-				self.footer_progress_label.configure(text="Failed")
-			else:
-				self.final_results = self.process_queue.get()
-				print("PROCESS FINISHED WE GOT THINGS")
-				print(self.final_results)
-				self.footer_progress_label.configure(text="Finished")
-			"""
-			
 			#self.progress_bar.stop()
 			self.footer_progress_bar.stop()
 			#self.progress_bar.configure(mode="indeterminate")
@@ -582,6 +579,9 @@ class App(customtkinter.CTk):
 			self.progress_message_right.configure(text="")
 			self.textbox.insert("0.0", "\nCalibration finished!\n")
 
+		GraphGenerator.generate_graphs(self)
+	
+
 def start():
 	app = App()
 	app.mainloop()

mgpsogui/gui/RunTab/RunTab.py

@@ -19,21 +19,7 @@ def create_tab(self, tab):
     tab.grid_columnconfigure(0, weight=1)
     tab.grid_rowconfigure(0, weight=1)
     tab.grid_rowconfigure(1, weight=200)
-    
-    """
-    self.url = customtkinter.CTkEntry(tab, textvariable=self.option_manager.get_arguments()['url'])
-    self.url.grid(row=0, column=0, columnspan=1, padx=(20, 20), pady=(20, 20), sticky="nsew")
 
-    self.run_button = customtkinter.CTkButton(tab, text="Run", command=self.run)
-    self.run_button.grid(row=0, column=1, padx=(20, 20), pady=(20, 20), sticky="nsew")
-    ctt(self.run_button, delay=0.5, message="Start calibration...")
-    
-        self.stop_button = customtkinter.CTkButton(tab, text="Stop", command=self.stop)
-    self.stop_button.grid(row=0, column=2, padx=(20, 20), pady=(20, 20), sticky="nsew")
-    ctt(self.stop_button, delay=0.5, message="Stop calibration...")
-    
-    """
-    
     self.progress_container = customtkinter.CTkFrame(tab)
     self.progress_container.grid_columnconfigure(0, weight=1)
     self.progress_container.grid_columnconfigure(1, weight=1)
@@ -50,12 +36,7 @@ def create_tab(self, tab):
     self.progress_message_right = customtkinter.CTkLabel(self.progress_container, text="")
     self.progress_message_right.grid(row=0, column=2, padx=(10, 10), pady=(10, 10), sticky="e")
     
-    #self.progress_bar = customtkinter.CTkProgressBar(self.progress_container)
-    #self.progress_bar.grid(row=1, column=0, columnspan=3, padx=(10, 10), pady=(10, 10), sticky="ew")
-    #self.progress_bar.set(0)
-    #ctt(self.progress_bar, delay=0.5, message="Current calibration progress")
-    
     self.textbox = customtkinter.CTkTextbox(tab)
     self.textbox.grid(row=1, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
-    self.textbox.insert("0.0", "Welcome to the CSIP PSO Calibration Tool!\n\nUse the Calibration tab to define steps and calibration parameters. Use this tab to run and observe calibration progress. Once finished, use the Visualization tab to generate figures and graphs.")
+    self.textbox.insert("0.0", "Welcome to the CSIP PSO Calibration Tool!\n\nUse the Setup tab to define steps and calibration parameters. Use this tab to view logs and observe calibration progress. Once finished, use the Results tab to generate figures and graphs.")
         

mgpsogui/util/GraphGenerator.py

@@ -3,6 +3,34 @@ import plotly.graph_objs as go
 import pandas as pd
 import numpy as np
 import os
+from PIL import Image, ImageTk
+
+def generate_graphs(HomePage):
+    selected_graph = HomePage.graph_selector_value.get()
+    info = HomePage.option_manager.get_project_data()
+    folder = os.path.join(info['path'], info['name'])
+    if not os.path.exists(folder):
+        os.makedirs(folder)
+        
+    if (selected_graph == "Best Cost Stacked"):
+        HomePage.selected_graph_name = "best_cost_stacked"
+        best_cost_stacked(HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
+    elif (selected_graph == "Best Cost by Round"):
+        HomePage.selected_graph_name = "best_cost_by_round"
+        best_cost_by_round(HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
+    elif (selected_graph == "Iteration Table"):
+        HomePage.selected_graph_name = "table"
+        table(HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
+    elif (selected_graph == "Calibrated Parameters"):
+        HomePage.selected_graph_name = "calibrated_params_by_round"
+        calibrated_params_by_round(HomePage.running_config['steps'], HomePage.calibration_data, HomePage.option_manager)
+        
+    image_path = os.path.join(folder, HomePage.selected_graph_name + ".png")
+    
+    if not os.path.exists(image_path):
+        image_path = os.path.join("./images", "up.png")
+  
+    HomePage.graph_image_obj = Image.open(image_path)
 
 def best_cost_stacked(config, dataframe, option_manager):
     fig = go.Figure()