mg-pso-gui 0.1.72__tar.gz → 0.1.75__tar.gz

{mg-pso-gui-0.1.72 → mg-pso-gui-0.1.75}/PKG-INFO

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

{mg-pso-gui-0.1.72 → mg-pso-gui-0.1.75}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.72 → mg-pso-gui-0.1.75}/mgpsogui/gui/HomePage.py

@@ -97,7 +97,8 @@ class App(customtkinter.CTk):
 		self.image_height = 720
 		self.progress_data = None
 		self.calibration_data = None
-
+		self.testing = False
+  
 		# configure window
 		self.title("CSIP PSO")
 		self.geometry(f"{1920}x{1080}")
@@ -183,7 +184,7 @@ class App(customtkinter.CTk):
 		self.run_button.grid(row=0, column=7, padx=(20, 5), pady=header_padding_y)
 
 		test_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "test.png")), size=(20, 20))
-		self.test_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=test_image, command=self.run)
+		self.test_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=test_image, command=self.run_test)
 		ctt(self.test_button, delay=0.1, alpha=0.95, message="Start Testing")
 		self.test_button.grid(row=0, column=8, padx=(5, 5), pady=header_padding_y)
 		
@@ -382,13 +383,25 @@ class App(customtkinter.CTk):
 		self.after(10, self.make_request)
 		self.after(3000, lambda: self.refresh_button.configure(fg_color=self.default_button_color))
 		
+	def run_test(self):
+		self.testing = True
+		self.run()	
+  
 	def run(self):
 		metrics = self.option_manager.get_metrics()
 		self.running_config = metrics
 		
+		if self.testing:
+			steps = metrics['steps']
+			for step in steps:
+				for param in step['param']:
+					if param['optimal_value'] != 0:
+						param['default_value'] = param['optimal_value']
+		self.testing = False
+  
 		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")

{mg-pso-gui-0.1.72 → mg-pso-gui-0.1.75}/mgpsogui/util/GraphGenerator.py

@@ -303,12 +303,15 @@ def custom_csv(homepage, option_manager):
         
     yy = pd.to_numeric(data[val], errors="coerce")
     
-    yy_unit = homepage.csv_data["data_attributes"]["Unit"][val]
+    yy_unit = "-"
+    if "Unit" in homepage.csv_data["data_attributes"]:
+        yy_unit = homepage.csv_data["data_attributes"]["Unit"][val]
     
     yy2 = pd.to_numeric(data[val2], errors="coerce")
     
     yy2_unit = "-"
-    yy2_unit = homepage.csv_data["data_attributes"]["Unit"][val2]
+    if "Unit" in homepage.csv_data["data_attributes"]:
+        yy2_unit = homepage.csv_data["data_attributes"]["Unit"][val2]
 
     fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
     fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2'))
@@ -381,10 +384,15 @@ def compare_csv(homepage, option_manager):
     else:
         xx2 = pd.to_numeric(data2[x], errors="coerce")
     
-    yy_unit = homepage.csv_data["data_attributes"]["Unit"][val]
+    yy_unit = "-"
+    if "Unit" in homepage.csv_data["data_attributes"]:
+        yy_unit = homepage.csv_data["data_attributes"]["Unit"][val]
     
     yy2 = pd.to_numeric(data[val2], errors="coerce")
-    yy2_unit = homepage.csv_data["data_attributes"]["Unit"][val2]
+    
+    yy2_unit = "-"
+    if "Unit" in homepage.csv_data["data_attributes"]:
+        yy2_unit = homepage.csv_data["data_attributes"]["Unit"][val2]
 
     fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
     fig.add_trace(go.Scatter(x=xx2, y=yy2, name=val2, yaxis='y2'))

{mg-pso-gui-0.1.72 → mg-pso-gui-0.1.75}/setup.py

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