mg-pso-gui 0.1.19__tar.gz → 0.1.20__tar.gz

{mg-pso-gui-0.1.19 → mg-pso-gui-0.1.20}/PKG-INFO

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

{mg-pso-gui-0.1.19 → mg-pso-gui-0.1.20}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.19 → mg-pso-gui-0.1.20}/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,13 @@ 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"]
+    
+			if "calibration_data" in metrics:
+				self.calibration_data = metrics["calibration_data"]
 			
 			print(metrics)
 			
@@ -493,9 +491,11 @@ 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)
+				#GraphGenerator.calibrated_params_by_round(self.running_config['steps'], calibrated_params, self.option_manager)
 				self.update_graph("")
 			except Exception as e:
 				# Print stack trace
@@ -521,11 +521,13 @@ 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'])
+					self.progress_data = df
 
-					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("")
+					#GraphGenerator.update_progress_graphs(self.running_config['steps'], self.current_data, self.option_manager)
+					#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("")
 
 					match = matches[-1]
 					percent = int(match[0])

{mg-pso-gui-0.1.19 → mg-pso-gui-0.1.20}/mgpsogui/util/GraphGenerator.py

@@ -4,6 +4,9 @@ import pandas as pd
 import numpy as np
 import os
 
+def generate_graphs(config, dataframe, option_manager):
+    pass
+
 def best_cost_stacked(config, dataframe, option_manager):
     fig = go.Figure()
         

{mg-pso-gui-0.1.19 → mg-pso-gui-0.1.20}/setup.py

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